Update license headers and add new license files

- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3
- Removed LICENSE.GPL

Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>

6 files changed, 114 insertions, 154 deletions

diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/excluded.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/excluded.cpp
index 2d1b1443b..ef74b256e 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/excluded.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/excluded.cpp
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp
index 99b1f2ed6..3b1556a29 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the autotests of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/included.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/included.cpp
index a6b1a1826..034996a2b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/included.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/included.cpp
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
index 62ececc58..074ed6611 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/notincluded.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/notincluded.cpp
index 506980a11..03c81d2af 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/notincluded.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/notincluded.cpp
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
index 9c7d9df6b..8bb7fadd8 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
@@ -4,14 +4,14 @@
 <context>
     <name></name>
     <message id="this_a_id">
-        <location filename="main.cpp" line="226"/>
+        <location filename="main.cpp" line="218"/>
         <source>This is supposed	to be quoted &quot; newline
 backslashed \ stuff.</source>
         <extracomment>again an extra comment, this time for id-based NOOP</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message id="this_another_id" numerus="yes">
-        <location filename="main.cpp" line="230"/>
+        <location filename="main.cpp" line="222"/>
         <source>This needs to be here. Really.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -19,7 +19,7 @@ backslashed \ stuff.</source>
         <extra-some>thing</extra-some>
     </message>
     <message id="yet_another_id">
-        <location filename="main.cpp" line="254"/>
+        <location filename="main.cpp" line="246"/>
         <source></source>
         <extracomment>This is a message without a source string</extracomment>
         <translation type="unfinished"></translation>
@@ -28,8 +28,8 @@ backslashed \ stuff.</source>
 <context>
     <name>Bogus</name>
     <message>
-        <location filename="main.cpp" line="266"/>
-        <location filename="main.cpp" line="270"/>
+        <location filename="main.cpp" line="258"/>
+        <location filename="main.cpp" line="262"/>
         <source>this should be in Bogus</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37,17 +37,17 @@ backslashed \ stuff.</source>
 <context>
     <name>Class42</name>
     <message>
-        <location filename="main.cpp" line="380"/>
+        <location filename="main.cpp" line="372"/>
         <source>does that make sense?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="388"/>
+        <location filename="main.cpp" line="380"/>
         <source>and does that?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="394"/>
+        <location filename="main.cpp" line="386"/>
         <source>eyo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55,7 +55,7 @@ backslashed \ stuff.</source>
 <context>
     <name>Dialog2</name>
     <message numerus="yes">
-        <location filename="main.cpp" line="70"/>
+        <location filename="main.cpp" line="62"/>
         <source>%n files</source>
         <comment>plural form</comment>
         <translation type="unfinished">
@@ -63,40 +63,40 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="71"/>
+        <location filename="main.cpp" line="63"/>
         <source>%n cars</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="72"/>
+        <location filename="main.cpp" line="64"/>
         <source>&amp;Find %n cars</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="73"/>
+        <location filename="main.cpp" line="65"/>
         <source>Search in %n items?</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="74"/>
+        <location filename="main.cpp" line="66"/>
         <source>%1. Search in %n items?</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="75"/>
+        <location filename="main.cpp" line="67"/>
         <source>Age: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="76"/>
+        <location filename="main.cpp" line="68"/>
         <source>There are %n house(s)</source>
         <comment>Plurals and function call</comment>
         <translation type="unfinished">
@@ -104,7 +104,7 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="143"/>
+        <location filename="main.cpp" line="135"/>
         <source>func3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -112,27 +112,27 @@ backslashed \ stuff.</source>
 <context>
     <name>FindDialog</name>
     <message>
-        <location filename="finddialog.cpp" line="85"/>
+        <location filename="finddialog.cpp" line="77"/>
         <source>Enter the text you are looking for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="135"/>
+        <location filename="finddialog.cpp" line="127"/>
         <source>Search reached end of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="137"/>
