5 files changed, 144 insertions, 27 deletions

diff --git a/development/translation/shared/metatranslator.cpp b/development/translation/shared/metatranslator.cpp
index a01e1eb..51270c5 100644
--- a/development/translation/shared/metatranslator.cpp
+++ b/development/translation/shared/metatranslator.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.
 **
@@ -140,3 +146,4 @@ bool TsHandler::endElement( const QString& /* namespaceURI */,
             if ( contextIsUtf8 )
-                tor->insert( MetaTranslatorMessage(context.utf8(), "",
+                tor->insert( MetaTranslatorMessage(context.utf8(),
+                             ContextComment,
                              accum.utf8(), QString::null, TRUE,
@@ -144,3 +151,4 @@ bool TsHandler::endElement( const QString& /* namespaceURI */,
             else
-                tor->insert( MetaTranslatorMessage(context.ascii(), "",
+                tor->insert( MetaTranslatorMessage(context.ascii(),
+                             ContextComment,
                              accum.ascii(), QString::null, FALSE,
@@ -317,4 +325,4 @@ bool MetaTranslatorMessage::operator<( const MetaTranslatorMessage& m ) const
 MetaTranslator::MetaTranslator()
-    : codecName( "ISO-8859-1" ), codec( 0 )
 {
+    clear();
 }
@@ -324,3 +332,2 @@ MetaTranslator::MetaTranslator( const MetaTranslator& tor )
 {
-
 }
@@ -335,6 +342,11 @@ MetaTranslator& MetaTranslator::operator=( const MetaTranslator& tor )
 
-bool MetaTranslator::load( const QString& filename )
+void MetaTranslator::clear()
 {
     mm.clear();
+    codecName = "ISO-8859-1";
+    codec = 0;
+}
 
+bool MetaTranslator::load( const QString& filename )
+{
     QFile f( filename );
@@ -346,3 +358,2 @@ bool MetaTranslator::load( const QString& filename )
     QXmlSimpleReader reader;
-    // don't click on these!
     reader.setFeature( "http://xml.org/sax/features/namespaces", FALSE );
@@ -360,4 +371,2 @@ bool MetaTranslator::load( const QString& filename )
     f.close();
-    if ( !ok )
-        mm.clear();
     return ok;
@@ -386,3 +395,3 @@ bool MetaTranslator::save( const QString& filename ) const
         do {
-            if ( QCString(m.key().sourceText()).isEmpty() ) {
+            if ( QCString(m.key().sourceText()) == ContextComment ) {
                 if ( m.key().type() != MetaTranslatorMessage::Obsolete ) {
@@ -439,3 +448,4 @@ bool MetaTranslator::save( const QString& filename ) const
 
-bool MetaTranslator::release( const QString& filename, bool verbose ) const
+bool MetaTranslator::release( const QString& filename, bool verbose,
+                              QTranslator::SaveMode mode ) const
 {
@@ -481,3 +491,3 @@ bool MetaTranslator::release( const QString& filename, bool verbose ) const
 
-    bool saved = tor.save( filename, QTranslator::Stripped );
+    bool saved = tor.save( filename, mode );
     if ( saved && verbose )
@@ -525,3 +535,3 @@ void MetaTranslator::stripEmptyContexts()
     while ( m != mm.end() ) {
-        if ( QCString(m.key().sourceText()).isEmpty() ) {
+        if ( QCString(m.key().sourceText()) == ContextComment ) {
             TMM::Iterator n = m;
diff --git a/development/translation/shared/metatranslator.h b/development/translation/shared/metatranslator.h
index d35b202..a13f462 100644
--- a/development/translation/shared/metatranslator.h
+++ b/development/translation/shared/metatranslator.h
@@ -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.
 **
@@ -72,5 +78,7 @@ public:
 
+    void clear();
     bool load( const QString& filename );
     bool save( const QString& filename ) const;
-    bool release( const QString& filename, bool verbose = FALSE ) const;
+    bool release( const QString& filename, bool verbose = FALSE,
+                  QTranslator::SaveMode mode = QTranslator::Stripped ) const;
 
@@ -98,2 +106,8 @@ private:
 
+/*
+  This is a quick hack. The proper way to handle this would be
+  to extend MetaTranslator's interface.
+*/
+#define ContextComment "QT_LINGUIST_INTERNAL_CONTEXT_COMMENT"
+
 #endif
diff --git a/development/translation/shared/opie.h b/development/translation/shared/opie.h
index 4646bb0..28b2a61 100644
--- a/development/translation/shared/opie.h
+++ b/development/translation/shared/opie.h
@@ -11,3 +11,3 @@ public:
     QStringList languageList(const QString& opiedir = QString::null)const;
-    QString opieDir(const QString& opieDir)const;
+    QString opieDir(const QString& opieDir = QString::null)const;
 
diff --git a/development/translation/shared/proparser.cpp b/development/translation/shared/proparser.cpp
index 21d2f86..f616c5a 100644
--- a/development/translation/shared/proparser.cpp
+++ b/development/translation/shared/proparser.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.
 **
@@ -22,6 +28,32 @@
 
+#include <qfile.h>
 #include <qregexp.h>
 #include <qstringlist.h>
+#include <qtextstream.h>
+
+#ifdef Q_OS_UNIX
+#include <unistd.h>
+#endif
+
+#ifdef Q_OS_WIN32
+#define QT_POPEN _popen
+#else
+#define QT_POPEN popen
+#endif
+
+QString loadFile( const QString &fileName )
+{
+    QFile file( fileName );
+    if ( !file.open(IO_ReadOnly) ) {
+        fprintf( stderr, "error: Cannot load '%s': %s\n",
+                 file.name().latin1(),
+                 file.errorString().latin1() );
+        return QString();
+    }
+
+    QTextStream in( &file );
+    return in.read();
+}
 
-QMap<QString, QString> proFileTagMap( const QString& text )
+QMap<QString, QString> proFileTagMap( const QString& text, const QString& opieDir )
 {
@@ -30,2 +62,13 @@ QMap<QString, QString> proFileTagMap( const QString& text )
     /*
+      Process include() commands.
+    */
+    QRegExp callToInclude("include\\s*\\(\\s*([^()\\s]+)\\s*\\)");
+    int i = 0;
+    while ( (i = callToInclude.search(t, i)) != -1 ) {
+        QString after = loadFile( callToInclude.cap(1) );
+        t.replace( i, callToInclude.matchedLength(), after );
+        i += after.length();
+    }
+
+    /*
       Strip comments, merge lines ending with backslash, add
@@ -34,4 +77,4 @@ QMap<QString, QString> proFileTagMap( const QString& text )
     */
-    t.replace( QRegExp(QString("#[^\n]$")), QString(" ") );
-    t.replace( QRegExp(QString("\\\\\\s*\n")), QString(" ") );
+    t.replace( QRegExp(QString("#[^\n]*\n")), QString(" ") );
+    t.replace( QRegExp(QString("\\\\[^\n\\S]*\n")), QString(" ") );
     t.replace( "=", QString(" = ") );
@@ -41,4 +84,6 @@ QMap<QString, QString> proFileTagMap( const QString& text )
 
+    /*
+      Populate tagMap with 'key = value' entries.
+    */
     QMap<QString, QString> tagMap;
-
     QStringList lines = QStringList::split( QChar(';'), t );
@@ -48,3 +93,3 @@ QMap<QString, QString> proFileTagMap( const QString& text )
 
-        if ( toks.count() >= 3 && 
+        if ( toks.count() >= 3 &&
              (toks[1] == QString("=") || toks[1] == QString("+=")) ) {
@@ -70,3 +115,7 @@ QMap<QString, QString> proFileTagMap( const QString& text )
 
-    QRegExp var( "\\$\\$[a-zA-Z0-9_]+" );
+    /*
+      Expand $$variables within the 'value' part of a 'key = value'
+      pair.
+    */
+    QRegExp var( "\\$\\$[({]?([a-zA-Z0-9_]+)[)}]?" );
     QMap<QString, QString>::Iterator it;
@@ -74,10 +123,47 @@ QMap<QString, QString> proFileTagMap( const QString& text )
         int i = 0;
-
-        while ( (i = var.search(it.data(), i)) != -1 ) {
+        while ( (i = var.search((*it), i)) != -1 ) {
             int len = var.matchedLength();
-            QString invocation = (*it).mid( i + 2, len - 2 );
+            QString invocation = var.cap(1);
             QString after;
-            if ( tagMap.contains(invocation) )
-                after = tagMap[invocation];
-            (*it).replace( i, len, after );
+
+            if ( invocation == "system" ) {
+                // skip system(); it will be handled in the next pass
+                ++i;
+            } else if ( invocation == "OPIEDIR") {
+                (*it).replace( i, len, opieDir );
+            }else {
+                if ( tagMap.contains(invocation) )
+                    after = tagMap[invocation];
+                (*it).replace( i, len, after );
+            }
+        }
+    }
+
+    /*
+      Execute system() calls.
+    */
+    QRegExp callToSystem( "\\$\\$system\\s*\\(([^()]*)\\)" );
+    for ( it = tagMap.begin(); it != tagMap.end(); ++it ) {
+        int i = 0;
+        while ( (i = callToSystem.search((*it), i)) != -1 ) {
+            /*
+              This code is stolen from qmake's project.cpp file.
+              Ideally we would use the same parser, so we wouldn't
+              have this code duplication.
+            */
+            QString after;
+            char buff[256];
+            FILE *proc = QT_POPEN( callToSystem.cap(1).latin1(), "r" );
+            while ( proc && !feof(proc) ) {
+                int read_in = fread( buff, 1, 255, proc );
+                if ( !read_in )
+                    break;
+                for ( int i = 0; i < read_in; i++ ) {
+                    if ( buff[i] == '\n' || buff[i] == '\t' )
+                        buff[i] = ' ';
+                }
+                buff[read_in] = '\0';
+                after += buff;
+            }
+            (*it).replace( i, callToSystem.matchedLength(), after );
             i += after.length();
@@ -85,2 +171,3 @@ QMap<QString, QString> proFileTagMap( const QString& text )
     }
+
     return tagMap;
diff --git a/development/translation/shared/proparser.h b/development/translation/shared/proparser.h
index 6a61d90..e5678d6 100644
--- a/development/translation/shared/proparser.h
+++ b/development/translation/shared/proparser.h
@@ -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.
 **
@@ -26,3 +32,3 @@
 
-QMap<QString, QString> proFileTagMap( const QString& text );
+QMap<QString, QString> proFileTagMap( const QString& text, const QString& = QString::null );