5 files changed, 84 insertions, 22 deletions

diff --git a/development/translation/opie-lupdate/fetchtr.cpp b/development/translation/opie-lupdate/fetchtr.cpp
index d1f5881..a137628 100644
--- a/development/translation/opie-lupdate/fetchtr.cpp
+++ b/development/translation/opie-lupdate/fetchtr.cpp
@@ -10,2 +10,6 @@
 **
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
+**
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -14,2 +18,4 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+**   information about Qt Commercial License Agreements.
 **
@@ -82,2 +88,3 @@ static size_t yyStringLen;
 static QValueStack<int> yySavedBraceDepth;
+static QValueStack<int> yySavedParenDepth;
 static int yyBraceDepth;
@@ -86,2 +93,4 @@ static int yyLineNo;
 static int yyCurLineNo;
+static int yyBraceLineNo;
+static int yyParenLineNo;
 
@@ -121,2 +130,3 @@ static void startTokenizer( const char *fileName, int (*getCharFunc)() )
     yySavedBraceDepth.clear();
+    yySavedParenDepth.clear();
     yyBraceDepth = 0;
@@ -124,2 +134,4 @@ static void startTokenizer( const char *fileName, int (*getCharFunc)() )
     yyCurLineNo = 1;
+    yyBraceLineNo = 1;
+    yyParenLineNo = 1;
 }
@@ -166,2 +178,15 @@ static int getToken()
                 break;
+            case 'f':
+                /*
+                  QTranslator::findMessage() has the same parameters as
+                  QApplication::translate().
+                */
+                if ( strcmp(yyIdent + 1, "indMessage") == 0 )
+                    return Tok_translate;
+                break;
+            case 'i':
+                /* FOR KDE APPS */
+                if ( strcmp( yyIdent + 1,  "8n") == 0 )
+                    return Tok_translate;
+                break;
             case 'n':
@@ -178,5 +203,2 @@ static int getToken()
                 break;
-            case 'i':
-                if( strcmp(yyIdent + 1, "18n") == 0 ) 
-                    return Tok_tr;
             case 't':
@@ -224,2 +246,3 @@ static int getToken()
                         yySavedBraceDepth.push( yyBraceDepth );
+                        yySavedParenDepth.push( yyParenDepth );
                     }
@@ -230,8 +253,12 @@ static int getToken()
                         // elif, else
-                        if ( !yySavedBraceDepth.isEmpty() )
+                        if ( !yySavedBraceDepth.isEmpty() ) {
                             yyBraceDepth = yySavedBraceDepth.top();
+                            yyParenDepth = yySavedParenDepth.top();
+                        }
                     } else if ( yyCh == 'n' ) {
                         // endif
-                        if ( !yySavedBraceDepth.isEmpty() )
+                        if ( !yySavedBraceDepth.isEmpty() ) {
                             yySavedBraceDepth.pop();
+                            yySavedParenDepth.pop();
+                        }
                     }
@@ -358,2 +385,4 @@ static int getToken()
             case '{':
+                if (yyBraceDepth == 0)
+                    yyBraceLineNo = yyCurLineNo;
                 yyBraceDepth++;
@@ -362,2 +391,4 @@ static int getToken()
             case '}':
+                if (yyBraceDepth == 0)
+                    yyBraceLineNo = yyCurLineNo;
                 yyBraceDepth--;
@@ -366,2 +397,4 @@ static int getToken()
             case '(':
+                if (yyParenDepth == 0)
+                    yyParenLineNo = yyCurLineNo;
                 yyParenDepth++;
@@ -370,2 +403,4 @@ static int getToken()
             case ')':
+                if (yyParenDepth == 0)
+                    yyParenLineNo = yyCurLineNo;
                 yyParenDepth--;
@@ -623,10 +658,10 @@ static void parse( MetaTranslator *tor, const char *initialContext,
         fprintf( stderr,
-                 "%s: Unbalanced braces in C++ code (or abuse of the C++"
+                 "%s:%d: Unbalanced braces in C++ code (or abuse of the C++"
                   " preprocessor)\n",
-                  (const char *) yyFileName );
-    if ( yyParenDepth != 0 )
+                  (const char *)yyFileName, yyBraceLineNo );
+    else if ( yyParenDepth != 0 )
         fprintf( stderr,
-                 "%s: Unbalanced parentheses in C++ code (or abuse of the C++"
+                 "%s:%d: Unbalanced parentheses in C++ code (or abuse of the C++"
                  " preprocessor)\n",
-                 (const char *) yyFileName );
+                 (const char *)yyFileName, yyParenLineNo );
 }
