From 5892406fe5e04f363aed3f5f903d8da601c9cf56 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 1 Oct 2009 19:14:31 +0200
Subject: =?UTF-8?q?unscrew=20line=20numbers=20...=20again.=20!@=C2=A7$#%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linguist/lupdate/testdata/good/merge_ordering/project.ts.result | 2 +-
 tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.before | 6 +++---
 tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.result | 6 +++---
 .../lupdate/testdata/good/multiple_locations/project.ts.result      | 6 +++---
 .../linguist/lupdate/testdata/good/namespaces/project.ts.result     | 2 +-
 tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result | 4 ++--
 tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result  | 6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result
index 5104860..4fe1e37 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result
@@ -4,7 +4,7 @@
 <context>
     <name>Foo</name>
     <message>
-        <location filename="foo.cpp" line="+54"/>
+        <location filename="foo.cpp" line="+53"/>
         <source>This is the first entry.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.before
index e297784..1602dcc 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.before
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.before
@@ -3,18 +3,18 @@
 <context>
     <name>FindDialog</name>
     <message>
-        <location filename="project.ui" line="27"/>
+        <location filename="project.ui" line="55"/>
         <source>Qt Assistant - Find text</source>
         <!--should be changed to unfinished, since we are changing the sourcetext in the ui file-->
         <translation>Qt Assistant - Finn tekst</translation>
     </message>
     <message>
-        <location filename="project.ui" line="30"/>
+        <location filename="project.ui" line="58"/>
         <source>300px</source>
         <translation>300px</translation>
     </message>
     <message>
-        <location filename="project.ui" line="33"/>
+        <location filename="project.ui" line="61"/>
         <source>400px</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.result
index b21f583..a56a547 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.result
@@ -4,18 +4,18 @@
 <context>
     <name>FindDialog</name>
     <message>
-        <location filename="project.ui" line="27"/>
+        <location filename="project.ui" line="55"/>
         <source>Qt Assistant - Find Text</source>
         <oldsource>Qt Assistant - Find text</oldsource>
         <translation type="unfinished">Qt Assistant - Finn tekst</translation>
     </message>
     <message>
-        <location filename="project.ui" line="30"/>
+        <location filename="project.ui" line="58"/>
         <source>300px</source>
         <translation>300px</translation>
     </message>
     <message>
-        <location filename="project.ui" line="33"/>
+        <location filename="project.ui" line="61"/>
         <source>401 pixels</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result
index ec1f02f..a7ae155 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result
@@ -4,9 +4,9 @@
 <context>
     <name>context</name>
     <message>
-        <location filename="finddialog.cpp" line="43"/>
-        <location filename="finddialog.cpp" line="48"/>
-        <location filename="main.cpp" line="47"/>
+        <location filename="finddialog.cpp" line="42"/>
+        <location filename="finddialog.cpp" line="47"/>
+        <location filename="main.cpp" line="46"/>
         <source>just a message</source>
         <extracomment>This is one comment
 ----------
diff --git a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result
index bb5b739..c1a34bd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result
@@ -30,7 +30,7 @@
 <context>
     <name>Outer::Middle1::Different</name>
     <message>
-        <location filename="main.cpp" line="106/>
+        <location filename="main.cpp" line="106"/>
         <source>different namespaced class def</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result
index ddf58c3..b27d239 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result
@@ -4,12 +4,12 @@
 <context>
     <name>FindDialog</name>
     <message>
-        <location filename="project.ui" line="27"/>
+        <location filename="project.ui" line="55"/>
         <source>Qt Assistant - Finn text</source>
         <translation type="unfinished"></translation>
     </message>
     <message utf8="true">
-        <location filename="project.ui" line="30"/>
+        <location filename="project.ui" line="58"/>
         <source>Finn tekst - Der Bjørn möchte auch mal.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result
index c15b986..e356921 100644
--- a/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result
@@ -4,18 +4,18 @@
 <context>
     <name>Foo</name>
     <message>
-        <location filename="main.cpp" line="46"/>
+        <location filename="main.cpp" line="45"/>
         <source>XXX</source>
         <comment>YYY</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="51"/>
+        <location filename="main.cpp" line="50"/>
         <source>CTOR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="56"/>
+        <location filename="main.cpp" line="55"/>
         <source>BAR</source>
         <translation type="unfinished"></translation>
     </message>
-- 
cgit v0.12


From 3c2d0a7812a7add0aa954657356ecce136ad6f42 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 1 Oct 2009 19:14:31 +0200
Subject: don't ignore first character in each .java file

backport of 59aa130bb9209aa1809c7bd31f694265eeb1baf1
---
 tools/linguist/shared/java.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/linguist/shared/java.cpp b/tools/linguist/shared/java.cpp
index be34d20..109650c 100644
--- a/tools/linguist/shared/java.cpp
+++ b/tools/linguist/shared/java.cpp
@@ -634,7 +634,6 @@ bool loadJava(Translator &translator, QIODevice &dev, ConversionData &cd)
     yyFileName = cd.m_sourceFileName;
     yyCurLineNo = 1;
     yyParenLineNo = 1;
-    yyCh = getChar();
 
     parse(&translator);
 
-- 
cgit v0.12