+        <location filename="finddialog.cpp" line="129"/>
         <source>Search reached start of the document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="139"/>
+        <location filename="finddialog.cpp" line="131"/>
         <source>Text not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="175"/>
+        <location filename="finddialog.cpp" line="167"/>
         <source>null comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -140,12 +140,12 @@ backslashed \ stuff.</source>
 <context>
     <name>Internal::Message</name>
     <message>
-        <location filename="main.cpp" line="296"/>
+        <location filename="main.cpp" line="288"/>
         <source>message1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="301"/>
+        <location filename="main.cpp" line="293"/>
         <source>message2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -153,7 +153,7 @@ backslashed \ stuff.</source>
 <context>
     <name>Kåntekst</name>
     <message>
-        <location filename="finddialog.cpp" line="180"/>
+        <location filename="finddialog.cpp" line="172"/>
         <source>encoding, using QApplication</source>
         <translation type="unfinished"></translation>
     </message>
@@ -161,12 +161,12 @@ backslashed \ stuff.</source>
 <context>
     <name>LotsaFun</name>
     <message>
-        <location filename="main.cpp" line="318"/>
+        <location filename="main.cpp" line="310"/>
         <source>this is inside operator&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="353"/>
+        <location filename="main.cpp" line="345"/>
         <source>bracketed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -174,7 +174,7 @@ backslashed \ stuff.</source>
 <context>
     <name>NameSchpace::YetMoreFun</name>
     <message>
-        <location filename="main.cpp" line="342"/>
+        <location filename="main.cpp" line="334"/>
         <source>funStuff!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -182,7 +182,7 @@ backslashed \ stuff.</source>
 <context>
     <name>Plurals, QCoreApplication</name>
     <message numerus="yes">
-        <location filename="main.cpp" line="81"/>
+        <location filename="main.cpp" line="73"/>
         <source>%n house(s)</source>
         <comment>Plurals and identifier</comment>
         <translation type="unfinished">
@@ -190,7 +190,7 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="82"/>
+        <location filename="main.cpp" line="74"/>
         <source>%n car(s)</source>
         <comment>Plurals and literal number</comment>
         <translation type="unfinished">
@@ -198,7 +198,7 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="83"/>
+        <location filename="main.cpp" line="75"/>
         <source>%n horse(s)</source>
         <comment>Plurals and function call</comment>
         <translation type="unfinished">
@@ -209,7 +209,7 @@ backslashed \ stuff.</source>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="main.cpp" line="51"/>
+        <location filename="main.cpp" line="43"/>
         <source>QT_LAYOUT_DIRECTION</source>
         <comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
         <translation type="unfinished"></translation>
@@ -218,28 +218,28 @@ backslashed \ stuff.</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="finddialog.cpp" line="172"/>
+        <location filename="finddialog.cpp" line="164"/>
         <source>with comment</source>
         <comment>comment</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="173"/>
+        <location filename="finddialog.cpp" line="165"/>
         <source>empty comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="174"/>
+        <location filename="finddialog.cpp" line="166"/>
         <source>null comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="177"/>
+        <location filename="finddialog.cpp" line="169"/>
         <source>encoding, using QCoreApplication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="finddialog.cpp" line="178"/>
+        <location filename="finddialog.cpp" line="170"/>
         <source>encoding, using QApplication</source>
         <translation type="unfinished"></translation>
     </message>
@@ -247,12 +247,12 @@ backslashed \ stuff.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cpp" line="276"/>
+        <location filename="main.cpp" line="268"/>
         <source>just QObject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="included.cpp" line="42"/>
+        <location filename="included.cpp" line="34"/>
         <source>message from #included .cpp file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -260,26 +260,26 @@ backslashed \ stuff.</source>
 <context>
     <name>QTranslator</name>
     <message>
-        <location filename="main.cpp" line="93"/>
-        <location filename="main.cpp" line="94"/>
+        <location filename="main.cpp" line="85"/>
+        <location filename="main.cpp" line="86"/>
         <source>Simple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="95"/>
