Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1157645 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 3 insertions, 3 deletions

diff --git a/python/pyqt/pylupdate3/merge.cpp b/python/pyqt/pylupdate3/merge.cpp
index c569c938..6ae9673d 100644
--- a/python/pyqt/pylupdate3/merge.cpp
+++ b/python/pyqt/pylupdate3/merge.cpp
@@ -21,7 +21,7 @@ extern void applyNumberHeuristic( MetaTranslator *tor, bool verbose );
 // defined in sametexth.cpp
 extern void applySameTextHeuristic( MetaTranslator *tor, bool verbose );
 
-typedef QValueList<MetaTranslatorMessage> TML;
+typedef TQValueList<MetaTranslatorMessage> TML;
 
 /*
   Merges two MetaTranslator objects into the first one.  The first one is a set
@@ -47,7 +47,7 @@ void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose )
 	MetaTranslatorMessage m = *it;
 
 	// skip context comment
-	if ( !QCString((*it).sourceText()).isEmpty() ) {
+	if ( !TQCString((*it).sourceText()).isEmpty() ) {
 	    if ( !virginTor->contains((*it).context(), (*it).sourceText(),
 				      (*it).comment()) ) {
 		newType = MetaTranslatorMessage::Obsolete;
@@ -86,7 +86,7 @@ void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose )
 	if ( !tor->contains((*it).context(), (*it).sourceText(),
 			    (*it).comment()) ) {
 	    tor->insert( *it );
-	    if ( !QCString((*it).sourceText()).isEmpty() )
+	    if ( !TQCString((*it).sourceText()).isEmpty() )
 		neww++;
 	}
     }