Update lupdate and shared to Qt3.3 qt-copy sources

Some special replacement for $$(OPIEDIR) to make ar_* happy

1 files changed, 22 insertions, 12 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
@@ -3,20 +3,26 @@
 **
 ** This file is part of Qt Linguist.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** 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
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** 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.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "metatranslator.h"
 
@@ -133,21 +139,23 @@ bool TsHandler::endElement( const QString& /* namespaceURI */,
         context = accum;
     } else if ( qName == QString("source") ) {
         source = accum;
     } else if ( qName == QString("comment") ) {
         if ( inMessage ) {
             comment = accum;
         } else {
             if ( contextIsUtf8 )
-                tor->insert( MetaTranslatorMessage(context.utf8(), "",
+                tor->insert( MetaTranslatorMessage(context.utf8(),
+                             ContextComment,
                              accum.utf8(), QString::null, TRUE,
                              MetaTranslatorMessage::Unfinished) );
             else
-                tor->insert( MetaTranslatorMessage(context.ascii(), "",
+                tor->insert( MetaTranslatorMessage(context.ascii(),
+                             ContextComment,
                              accum.ascii(), QString::null, FALSE,
                              MetaTranslatorMessage::Unfinished) );
         }
     } else if ( qName == QString("translation") ) {
         translation = accum;
     } else if ( qName == QString("message") ) {
         if ( messageIsUtf8 )
             tor->insert( MetaTranslatorMessage(context.utf8(), source.utf8(),
@@ -310,61 +318,62 @@ bool MetaTranslatorMessage::operator<( const MetaTranslatorMessage& m ) const
     if ( delta == 0 )
         delta = qstrcmp( sourceText(), m.sourceText() );
     if ( delta == 0 )
         delta = qstrcmp( comment(), m.comment() );
     return delta < 0;
 }
 
 MetaTranslator::MetaTranslator()
-    : codecName( "ISO-8859-1" ), codec( 0 )
 {
+    clear();
 }
 
 MetaTranslator::MetaTranslator( const MetaTranslator& tor )
     : mm( tor.mm ), codecName( tor.codecName ), codec( tor.codec )
 {
-
 }
 
 MetaTranslator& MetaTranslator::operator=( const MetaTranslator& tor )
 {
     mm = tor.mm;
     codecName = tor.codecName;
     codec = tor.codec;
     return *this;
 }
 
-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 );
     if ( !f.open(IO_ReadOnly) )
         return FALSE;
 
     QTextStream t( &f );
     QXmlInputSource in( t );
     QXmlSimpleReader reader;
-    // don't click on these!
     reader.setFeature( "http://xml.org/sax/features/namespaces", FALSE );
     reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", TRUE );
     reader.setFeature( "http://trolltech.com/xml/features/report-whitespace"
                        "-only-CharData", FALSE );
     QXmlDefaultHandler *hand = new TsHandler( this );
     reader.setContentHandler( hand );
     reader.setErrorHandler( hand );
 
     bool ok = reader.parse( in );
     reader.setContentHandler( 0 );
     reader.setErrorHandler( 0 );
     delete hand;
     f.close();
-    if ( !ok )
-        mm.clear();
     return ok;
 }
 
 bool MetaTranslator::save( const QString& filename ) const
 {
     QFile f( filename );
     if ( !f.open(IO_WriteOnly) )
         return FALSE;
@@ -379,17 +388,17 @@ bool MetaTranslator::save( const QString& filename ) const
     while ( m != mm.end() ) {
         TMMInv inv;
         TMMInv::Iterator i;
         bool contextIsUtf8 = m.key().utf8();
         QCString context = m.key().context();
         QCString comment = "";
 
         do {
-            if ( QCString(m.key().sourceText()).isEmpty() ) {
+            if ( QCString(m.key().sourceText()) == ContextComment ) {
                 if ( m.key().type() != MetaTranslatorMessage::Obsolete ) {
                     contextIsUtf8 = m.key().utf8();
                     comment = QCString( m.key().comment() );
                 }
             } else {
                 inv.insert( *m, m.key() );
             }
         } while ( ++m != mm.end() && QCString(m.key().context()) == context );
@@ -432,17 +441,18 @@ bool MetaTranslator::save( const QString& filename ) const
         }
         t << "</context>\n";
     }
     t << "</TS>\n";
     f.close();
     return TRUE;
 }
 
-bool MetaTranslator::release( const QString& filename, bool verbose ) const
+bool MetaTranslator::release( const QString& filename, bool verbose,
+                              QTranslator::SaveMode mode ) const
 {
     QTranslator tor( 0 );
     int finished = 0;
     int unfinished = 0;
     int untranslated = 0;
     TMM::ConstIterator m;
 
     for ( m = mm.begin(); m != mm.end(); ++m ) {
@@ -474,17 +484,17 @@ bool MetaTranslator::release( const QString& filename, bool verbose ) const
                 } else {
                     tor.insert( QTranslatorMessage(context, sourceText, "",
                                                    translation) );
                 }
             }
         }
     }
 
-    bool saved = tor.save( filename, QTranslator::Stripped );
+    bool saved = tor.save( filename, mode );
     if ( saved && verbose )
         fprintf( stderr,
                  " %d finished, %d unfinished and %d untranslated messages\n",
                  finished, unfinished, untranslated );
                 
     return saved;
 }
 
@@ -518,17 +528,17 @@ void MetaTranslator::stripObsoleteMessages()
 }
 
 void MetaTranslator::stripEmptyContexts()
 {
     TMM newmm;
 
     TMM::Iterator m = mm.begin();
     while ( m != mm.end() ) {
-        if ( QCString(m.key().sourceText()).isEmpty() ) {
+        if ( QCString(m.key().sourceText()) == ContextComment ) {
             TMM::Iterator n = m;
             ++n;
             // the context comment is followed by other messages
             if ( n != newmm.end() &&
                  qstrcmp(m.key().context(), n.key().context()) == 0 )
                 newmm.insert( m.key(), *m );
         } else {
             newmm.insert( m.key(), *m );