+        <location filename="main.cpp" line="87"/>
         <source>Simple with comment</source>
         <comment>with comment</comment>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="96"/>
+        <location filename="main.cpp" line="88"/>
         <source>Plural without comment</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="97"/>
+        <location filename="main.cpp" line="89"/>
         <source>Plural with comment</source>
         <comment>comment 1</comment>
         <translation type="unfinished">
@@ -287,7 +287,7 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="main.cpp" line="98"/>
+        <location filename="main.cpp" line="90"/>
         <source>Plural with comment</source>
         <comment>comment 2</comment>
         <translation type="unfinished">
@@ -298,25 +298,25 @@ backslashed \ stuff.</source>
 <context>
     <name>TestClass</name>
     <message>
-        <location filename="main.cpp" line="157"/>
+        <location filename="main.cpp" line="149"/>
         <source>inline function</source>
         <comment>TestClass</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="161"/>
+        <location filename="main.cpp" line="153"/>
         <source>inline function 2</source>
         <comment>TestClass</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="165"/>
+        <location filename="main.cpp" line="157"/>
         <source>static inline function</source>
         <comment>TestClass</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="367"/>
+        <location filename="main.cpp" line="359"/>
         <source>Test value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -324,18 +324,18 @@ backslashed \ stuff.</source>
 <context>
     <name>Testing</name>
     <message>
-        <location filename="main.cpp" line="182"/>
+        <location filename="main.cpp" line="174"/>
         <source>extra-commented string</source>
         <extracomment>this is an extra comment for the translator</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="183"/>
+        <location filename="main.cpp" line="175"/>
         <source>not extra-commented string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="185"/>
+        <location filename="main.cpp" line="177"/>
         <source>another extra-commented string</source>
         <extracomment>another extra-comment</extracomment>
         <translation type="unfinished"></translation>
@@ -344,7 +344,7 @@ backslashed \ stuff.</source>
 <context>
     <name>TestingTake17</name>
     <message id="this_is_an_id">
-        <location filename="main.cpp" line="211"/>
+        <location filename="main.cpp" line="203"/>
         <source>something cool</source>
         <extracomment>random comment</extracomment>
         <translation type="unfinished"></translation>
@@ -352,12 +352,12 @@ backslashed \ stuff.</source>
         <extra-po-ignore_me>totally foo-barred  nonsense</extra-po-ignore_me>
     </message>
     <message>
-        <location filename="main.cpp" line="213"/>
+        <location filename="main.cpp" line="205"/>
         <source>less cool</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="another_id">
-        <location filename="main.cpp" line="216"/>
+        <location filename="main.cpp" line="208"/>
         <source>even more cool</source>
         <translation type="unfinished"></translation>
     </message>
@@ -365,7 +365,7 @@ backslashed \ stuff.</source>
 <context>
     <name>YetAnotherTest</name>
     <message>
-        <location filename="main.cpp" line="247"/>
+        <location filename="main.cpp" line="239"/>
         <source>nothing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -373,7 +373,7 @@ backslashed \ stuff.</source>
 <context>
     <name>scope</name>
     <message numerus="yes">
-        <location filename="main.cpp" line="187"/>
+        <location filename="main.cpp" line="179"/>
         <source>works in translate, too</source>
         <comment>blabb</comment>
         <extracomment>blah!</extracomment>
@@ -382,20 +382,20 @@ backslashed \ stuff.</source>
         </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="194"/>
+        <location filename="main.cpp" line="186"/>
         <source>string</source>
         <extracomment>extra comment for NOOP which spans multiple lines</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="196"/>
+        <location filename="main.cpp" line="188"/>
         <source>string</source>
         <comment>comment</comment>
         <extracomment>extra comment for NOOP3</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="198"/>
+        <location filename="main.cpp" line="190"/>
         <source>string continuation on next line</source>
         <translation type="unfinished"></translation>
     </message>