From 479f5f799523bffbcc83dff581a2299c047c6fff Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:44:01 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1157645 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- python/pyqt/pylupdate3/merge.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'python/pyqt/pylupdate3/merge.cpp') 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 TML; +typedef TQValueList 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++; } } -- cgit v1.2.3