diff --git a/development/translation/opie-lupdate/main.cpp b/development/translation/opie-lupdate/main.cpp
index ce65e7a..bf16fd7 100644
--- a/development/translation/opie-lupdate/main.cpp
+++ b/development/translation/opie-lupdate/main.cpp
@@ -64,2 +64,11 @@ static void printUsage()
 
+/*static QString opie_escape( const QString& str ) {
+    QString ret = str.stripWhiteSpace();
+    qWarning(ret);
+    if ( ret.startsWith("$$(OPIEDIR)") )
+        ret = ret.replace("$$(OPIEDIR)", OPIE::self()->opieDir() );
+    qWarning(ret);
+    return ret;
+    }*/
+
 static void updateTsFiles( const MetaTranslator& fetchedTor,
@@ -152,3 +161,3 @@ int main( int argc, char **argv )
 
-        QMap<QString, QString> tagMap = proFileTagMap( fullText );
+        QMap<QString, QString> tagMap = proFileTagMap( fullText, OPIE::self()->opieDir() );
         QMap<QString, QString>::Iterator it;
diff --git a/development/translation/opie-lupdate/merge.cpp b/development/translation/opie-lupdate/merge.cpp
index a96104e..3001d4b 100644
--- a/development/translation/opie-lupdate/merge.cpp
+++ b/development/translation/opie-lupdate/merge.cpp
@@ -10,2 +10,6 @@
 **
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
+**
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -14,2 +18,4 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+**   information about Qt Commercial License Agreements.
 **
diff --git a/development/translation/opie-lupdate/numberh.cpp b/development/translation/opie-lupdate/numberh.cpp
index f7b7bf8..2f12c3d 100644
--- a/development/translation/opie-lupdate/numberh.cpp
+++ b/development/translation/opie-lupdate/numberh.cpp
@@ -10,2 +10,6 @@
 **
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
+**
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -14,2 +18,4 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+**   information about Qt Commercial License Agreements.
 **
@@ -34,3 +40,3 @@ static bool isDigitFriendly( int c )
 {
-    return ispunct( c ) || isspace( c );
+    return ispunct((uchar)c) || isspace((uchar)c);
 }
@@ -41,9 +47,9 @@ static int numberLength( const char *s )
 
-    if ( isdigit(s[0]) ) {
+    if ( isdigit((uchar)s[0]) ) {
         do {
             i++;
-        } while ( isdigit(s[i]) ||
-                  (isDigitFriendly(s[i]) &&
-                   (isdigit(s[i + 1]) ||
-                    (isDigitFriendly(s[i + 1]) && isdigit(s[i + 2])))) );
+        } while (isdigit((uchar)s[i]) ||
+                 (isDigitFriendly(s[i]) &&
+                  (isdigit((uchar)s[i + 1]) ||
+                   (isDigitFriendly(s[i + 1]) && isdigit((uchar)s[i + 2])))));
     }
@@ -213,3 +219,4 @@ void applyNumberHeuristic( MetaTranslator *tor, bool verbose )
             if ( (*it).translation().isEmpty() )
-                untranslated.insert( zeroKey((*it).sourceText()), *it );
+                untranslated.insert(QCString((*it).context()) + "\n" + (*it).sourceText() + "\n"
+                                    + (*it).comment(), *it);
         } else if ( !(*it).translation().isEmpty() ) {
@@ -220,3 +227,3 @@ void applyNumberHeuristic( MetaTranslator *tor, bool verbose )
     for ( u = untranslated.begin(); u != untranslated.end(); ++u ) {
-        t = translated.find( u.key() );
+        t = translated.find( zeroKey((*u).sourceText()) );
         if ( t != translated.end() && !t.key().isEmpty() &&
@@ -224,5 +231,4 @@ void applyNumberHeuristic( MetaTranslator *tor, bool verbose )
             MetaTranslatorMessage m( *u );
-            m.setTranslation( translationAttempt((*t).translation(),
-                                                 (*t).sourceText(),
-                                                 (*u).sourceText()) );
+            m.setTranslation(translationAttempt((*t).translation(), (*t).sourceText(),
+                                                (*u).sourceText()));
             tor->insert( m );
diff --git a/development/translation/opie-lupdate/sametexth.cpp b/development/translation/opie-lupdate/sametexth.cpp
index 574cfd5..80909b3 100644
--- a/development/translation/opie-lupdate/sametexth.cpp
+++ b/development/translation/opie-lupdate/sametexth.cpp
@@ -10,2 +10,6 @@
 **
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
+**
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -14,2 +18,4 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+**   information about Qt Commercial License Agreements.
 **