From 0ffe839d6e363933ed4d9d212b6fd325a6fc3225 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 25 Sep 2023 20:06:11 +0900 Subject: [PATCH] Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version Signed-off-by: Michele Calgaro --- cervisia/HACKING | 2 +- cervisia/cvsservice/DESIGN | 8 +-- doc/man/kspy/testkspy.1 | 6 +- doc/man/scripts/qtdoc.1 | 4 +- doc/scripts/man-qtdoc.1.docbook | 4 +- kbabel/kbabeldict/modules/dbsearchengine/TODO | 4 +- kmtrace/kde.excludes | 8 +-- kompare/tests/cvsdiff/context.diff | 4 +- kompare/tests/cvsdiff/contextm.diff | 56 +++++++++---------- kompare/tests/cvsdiff/edm.diff | 36 ++++++------ kompare/tests/cvsdiff/normalm.diff | 48 ++++++++-------- kompare/tests/cvsdiff/rcsm.diff | 36 ++++++------ kompare/tests/cvsdiff/unified.diff | 2 +- kompare/tests/cvsdiff/unifiedm.diff | 52 ++++++++--------- kompare/tests/diff/contextm.diff | 56 +++++++++---------- kompare/tests/diff/edm.diff | 36 ++++++------ kompare/tests/diff/normalm.diff | 48 ++++++++-------- kompare/tests/diff/rcsm.diff | 36 ++++++------ kompare/tests/diff/unifiedm.diff | 52 ++++++++--------- poxml/gettext.g | 14 ++--- scripts/add_trace.pl | 4 +- scripts/fixheaders | 6 +- scripts/includemocs | 4 +- scripts/kDebug2kdDebug.sh | 4 +- scripts/kde-devel-gdb | 12 ++-- scripts/kde-devel-vim.vim | 2 +- scripts/kde-emacs/klaralv.el | 2 +- .../cppcodegenerationformbase.ui | 2 +- 28 files changed, 274 insertions(+), 274 deletions(-) diff --git a/cervisia/HACKING b/cervisia/HACKING index de233c8a..c99b3dde 100644 --- a/cervisia/HACKING +++ b/cervisia/HACKING @@ -14,7 +14,7 @@ Formatting Example: -void MyClass::myFunction(const QString& arg) +void MyClass::myFunction(const TQString& arg) { if( blah == "halb" ) { diff --git a/cervisia/cvsservice/DESIGN b/cervisia/cvsservice/DESIGN index 02f0ed62..15c3eff4 100644 --- a/cervisia/cvsservice/DESIGN +++ b/cervisia/cvsservice/DESIGN @@ -27,7 +27,7 @@ USAGE How-to use this service in C++ applications: // start DCOP service - QString error; + TQString error; QCString appId; TDEApplication::startServiceByDesktopName("cvsservice", QStringList(), &error, @@ -47,7 +47,7 @@ How-to use this service in C++ applications: // connect to Q_SIGNALS to get output connectDCOPSignal(job.app(), job.obj(), "jobExited(bool, int)", [MY SLOT]); - connectDCOPSignal(job.app(), job.obj(), "receivedStdout(QString)", + connectDCOPSignal(job.app(), job.obj(), "receivedStdout(TQString)", [MY SLOT]); // execute the cvs command @@ -88,10 +88,10 @@ How-to use this service in a javascript: var appID = client.dcopStart("cvsservice"); // set directory of working copy - client.send(appID, "CvsRepository", "setWorkingCopy(QString)", "/home/user/kde/tdesdk/cervisia"); + client.send(appID, "CvsRepository", "setWorkingCopy(TQString)", "/home/user/kde/tdesdk/cervisia"); // call "cvs log" for cervisiapart.h - var job = client.call(appID, "CvsService", "log(QString)", "cervisiapart.h"); + var job = client.call(appID, "CvsService", "log(TQString)", "cervisiapart.h"); // execute the cvs command job.call("execute()"); diff --git a/doc/man/kspy/testkspy.1 b/doc/man/kspy/testkspy.1 index afdc702a..e6badec1 100644 --- a/doc/man/kspy/testkspy.1 +++ b/doc/man/kspy/testkspy.1 @@ -26,10 +26,10 @@ It simply uses KSpy to spy on itself. .PP \fBKSpy\fP is a tiny library which can be used to graphically display the TQObjects in use by a TQt/TDE app. In addition to the object tree, -you can also view the properties, signals and slots of any QObject. +you can also view the properties, signals and slots of any TQObject. .PP -Basically it provides much the same info as QObject::dumpObjectTree() and -QObject::dumpObjectInfo(), but in a much more convenient form. KSpy has +Basically it provides much the same info as TQObject::dumpObjectTree() and +TQObject::dumpObjectInfo(), but in a much more convenient form. KSpy has minimal overhead for the application, because the kspy library is loaded dynamically using KLibLoader. .PP diff --git a/doc/man/scripts/qtdoc.1 b/doc/man/scripts/qtdoc.1 index 3b7c09f6..46e17b1e 100644 --- a/doc/man/scripts/qtdoc.1 +++ b/doc/man/scripts/qtdoc.1 @@ -35,10 +35,10 @@ The directory beneath which the Qt documentation is installed. Thus the main Qt help page should be in \fI$QTDIR/doc/html/\fP. If $QTDIR is not set, \fI/usr/share/qt3\fP will be assumed. .SH EXAMPLES -To bring up help on class QString: +To bring up help on class TQString: .PP .RS -qtdoc QString +qtdoc TQString .RE .SH DEBIAN USERS The Qt documentation is in the Debian package \fIqt3-doc\fP, which will diff --git a/doc/scripts/man-qtdoc.1.docbook b/doc/scripts/man-qtdoc.1.docbook index 4924eb84..1ec4bac2 100644 --- a/doc/scripts/man-qtdoc.1.docbook +++ b/doc/scripts/man-qtdoc.1.docbook @@ -54,8 +54,8 @@ page for that class. Otherwise the main &Qt; help page is opened. Examples -To display the help on the class QString: -qtdoc +To display the help on the class TQString: +qtdoc diff --git a/kbabel/kbabeldict/modules/dbsearchengine/TODO b/kbabel/kbabeldict/modules/dbsearchengine/TODO index 0e7fbd3a..d50a572c 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/TODO +++ b/kbabel/kbabeldict/modules/dbsearchengine/TODO @@ -19,9 +19,9 @@ Major rewrite: -download compendium from the internet Matthias ask: -- searching in translations, equivalent to searching in msgids (SearchEngine::startTranslationSearch(QString s) ) +- searching in translations, equivalent to searching in msgids (SearchEngine::startTranslationSearch(TQString s) ) - the absolute path of the files and maybe the number of the entry in the file ( maybe I will add this information to the TranslationInfo ) - the possibility to get a list of all entries in a po file from the database. For this, I think, I will create a interface and send it to you. Maybe something like this: class TranslationDatabase { -public: // name is something like "kbabel.po" QList entriesOfFile(QString name); } +public: // name is something like "kbabel.po" QList entriesOfFile(TQString name); } diff --git a/kmtrace/kde.excludes b/kmtrace/kde.excludes index c442abbc..71291776 100644 --- a/kmtrace/kde.excludes +++ b/kmtrace/kde.excludes @@ -23,10 +23,10 @@ QTimer::singleShot QTextCodec::codecForLocale # Yeah, yeah we know that this metaobject stuff is never free'ed. QMetaObject::new_meta -QObject::initMetaObject -QObject::staticMetaObject -QString::sprintf -QWidget::createTLExtra +TQObject::initMetaObject +TQObject::staticMetaObject +TQString::sprintf +TQWidget::createTLExtra # static KDE stuff kdbgstream::flush TDECmdLineArgs::addCmdLineOptions diff --git a/kompare/tests/cvsdiff/context.diff b/kompare/tests/cvsdiff/context.diff index 8f955b5c..38c89bae 100644 --- a/kompare/tests/cvsdiff/context.diff +++ b/kompare/tests/cvsdiff/context.diff @@ -12,7 +12,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; @@ -20,7 +20,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); *************** *** 118,124 **** diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff index 436f926b..ea31b3f6 100644 --- a/kompare/tests/cvsdiff/contextm.diff +++ b/kompare/tests/cvsdiff/contextm.diff @@ -53,7 +53,7 @@ diff -c -r1.26 dcop.cpp #include "marshall.cpp" -+ typedef QMap UserList; ++ typedef QMap UserList; + static DCOPClient* dcop = 0; @@ -82,7 +82,7 @@ diff -c -r1.26 dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args ) { - - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); --- 146,153 ---- @@ -91,7 +91,7 @@ diff -c -r1.26 dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); *************** @@ -316,7 +316,7 @@ diff -c -r1.26 dcop.cpp ! * Return a list of available DCOP sessions for the specified user ! * An empty list means no sessions are available, or an error occurred. ! */ -! QStringList dcopSessionList( const QString &user, const QString &home ) +! QStringList dcopSessionList( const TQString &user, const TQString &home ) ! { ! if( home.isEmpty() ) ! { @@ -356,7 +356,7 @@ diff -c -r1.26 dcop.cpp + * Do the actual DCOP call + */ + void runDCOP( QCStringList args, UserList users, Session session, -+ const QString sessionName, bool readStdin ) ++ const TQString sessionName, bool readStdin ) + { QCString app; QCString objid; @@ -412,7 +412,7 @@ diff -c -r1.26 dcop.cpp ! QStringList sessions; ! bool presetDCOPServer = false; ! // char *dcopStr = 0L; -! QString dcopServer; +! TQString dcopServer; ! ! for( it = users.begin(); it != users.end() || firstRun; it++ ) ! { @@ -481,8 +481,8 @@ diff -c -r1.26 dcop.cpp + ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) ) + { + // Check for ICE authority file and if the file can be read by us -+ QString home = it.data(); -+ QString iceFile = it.data() + "/.ICEauthority"; ++ TQString home = it.data(); ++ TQString iceFile = it.data() + "/.ICEauthority"; + QFileInfo fi( iceFile ); + if( iceFile.isEmpty() ) + { @@ -531,7 +531,7 @@ diff -c -r1.26 dcop.cpp + { + if( !presetDCOPServer && !users.isEmpty() ) + { -+ QString dcopFile = it.data() + "/" + *sIt; ++ TQString dcopFile = it.data() + "/" + *sIt; + QFile f( dcopFile ); + if( !f.open( IO_ReadOnly ) ) + { @@ -628,9 +628,9 @@ diff -c -r1.26 dcop.cpp + { + bool readStdin = false; + int numOptions = 0; -+ QString user; ++ TQString user; + Session session = DefaultSession; -+ QString sessionName; ++ TQString sessionName; + + // Scan for command-line options first + for( int pos = 1 ; pos <= argc - 1 ; pos++ ) @@ -646,7 +646,7 @@ diff -c -r1.26 dcop.cpp + { + if( pos <= argc - 2 ) + { -+ user = QString::fromLocal8Bit( argv[ pos + 1] ); ++ user = TQString::fromLocal8Bit( argv[ pos + 1] ); + numOptions +=2; + pos++; + } @@ -744,7 +744,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; @@ -752,7 +752,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); *************** *** 118,124 **** @@ -825,10 +825,10 @@ diff -c -r1.3 marshall.cpp } -! void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) +! void marshall(QDataStream &arg, int argc, char **argv, int &i, TQString type) { ! if (type == "TQStringList") -! type = "QValueList"; +! type = "QValueList"; ! if (type == "QCStringList") ! type = "QValueList"; ! if (i >= argc) @@ -836,7 +836,7 @@ diff -c -r1.3 marshall.cpp ! tqWarning("Not enough arguments."); ! exit(1); ! } -! QString s = QString::fromLocal8Bit(argv[i]); +! TQString s = TQString::fromLocal8Bit(argv[i]); ! ! if ( type == "int" ) ! arg << s.toInt(); @@ -864,7 +864,7 @@ diff -c -r1.3 marshall.cpp ! arg << s; ! else if ( type == "QCString" ) ! arg << QCString( argv[i] ); -! else if ( type == "QColor" ) +! else if ( type == "TQColor" ) ! arg << mkColor( s ); ! else if ( type == "TQPoint" ) ! arg << mkPoint( s ); @@ -883,14 +883,14 @@ diff -c -r1.3 marshall.cpp ! arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); ! else if ( s.left( 6 ) == "QRect(" ) ! arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -! else if ( s.left( 7 ) == "QColor(" ) +! else if ( s.left( 7 ) == "TQColor(" ) ! arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); ! else ! arg << QVariant( s ); ! } else if ( type.startsWith("QValueList<")) { ! type = type.mid(11, type.length() - 12); ! QStringList list; -! QString delim = s; +! TQString delim = s; ! if (delim == "[") ! delim = "]"; ! if (delim == "(") @@ -934,10 +934,10 @@ diff -c -r1.3 marshall.cpp } -! void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) +! void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type ) { ! if (type == "TQStringList") -! type = "QValueList"; +! type = "QValueList"; ! if (type == "QCStringList") ! type = "QValueList"; ! if( i > args.count() ) @@ -945,7 +945,7 @@ diff -c -r1.3 marshall.cpp ! tqWarning("Not enough arguments."); ! exit(1); ! } -! QString s = QString::fromLocal8Bit( args[ i ] ); +! TQString s = TQString::fromLocal8Bit( args[ i ] ); ! if ( type == "int" ) ! arg << s.toInt(); @@ -973,7 +973,7 @@ diff -c -r1.3 marshall.cpp ! arg << s; ! else if ( type == "QCString" ) ! arg << QCString( args[ i ] ); -! else if ( type == "QColor" ) +! else if ( type == "TQColor" ) ! arg << mkColor( s ); ! else if ( type == "TQPoint" ) ! arg << mkPoint( s ); @@ -992,14 +992,14 @@ diff -c -r1.3 marshall.cpp ! arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); ! else if ( s.left( 6 ) == "QRect(" ) ! arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -! else if ( s.left( 7 ) == "QColor(" ) +! else if ( s.left( 7 ) == "TQColor(" ) ! arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); ! else ! arg << QVariant( s ); ! } else if ( type.startsWith("QValueList<")) { ! type = type.mid(11, type.length() - 12); ! QStringList list; -! QString delim = s; +! TQString delim = s; ! if (delim == "[") ! delim = "]"; ! if (delim == "(") @@ -1017,7 +1017,7 @@ diff -c -r1.3 marshall.cpp + tqWarning("List end-delimiter '%s' not found.", delim.latin1()); + exit(1); + } -+ if( QString::fromLocal8Bit( args[ j ] ) == delim ) ++ if( TQString::fromLocal8Bit( args[ j ] ) == delim ) + break; + marshall( dummy_arg, args, j, type ); + count++; @@ -1030,7 +1030,7 @@ diff -c -r1.3 marshall.cpp + tqWarning("List end-delimiter '%s' not found.", delim.latin1()); + exit(1); + } -+ if( QString::fromLocal8Bit( args[ i ] ) == delim ) ++ if( TQString::fromLocal8Bit( args[ i ] ) == delim ) + break; + marshall( arg, args, i, type ); + } diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff index f1c582cb..eea4c2b8 100644 --- a/kompare/tests/cvsdiff/edm.diff +++ b/kompare/tests/cvsdiff/edm.diff @@ -13,9 +13,9 @@ int main( int argc, char** argv ) { bool readStdin = false; int numOptions = 0; - QString user; + TQString user; Session session = DefaultSession; - QString sessionName; + TQString sessionName; // Scan for command-line options first for( int pos = 1 ; pos <= argc - 1 ; pos++ ) @@ -31,7 +31,7 @@ int main( int argc, char** argv ) { if( pos <= argc - 2 ) { - user = QString::fromLocal8Bit( argv[ pos + 1] ); + user = TQString::fromLocal8Bit( argv[ pos + 1] ); numOptions +=2; pos++; } @@ -118,8 +118,8 @@ int main( int argc, char** argv ) ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) ) { // Check for ICE authority file and if the file can be read by us - QString home = it.data(); - QString iceFile = it.data() + "/.ICEauthority"; + TQString home = it.data(); + TQString iceFile = it.data() + "/.ICEauthority"; QFileInfo fi( iceFile ); if( iceFile.isEmpty() ) { @@ -168,7 +168,7 @@ int main( int argc, char** argv ) { if( !presetDCOPServer && !users.isEmpty() ) { - QString dcopFile = it.data() + "/" + *sIt; + TQString dcopFile = it.data() + "/" + *sIt; QFile f( dcopFile ); if( !f.open( IO_ReadOnly ) ) { @@ -279,7 +279,7 @@ int main( int argc, char** argv ) QStringList sessions; bool presetDCOPServer = false; // char *dcopStr = 0L; - QString dcopServer; + TQString dcopServer; for( it = users.begin(); it != users.end() || firstRun; it++ ) { @@ -380,7 +380,7 @@ int main( int argc, char** argv ) * Do the actual DCOP call */ void runDCOP( QCStringList args, UserList users, Session session, - const QString sessionName, bool readStdin ) + const TQString sessionName, bool readStdin ) { . 279,281c @@ -391,7 +391,7 @@ void runDCOP( QCStringList args, UserList users, Session session, * Return a list of available DCOP sessions for the specified user * An empty list means no sessions are available, or an error occurred. */ -QStringList dcopSessionList( const QString &user, const QString &home ) +QStringList dcopSessionList( const TQString &user, const TQString &home ) { if( home.isEmpty() ) { @@ -522,7 +522,7 @@ enum Session { DefaultSession = 0, AllSessions, QuerySessions, CustomSession }; . 33a -typedef QMap UserList; +typedef QMap UserList; . 28,30c @@ -590,7 +590,7 @@ diff -e -r1.3 marshall.cpp tqWarning("List end-delimiter '%s' not found.", delim.latin1()); exit(1); } - if( QString::fromLocal8Bit( args[ j ] ) == delim ) + if( TQString::fromLocal8Bit( args[ j ] ) == delim ) break; marshall( dummy_arg, args, j, type ); count++; @@ -603,7 +603,7 @@ diff -e -r1.3 marshall.cpp tqWarning("List end-delimiter '%s' not found.", delim.latin1()); exit(1); } - if( QString::fromLocal8Bit( args[ i ] ) == delim ) + if( TQString::fromLocal8Bit( args[ i ] ) == delim ) break; marshall( arg, args, i, type ); } @@ -640,7 +640,7 @@ diff -e -r1.3 marshall.cpp arg << s; else if ( type == "QCString" ) arg << QCString( args[ i ] ); - else if ( type == "QColor" ) + else if ( type == "TQColor" ) arg << mkColor( s ); else if ( type == "TQPoint" ) arg << mkPoint( s ); @@ -659,14 +659,14 @@ diff -e -r1.3 marshall.cpp arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); else if ( s.left( 6 ) == "QRect(" ) arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); - else if ( s.left( 7 ) == "QColor(" ) + else if ( s.left( 7 ) == "TQColor(" ) arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); else arg << QVariant( s ); } else if ( type.startsWith("QValueList<")) { type = type.mid(11, type.length() - 12); QStringList list; - QString delim = s; + TQString delim = s; if (delim == "[") delim = "]"; if (delim == "(") @@ -674,7 +674,7 @@ diff -e -r1.3 marshall.cpp . 247,317c if (type == "TQStringList") - type = "QValueList"; + type = "QValueList"; if (type == "QCStringList") type = "QValueList"; if( i > args.count() ) @@ -682,8 +682,8 @@ diff -e -r1.3 marshall.cpp tqWarning("Not enough arguments."); exit(1); } - QString s = QString::fromLocal8Bit( args[ i ] ); + TQString s = TQString::fromLocal8Bit( args[ i ] ); . 245c -void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) +void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type ) . diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff index cca2cd9a..7bfa3ae0 100644 --- a/kompare/tests/cvsdiff/normalm.diff +++ b/kompare/tests/cvsdiff/normalm.diff @@ -32,7 +32,7 @@ diff -r1.26 dcop.cpp --- > #include "../kdatastream.h" 33a46,47 -> typedef QMap UserList; +> typedef QMap UserList; > 35a50,63 > static QTextStream cout( stdout, IO_WriteOnly ); @@ -153,7 +153,7 @@ diff -r1.26 dcop.cpp > * Return a list of available DCOP sessions for the specified user > * An empty list means no sessions are available, or an error occurred. > */ -> QStringList dcopSessionList( const QString &user, const QString &home ) +> QStringList dcopSessionList( const TQString &user, const TQString &home ) > { > if( home.isEmpty() ) > { @@ -193,7 +193,7 @@ diff -r1.26 dcop.cpp > * Do the actual DCOP call > */ > void runDCOP( QCStringList args, UserList users, Session session, -> const QString sessionName, bool readStdin ) +> const TQString sessionName, bool readStdin ) > { 286,287c402,404 < char **args = 0; @@ -297,7 +297,7 @@ diff -r1.26 dcop.cpp > QStringList sessions; > bool presetDCOPServer = false; > // char *dcopStr = 0L; -> QString dcopServer; +> TQString dcopServer; > > for( it = users.begin(); it != users.end() || firstRun; it++ ) > { @@ -366,8 +366,8 @@ diff -r1.26 dcop.cpp > ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) ) > { > // Check for ICE authority file and if the file can be read by us -> QString home = it.data(); -> QString iceFile = it.data() + "/.ICEauthority"; +> TQString home = it.data(); +> TQString iceFile = it.data() + "/.ICEauthority"; > QFileInfo fi( iceFile ); > if( iceFile.isEmpty() ) > { @@ -416,7 +416,7 @@ diff -r1.26 dcop.cpp > { > if( !presetDCOPServer && !users.isEmpty() ) > { -> QString dcopFile = it.data() + "/" + *sIt; +> TQString dcopFile = it.data() + "/" + *sIt; > QFile f( dcopFile ); > if( !f.open( IO_ReadOnly ) ) > { @@ -513,9 +513,9 @@ diff -r1.26 dcop.cpp > { > bool readStdin = false; > int numOptions = 0; -> QString user; +> TQString user; > Session session = DefaultSession; -> QString sessionName; +> TQString sessionName; > > // Scan for command-line options first > for( int pos = 1 ; pos <= argc - 1 ; pos++ ) @@ -531,7 +531,7 @@ diff -r1.26 dcop.cpp > { > if( pos <= argc - 2 ) > { -> user = QString::fromLocal8Bit( argv[ pos + 1] ); +> user = TQString::fromLocal8Bit( argv[ pos + 1] ); > numOptions +=2; > pos++; > } @@ -647,12 +647,12 @@ RCS file: /home/kde/tdelibs/dcop/client/marshall.cpp,v retrieving revision 1.3 diff -r1.3 marshall.cpp 245c245 -< void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) +< void marshall(QDataStream &arg, int argc, char **argv, int &i, TQString type) --- -> void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) +> void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type ) 247,317c247,256 < if (type == "TQStringList") -< type = "QValueList"; +< type = "QValueList"; < if (type == "QCStringList") < type = "QValueList"; < if (i >= argc) @@ -660,7 +660,7 @@ diff -r1.3 marshall.cpp < tqWarning("Not enough arguments."); < exit(1); < } -< QString s = QString::fromLocal8Bit(argv[i]); +< TQString s = TQString::fromLocal8Bit(argv[i]); < < if ( type == "int" ) < arg << s.toInt(); @@ -688,7 +688,7 @@ diff -r1.3 marshall.cpp < arg << s; < else if ( type == "QCString" ) < arg << QCString( argv[i] ); -< else if ( type == "QColor" ) +< else if ( type == "TQColor" ) < arg << mkColor( s ); < else if ( type == "TQPoint" ) < arg << mkPoint( s ); @@ -707,14 +707,14 @@ diff -r1.3 marshall.cpp < arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); < else if ( s.left( 6 ) == "QRect(" ) < arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -< else if ( s.left( 7 ) == "QColor(" ) +< else if ( s.left( 7 ) == "TQColor(" ) < arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); < else < arg << QVariant( s ); < } else if ( type.startsWith("QValueList<")) { < type = type.mid(11, type.length() - 12); < QStringList list; -< QString delim = s; +< TQString delim = s; < if (delim == "[") < delim = "]"; < if (delim == "(") @@ -724,7 +724,7 @@ diff -r1.3 marshall.cpp < QDataStream dummy_arg(dummy_data, IO_WriteOnly); --- > if (type == "TQStringList") -> type = "QValueList"; +> type = "QValueList"; > if (type == "QCStringList") > type = "QValueList"; > if( i > args.count() ) @@ -732,7 +732,7 @@ diff -r1.3 marshall.cpp > tqWarning("Not enough arguments."); > exit(1); > } -> QString s = QString::fromLocal8Bit( args[ i ] ); +> TQString s = TQString::fromLocal8Bit( args[ i ] ); 319,346c258,314 < int j = i; < int count = 0; @@ -789,7 +789,7 @@ diff -r1.3 marshall.cpp > arg << s; > else if ( type == "QCString" ) > arg << QCString( args[ i ] ); -> else if ( type == "QColor" ) +> else if ( type == "TQColor" ) > arg << mkColor( s ); > else if ( type == "TQPoint" ) > arg << mkPoint( s ); @@ -808,14 +808,14 @@ diff -r1.3 marshall.cpp > arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); > else if ( s.left( 6 ) == "QRect(" ) > arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -> else if ( s.left( 7 ) == "QColor(" ) +> else if ( s.left( 7 ) == "TQColor(" ) > arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); > else > arg << QVariant( s ); > } else if ( type.startsWith("QValueList<")) { > type = type.mid(11, type.length() - 12); > QStringList list; -> QString delim = s; +> TQString delim = s; > if (delim == "[") > delim = "]"; > if (delim == "(") @@ -833,7 +833,7 @@ diff -r1.3 marshall.cpp > tqWarning("List end-delimiter '%s' not found.", delim.latin1()); > exit(1); > } -> if( QString::fromLocal8Bit( args[ j ] ) == delim ) +> if( TQString::fromLocal8Bit( args[ j ] ) == delim ) > break; > marshall( dummy_arg, args, j, type ); > count++; @@ -846,7 +846,7 @@ diff -r1.3 marshall.cpp > tqWarning("List end-delimiter '%s' not found.", delim.latin1()); > exit(1); > } -> if( QString::fromLocal8Bit( args[ i ] ) == delim ) +> if( TQString::fromLocal8Bit( args[ i ] ) == delim ) > break; > marshall( arg, args, i, type ); > } diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff index 5ffc4d4f..c477f41b 100644 --- a/kompare/tests/cvsdiff/rcsm.diff +++ b/kompare/tests/cvsdiff/rcsm.diff @@ -27,7 +27,7 @@ d28 3 a30 1 #include "../kdatastream.h" a33 2 -typedef QMap UserList; +typedef QMap UserList; a35 14 static QTextStream cout( stdout, IO_WriteOnly ); @@ -129,7 +129,7 @@ a281 42 * Return a list of available DCOP sessions for the specified user * An empty list means no sessions are available, or an error occurred. */ -QStringList dcopSessionList( const QString &user, const QString &home ) +QStringList dcopSessionList( const TQString &user, const TQString &home ) { if( home.isEmpty() ) { @@ -169,7 +169,7 @@ a282 6 * Do the actual DCOP call */ void runDCOP( QCStringList args, UserList users, Session session, - const QString sessionName, bool readStdin ) + const TQString sessionName, bool readStdin ) { d286 2 a287 3 @@ -224,7 +224,7 @@ a338 84 QStringList sessions; bool presetDCOPServer = false; // char *dcopStr = 0L; - QString dcopServer; + TQString dcopServer; for( it = users.begin(); it != users.end() || firstRun; it++ ) { @@ -293,8 +293,8 @@ a339 143 ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) ) { // Check for ICE authority file and if the file can be read by us - QString home = it.data(); - QString iceFile = it.data() + "/.ICEauthority"; + TQString home = it.data(); + TQString iceFile = it.data() + "/.ICEauthority"; QFileInfo fi( iceFile ); if( iceFile.isEmpty() ) { @@ -343,7 +343,7 @@ a339 143 { if( !presetDCOPServer && !users.isEmpty() ) { - QString dcopFile = it.data() + "/" + *sIt; + TQString dcopFile = it.data() + "/" + *sIt; QFile f( dcopFile ); if( !f.open( IO_ReadOnly ) ) { @@ -440,9 +440,9 @@ int main( int argc, char** argv ) { bool readStdin = false; int numOptions = 0; - QString user; + TQString user; Session session = DefaultSession; - QString sessionName; + TQString sessionName; // Scan for command-line options first for( int pos = 1 ; pos <= argc - 1 ; pos++ ) @@ -458,7 +458,7 @@ int main( int argc, char** argv ) { if( pos <= argc - 2 ) { - user = QString::fromLocal8Bit( argv[ pos + 1] ); + user = TQString::fromLocal8Bit( argv[ pos + 1] ); numOptions +=2; pos++; } @@ -570,11 +570,11 @@ retrieving revision 1.3 diff -n -r1.3 marshall.cpp d245 1 a245 1 -void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) +void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type ) d247 71 a317 10 if (type == "TQStringList") - type = "QValueList"; + type = "QValueList"; if (type == "QCStringList") type = "QValueList"; if( i > args.count() ) @@ -582,7 +582,7 @@ a317 10 tqWarning("Not enough arguments."); exit(1); } - QString s = QString::fromLocal8Bit( args[ i ] ); + TQString s = TQString::fromLocal8Bit( args[ i ] ); d319 28 a346 57 if ( type == "int" ) @@ -611,7 +611,7 @@ a346 57 arg << s; else if ( type == "QCString" ) arg << QCString( args[ i ] ); - else if ( type == "QColor" ) + else if ( type == "TQColor" ) arg << mkColor( s ); else if ( type == "TQPoint" ) arg << mkPoint( s ); @@ -630,14 +630,14 @@ a346 57 arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); else if ( s.left( 6 ) == "QRect(" ) arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); - else if ( s.left( 7 ) == "QColor(" ) + else if ( s.left( 7 ) == "TQColor(" ) arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); else arg << QVariant( s ); } else if ( type.startsWith("QValueList<")) { type = type.mid(11, type.length() - 12); QStringList list; - QString delim = s; + TQString delim = s; if (delim == "[") delim = "]"; if (delim == "(") @@ -655,7 +655,7 @@ a347 34 tqWarning("List end-delimiter '%s' not found.", delim.latin1()); exit(1); } - if( QString::fromLocal8Bit( args[ j ] ) == delim ) + if( TQString::fromLocal8Bit( args[ j ] ) == delim ) break; marshall( dummy_arg, args, j, type ); count++; @@ -668,7 +668,7 @@ a347 34 tqWarning("List end-delimiter '%s' not found.", delim.latin1()); exit(1); } - if( QString::fromLocal8Bit( args[ i ] ) == delim ) + if( TQString::fromLocal8Bit( args[ i ] ) == delim ) break; marshall( arg, args, i, type ); } diff --git a/kompare/tests/cvsdiff/unified.diff b/kompare/tests/cvsdiff/unified.diff index f991a658..885b26eb 100644 --- a/kompare/tests/cvsdiff/unified.diff +++ b/kompare/tests/cvsdiff/unified.diff @@ -12,7 +12,7 @@ diff -u -r1.2 dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff index 356a7f52..01ee0297 100644 --- a/kompare/tests/cvsdiff/unifiedm.diff +++ b/kompare/tests/cvsdiff/unifiedm.diff @@ -37,7 +37,7 @@ diff -u -r1.26 dcop.cpp #include "marshall.cpp" -+typedef QMap UserList; ++typedef QMap UserList; + static DCOPClient* dcop = 0; @@ -66,7 +66,7 @@ diff -u -r1.26 dcop.cpp +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); @@ -136,7 +163,7 @@ @@ -188,7 +188,7 @@ diff -u -r1.26 dcop.cpp + * Return a list of available DCOP sessions for the specified user + * An empty list means no sessions are available, or an error occurred. + */ -+QStringList dcopSessionList( const QString &user, const QString &home ) ++QStringList dcopSessionList( const TQString &user, const TQString &home ) +{ + if( home.isEmpty() ) + { @@ -228,7 +228,7 @@ diff -u -r1.26 dcop.cpp + * Do the actual DCOP call + */ +void runDCOP( QCStringList args, UserList users, Session session, -+ const QString sessionName, bool readStdin ) ++ const TQString sessionName, bool readStdin ) +{ QCString app; QCString objid; @@ -333,7 +333,7 @@ diff -u -r1.26 dcop.cpp + QStringList sessions; + bool presetDCOPServer = false; +// char *dcopStr = 0L; -+ QString dcopServer; ++ TQString dcopServer; + + for( it = users.begin(); it != users.end() || firstRun; it++ ) + { @@ -402,8 +402,8 @@ diff -u -r1.26 dcop.cpp + ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) ) + { + // Check for ICE authority file and if the file can be read by us -+ QString home = it.data(); -+ QString iceFile = it.data() + "/.ICEauthority"; ++ TQString home = it.data(); ++ TQString iceFile = it.data() + "/.ICEauthority"; + QFileInfo fi( iceFile ); + if( iceFile.isEmpty() ) + { @@ -452,7 +452,7 @@ diff -u -r1.26 dcop.cpp + { + if( !presetDCOPServer && !users.isEmpty() ) + { -+ QString dcopFile = it.data() + "/" + *sIt; ++ TQString dcopFile = it.data() + "/" + *sIt; + QFile f( dcopFile ); + if( !f.open( IO_ReadOnly ) ) + { @@ -549,9 +549,9 @@ diff -u -r1.26 dcop.cpp +{ + bool readStdin = false; + int numOptions = 0; -+ QString user; ++ TQString user; + Session session = DefaultSession; -+ QString sessionName; ++ TQString sessionName; + + // Scan for command-line options first + for( int pos = 1 ; pos <= argc - 1 ; pos++ ) @@ -567,7 +567,7 @@ diff -u -r1.26 dcop.cpp + { + if( pos <= argc - 2 ) + { -+ user = QString::fromLocal8Bit( argv[ pos + 1] ); ++ user = TQString::fromLocal8Bit( argv[ pos + 1] ); + numOptions +=2; + pos++; + } @@ -665,7 +665,7 @@ diff -u -r1.2 dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; @@ -712,11 +712,11 @@ diff -u -r1.3 marshall.cpp } --void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) -+void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) +-void marshall(QDataStream &arg, int argc, char **argv, int &i, TQString type) ++void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type ) { - if (type == "TQStringList") -- type = "QValueList"; +- type = "QValueList"; - if (type == "QCStringList") - type = "QValueList"; - if (i >= argc) @@ -724,7 +724,7 @@ diff -u -r1.3 marshall.cpp - tqWarning("Not enough arguments."); - exit(1); - } -- QString s = QString::fromLocal8Bit(argv[i]); +- TQString s = TQString::fromLocal8Bit(argv[i]); - - if ( type == "int" ) - arg << s.toInt(); @@ -752,7 +752,7 @@ diff -u -r1.3 marshall.cpp - arg << s; - else if ( type == "QCString" ) - arg << QCString( argv[i] ); -- else if ( type == "QColor" ) +- else if ( type == "TQColor" ) - arg << mkColor( s ); - else if ( type == "TQPoint" ) - arg << mkPoint( s ); @@ -771,14 +771,14 @@ diff -u -r1.3 marshall.cpp - arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); - else if ( s.left( 6 ) == "QRect(" ) - arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -- else if ( s.left( 7 ) == "QColor(" ) +- else if ( s.left( 7 ) == "TQColor(" ) - arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); - else - arg << QVariant( s ); - } else if ( type.startsWith("QValueList<")) { - type = type.mid(11, type.length() - 12); - QStringList list; -- QString delim = s; +- TQString delim = s; - if (delim == "[") - delim = "]"; - if (delim == "(") @@ -787,7 +787,7 @@ diff -u -r1.3 marshall.cpp - QByteArray dummy_data; - QDataStream dummy_arg(dummy_data, IO_WriteOnly); + if (type == "TQStringList") -+ type = "QValueList"; ++ type = "QValueList"; + if (type == "QCStringList") + type = "QValueList"; + if( i > args.count() ) @@ -795,7 +795,7 @@ diff -u -r1.3 marshall.cpp + tqWarning("Not enough arguments."); + exit(1); + } -+ QString s = QString::fromLocal8Bit( args[ i ] ); ++ TQString s = TQString::fromLocal8Bit( args[ i ] ); - int j = i; - int count = 0; @@ -851,7 +851,7 @@ diff -u -r1.3 marshall.cpp + arg << s; + else if ( type == "QCString" ) + arg << QCString( args[ i ] ); -+ else if ( type == "QColor" ) ++ else if ( type == "TQColor" ) + arg << mkColor( s ); + else if ( type == "TQPoint" ) + arg << mkPoint( s ); @@ -870,14 +870,14 @@ diff -u -r1.3 marshall.cpp + arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); + else if ( s.left( 6 ) == "QRect(" ) + arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -+ else if ( s.left( 7 ) == "QColor(" ) ++ else if ( s.left( 7 ) == "TQColor(" ) + arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); + else + arg << QVariant( s ); + } else if ( type.startsWith("QValueList<")) { + type = type.mid(11, type.length() - 12); + QStringList list; -+ QString delim = s; ++ TQString delim = s; + if (delim == "[") + delim = "]"; + if (delim == "(") @@ -895,7 +895,7 @@ diff -u -r1.3 marshall.cpp + tqWarning("List end-delimiter '%s' not found.", delim.latin1()); + exit(1); + } -+ if( QString::fromLocal8Bit( args[ j ] ) == delim ) ++ if( TQString::fromLocal8Bit( args[ j ] ) == delim ) + break; + marshall( dummy_arg, args, j, type ); + count++; @@ -908,7 +908,7 @@ diff -u -r1.3 marshall.cpp + tqWarning("List end-delimiter '%s' not found.", delim.latin1()); + exit(1); + } -+ if( QString::fromLocal8Bit( args[ i ] ) == delim ) ++ if( TQString::fromLocal8Bit( args[ i ] ) == delim ) + break; + marshall( arg, args, i, type ); + } diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff index 2f0fd151..b603111a 100644 --- a/kompare/tests/diff/contextm.diff +++ b/kompare/tests/diff/contextm.diff @@ -49,7 +49,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp #include "marshall.cpp" -+ typedef QMap UserList; ++ typedef QMap UserList; + static DCOPClient* dcop = 0; @@ -78,7 +78,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args ) { - - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); --- 146,153 ---- @@ -87,7 +87,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); *************** @@ -310,7 +310,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! * Return a list of available DCOP sessions for the specified user ! * An empty list means no sessions are available, or an error occurred. ! */ -! QStringList dcopSessionList( const QString &user, const QString &home ) +! QStringList dcopSessionList( const TQString &user, const TQString &home ) ! { ! if( home.isEmpty() ) ! { @@ -350,7 +350,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp + * Do the actual DCOP call + */ + void runDCOP( QCStringList args, UserList users, Session session, -+ const QString sessionName, bool readStdin ) ++ const TQString sessionName, bool readStdin ) + { QCString app; QCString objid; @@ -406,7 +406,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! QStringList sessions; ! bool presetDCOPServer = false; ! // char *dcopStr = 0L; -! QString dcopServer; +! TQString dcopServer; ! ! for( it = users.begin(); it != users.end() || firstRun; it++ ) ! { @@ -475,8 +475,8 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp + ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) ) + { + // Check for ICE authority file and if the file can be read by us -+ QString home = it.data(); -+ QString iceFile = it.data() + "/.ICEauthority"; ++ TQString home = it.data(); ++ TQString iceFile = it.data() + "/.ICEauthority"; + QFileInfo fi( iceFile ); + if( iceFile.isEmpty() ) + { @@ -525,7 +525,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp + { + if( !presetDCOPServer && !users.isEmpty() ) + { -+ QString dcopFile = it.data() + "/" + *sIt; ++ TQString dcopFile = it.data() + "/" + *sIt; + QFile f( dcopFile ); + if( !f.open( IO_ReadOnly ) ) + { @@ -622,9 +622,9 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp + { + bool readStdin = false; + int numOptions = 0; -+ QString user; ++ TQString user; + Session session = DefaultSession; -+ QString sessionName; ++ TQString sessionName; + + // Scan for command-line options first + for( int pos = 1 ; pos <= argc - 1 ; pos++ ) @@ -640,7 +640,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp + { + if( pos <= argc - 2 ) + { -+ user = QString::fromLocal8Bit( argv[ pos + 1] ); ++ user = TQString::fromLocal8Bit( argv[ pos + 1] ); + numOptions +=2; + pos++; + } @@ -734,7 +734,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; @@ -742,7 +742,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); *************** *** 118,124 **** @@ -811,10 +811,10 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp } -! void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) +! void marshall(QDataStream &arg, int argc, char **argv, int &i, TQString type) { ! if (type == "TQStringList") -! type = "QValueList"; +! type = "QValueList"; ! if (type == "QCStringList") ! type = "QValueList"; ! if (i >= argc) @@ -822,7 +822,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! tqWarning("Not enough arguments."); ! exit(1); ! } -! QString s = QString::fromLocal8Bit(argv[i]); +! TQString s = TQString::fromLocal8Bit(argv[i]); ! ! if ( type == "int" ) ! arg << s.toInt(); @@ -850,7 +850,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! arg << s; ! else if ( type == "QCString" ) ! arg << QCString( argv[i] ); -! else if ( type == "QColor" ) +! else if ( type == "TQColor" ) ! arg << mkColor( s ); ! else if ( type == "TQPoint" ) ! arg << mkPoint( s ); @@ -869,14 +869,14 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); ! else if ( s.left( 6 ) == "QRect(" ) ! arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -! else if ( s.left( 7 ) == "QColor(" ) +! else if ( s.left( 7 ) == "TQColor(" ) ! arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); ! else ! arg << QVariant( s ); ! } else if ( type.startsWith("QValueList<")) { ! type = type.mid(11, type.length() - 12); ! QStringList list; -! QString delim = s; +! TQString delim = s; ! if (delim == "[") ! delim = "]"; ! if (delim == "(") @@ -920,10 +920,10 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp } -! void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) +! void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type ) { ! if (type == "TQStringList") -! type = "QValueList"; +! type = "QValueList"; ! if (type == "QCStringList") ! type = "QValueList"; ! if( i > args.count() ) @@ -931,7 +931,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! tqWarning("Not enough arguments."); ! exit(1); ! } -! QString s = QString::fromLocal8Bit( args[ i ] ); +! TQString s = TQString::fromLocal8Bit( args[ i ] ); ! if ( type == "int" ) ! arg << s.toInt(); @@ -959,7 +959,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! arg << s; ! else if ( type == "QCString" ) ! arg << QCString( args[ i ] ); -! else if ( type == "QColor" ) +! else if ( type == "TQColor" ) ! arg << mkColor( s ); ! else if ( type == "TQPoint" ) ! arg << mkPoint( s ); @@ -978,14 +978,14 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); ! else if ( s.left( 6 ) == "QRect(" ) ! arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -! else if ( s.left( 7 ) == "QColor(" ) +! else if ( s.left( 7 ) == "TQColor(" ) ! arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); ! else ! arg << QVariant( s ); ! } else if ( type.startsWith("QValueList<")) { ! type = type.mid(11, type.length() - 12); ! QStringList list; -! QString delim = s; +! TQString delim = s; ! if (delim == "[") ! delim = "]"; ! if (delim == "(") @@ -1003,7 +1003,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp + tqWarning("List end-delimiter '%s' not found.", delim.latin1()); + exit(1); + } -+ if( QString::fromLocal8Bit( args[ j ] ) == delim ) ++ if( TQString::fromLocal8Bit( args[ j ] ) == delim ) + break; + marshall( dummy_arg, args, j, type ); + count++; @@ -1016,7 +1016,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp + tqWarning("List end-delimiter '%s' not found.", delim.latin1()); + exit(1); + } -+ if( QString::fromLocal8Bit( args[ i ] ) == delim ) ++ if( TQString::fromLocal8Bit( args[ i ] ) == delim ) + break; + marshall( arg, args, i, type ); + } diff --git a/kompare/tests/diff/edm.diff b/kompare/tests/diff/edm.diff index 45d559cc..affecec6 100644 --- a/kompare/tests/diff/edm.diff +++ b/kompare/tests/diff/edm.diff @@ -8,9 +8,9 @@ int main( int argc, char** argv ) { bool readStdin = false; int numOptions = 0; - QString user; + TQString user; Session session = DefaultSession; - QString sessionName; + TQString sessionName; // Scan for command-line options first for( int pos = 1 ; pos <= argc - 1 ; pos++ ) @@ -26,7 +26,7 @@ int main( int argc, char** argv ) { if( pos <= argc - 2 ) { - user = QString::fromLocal8Bit( argv[ pos + 1] ); + user = TQString::fromLocal8Bit( argv[ pos + 1] ); numOptions +=2; pos++; } @@ -113,8 +113,8 @@ int main( int argc, char** argv ) ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) ) { // Check for ICE authority file and if the file can be read by us - QString home = it.data(); - QString iceFile = it.data() + "/.ICEauthority"; + TQString home = it.data(); + TQString iceFile = it.data() + "/.ICEauthority"; QFileInfo fi( iceFile ); if( iceFile.isEmpty() ) { @@ -163,7 +163,7 @@ int main( int argc, char** argv ) { if( !presetDCOPServer && !users.isEmpty() ) { - QString dcopFile = it.data() + "/" + *sIt; + TQString dcopFile = it.data() + "/" + *sIt; QFile f( dcopFile ); if( !f.open( IO_ReadOnly ) ) { @@ -274,7 +274,7 @@ int main( int argc, char** argv ) QStringList sessions; bool presetDCOPServer = false; // char *dcopStr = 0L; - QString dcopServer; + TQString dcopServer; for( it = users.begin(); it != users.end() || firstRun; it++ ) { @@ -375,7 +375,7 @@ int main( int argc, char** argv ) * Do the actual DCOP call */ void runDCOP( QCStringList args, UserList users, Session session, - const QString sessionName, bool readStdin ) + const TQString sessionName, bool readStdin ) { . 279,281c @@ -386,7 +386,7 @@ void runDCOP( QCStringList args, UserList users, Session session, * Return a list of available DCOP sessions for the specified user * An empty list means no sessions are available, or an error occurred. */ -QStringList dcopSessionList( const QString &user, const QString &home ) +QStringList dcopSessionList( const TQString &user, const TQString &home ) { if( home.isEmpty() ) { @@ -517,7 +517,7 @@ enum Session { DefaultSession = 0, AllSessions, QuerySessions, CustomSession }; . 33a -typedef QMap UserList; +typedef QMap UserList; . 28,30c @@ -577,7 +577,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp tqWarning("List end-delimiter '%s' not found.", delim.latin1()); exit(1); } - if( QString::fromLocal8Bit( args[ j ] ) == delim ) + if( TQString::fromLocal8Bit( args[ j ] ) == delim ) break; marshall( dummy_arg, args, j, type ); count++; @@ -590,7 +590,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp tqWarning("List end-delimiter '%s' not found.", delim.latin1()); exit(1); } - if( QString::fromLocal8Bit( args[ i ] ) == delim ) + if( TQString::fromLocal8Bit( args[ i ] ) == delim ) break; marshall( arg, args, i, type ); } @@ -627,7 +627,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp arg << s; else if ( type == "QCString" ) arg << QCString( args[ i ] ); - else if ( type == "QColor" ) + else if ( type == "TQColor" ) arg << mkColor( s ); else if ( type == "TQPoint" ) arg << mkPoint( s ); @@ -646,14 +646,14 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); else if ( s.left( 6 ) == "QRect(" ) arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); - else if ( s.left( 7 ) == "QColor(" ) + else if ( s.left( 7 ) == "TQColor(" ) arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); else arg << QVariant( s ); } else if ( type.startsWith("QValueList<")) { type = type.mid(11, type.length() - 12); QStringList list; - QString delim = s; + TQString delim = s; if (delim == "[") delim = "]"; if (delim == "(") @@ -661,7 +661,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp . 247,317c if (type == "TQStringList") - type = "QValueList"; + type = "QValueList"; if (type == "QCStringList") type = "QValueList"; if( i > args.count() ) @@ -669,8 +669,8 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp tqWarning("Not enough arguments."); exit(1); } - QString s = QString::fromLocal8Bit( args[ i ] ); + TQString s = TQString::fromLocal8Bit( args[ i ] ); . 245c -void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) +void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type ) . diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff index 0344923a..6a9743c1 100644 --- a/kompare/tests/diff/normalm.diff +++ b/kompare/tests/diff/normalm.diff @@ -28,7 +28,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp --- > #include "../kdatastream.h" 33a46,47 -> typedef QMap UserList; +> typedef QMap UserList; > 35a50,63 > static QTextStream cout( stdout, IO_WriteOnly ); @@ -149,7 +149,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp > * Return a list of available DCOP sessions for the specified user > * An empty list means no sessions are available, or an error occurred. > */ -> QStringList dcopSessionList( const QString &user, const QString &home ) +> QStringList dcopSessionList( const TQString &user, const TQString &home ) > { > if( home.isEmpty() ) > { @@ -189,7 +189,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp > * Do the actual DCOP call > */ > void runDCOP( QCStringList args, UserList users, Session session, -> const QString sessionName, bool readStdin ) +> const TQString sessionName, bool readStdin ) > { 286,287c402,404 < char **args = 0; @@ -293,7 +293,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp > QStringList sessions; > bool presetDCOPServer = false; > // char *dcopStr = 0L; -> QString dcopServer; +> TQString dcopServer; > > for( it = users.begin(); it != users.end() || firstRun; it++ ) > { @@ -362,8 +362,8 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp > ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) ) > { > // Check for ICE authority file and if the file can be read by us -> QString home = it.data(); -> QString iceFile = it.data() + "/.ICEauthority"; +> TQString home = it.data(); +> TQString iceFile = it.data() + "/.ICEauthority"; > QFileInfo fi( iceFile ); > if( iceFile.isEmpty() ) > { @@ -412,7 +412,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp > { > if( !presetDCOPServer && !users.isEmpty() ) > { -> QString dcopFile = it.data() + "/" + *sIt; +> TQString dcopFile = it.data() + "/" + *sIt; > QFile f( dcopFile ); > if( !f.open( IO_ReadOnly ) ) > { @@ -509,9 +509,9 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp > { > bool readStdin = false; > int numOptions = 0; -> QString user; +> TQString user; > Session session = DefaultSession; -> QString sessionName; +> TQString sessionName; > > // Scan for command-line options first > for( int pos = 1 ; pos <= argc - 1 ; pos++ ) @@ -527,7 +527,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp > { > if( pos <= argc - 2 ) > { -> user = QString::fromLocal8Bit( argv[ pos + 1] ); +> user = TQString::fromLocal8Bit( argv[ pos + 1] ); > numOptions +=2; > pos++; > } @@ -635,12 +635,12 @@ diff -r dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp > findObject( app, objid, function, params ); diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp 245c245 -< void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) +< void marshall(QDataStream &arg, int argc, char **argv, int &i, TQString type) --- -> void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) +> void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type ) 247,317c247,256 < if (type == "TQStringList") -< type = "QValueList"; +< type = "QValueList"; < if (type == "QCStringList") < type = "QValueList"; < if (i >= argc) @@ -648,7 +648,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp < tqWarning("Not enough arguments."); < exit(1); < } -< QString s = QString::fromLocal8Bit(argv[i]); +< TQString s = TQString::fromLocal8Bit(argv[i]); < < if ( type == "int" ) < arg << s.toInt(); @@ -676,7 +676,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp < arg << s; < else if ( type == "QCString" ) < arg << QCString( argv[i] ); -< else if ( type == "QColor" ) +< else if ( type == "TQColor" ) < arg << mkColor( s ); < else if ( type == "TQPoint" ) < arg << mkPoint( s ); @@ -695,14 +695,14 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp < arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); < else if ( s.left( 6 ) == "QRect(" ) < arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -< else if ( s.left( 7 ) == "QColor(" ) +< else if ( s.left( 7 ) == "TQColor(" ) < arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); < else < arg << QVariant( s ); < } else if ( type.startsWith("QValueList<")) { < type = type.mid(11, type.length() - 12); < QStringList list; -< QString delim = s; +< TQString delim = s; < if (delim == "[") < delim = "]"; < if (delim == "(") @@ -712,7 +712,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp < QDataStream dummy_arg(dummy_data, IO_WriteOnly); --- > if (type == "TQStringList") -> type = "QValueList"; +> type = "QValueList"; > if (type == "QCStringList") > type = "QValueList"; > if( i > args.count() ) @@ -720,7 +720,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp > tqWarning("Not enough arguments."); > exit(1); > } -> QString s = QString::fromLocal8Bit( args[ i ] ); +> TQString s = TQString::fromLocal8Bit( args[ i ] ); 319,346c258,314 < int j = i; < int count = 0; @@ -777,7 +777,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp > arg << s; > else if ( type == "QCString" ) > arg << QCString( args[ i ] ); -> else if ( type == "QColor" ) +> else if ( type == "TQColor" ) > arg << mkColor( s ); > else if ( type == "TQPoint" ) > arg << mkPoint( s ); @@ -796,14 +796,14 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp > arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); > else if ( s.left( 6 ) == "QRect(" ) > arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -> else if ( s.left( 7 ) == "QColor(" ) +> else if ( s.left( 7 ) == "TQColor(" ) > arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); > else > arg << QVariant( s ); > } else if ( type.startsWith("QValueList<")) { > type = type.mid(11, type.length() - 12); > QStringList list; -> QString delim = s; +> TQString delim = s; > if (delim == "[") > delim = "]"; > if (delim == "(") @@ -821,7 +821,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp > tqWarning("List end-delimiter '%s' not found.", delim.latin1()); > exit(1); > } -> if( QString::fromLocal8Bit( args[ j ] ) == delim ) +> if( TQString::fromLocal8Bit( args[ j ] ) == delim ) > break; > marshall( dummy_arg, args, j, type ); > count++; @@ -834,7 +834,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp > tqWarning("List end-delimiter '%s' not found.", delim.latin1()); > exit(1); > } -> if( QString::fromLocal8Bit( args[ i ] ) == delim ) +> if( TQString::fromLocal8Bit( args[ i ] ) == delim ) > break; > marshall( arg, args, i, type ); > } diff --git a/kompare/tests/diff/rcsm.diff b/kompare/tests/diff/rcsm.diff index e64fc43f..7942e811 100644 --- a/kompare/tests/diff/rcsm.diff +++ b/kompare/tests/diff/rcsm.diff @@ -23,7 +23,7 @@ d28 3 a30 1 #include "../kdatastream.h" a33 2 -typedef QMap UserList; +typedef QMap UserList; a35 14 static QTextStream cout( stdout, IO_WriteOnly ); @@ -125,7 +125,7 @@ a281 42 * Return a list of available DCOP sessions for the specified user * An empty list means no sessions are available, or an error occurred. */ -QStringList dcopSessionList( const QString &user, const QString &home ) +QStringList dcopSessionList( const TQString &user, const TQString &home ) { if( home.isEmpty() ) { @@ -165,7 +165,7 @@ a282 6 * Do the actual DCOP call */ void runDCOP( QCStringList args, UserList users, Session session, - const QString sessionName, bool readStdin ) + const TQString sessionName, bool readStdin ) { d286 2 a287 3 @@ -220,7 +220,7 @@ a338 84 QStringList sessions; bool presetDCOPServer = false; // char *dcopStr = 0L; - QString dcopServer; + TQString dcopServer; for( it = users.begin(); it != users.end() || firstRun; it++ ) { @@ -289,8 +289,8 @@ a339 143 ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) ) { // Check for ICE authority file and if the file can be read by us - QString home = it.data(); - QString iceFile = it.data() + "/.ICEauthority"; + TQString home = it.data(); + TQString iceFile = it.data() + "/.ICEauthority"; QFileInfo fi( iceFile ); if( iceFile.isEmpty() ) { @@ -339,7 +339,7 @@ a339 143 { if( !presetDCOPServer && !users.isEmpty() ) { - QString dcopFile = it.data() + "/" + *sIt; + TQString dcopFile = it.data() + "/" + *sIt; QFile f( dcopFile ); if( !f.open( IO_ReadOnly ) ) { @@ -436,9 +436,9 @@ int main( int argc, char** argv ) { bool readStdin = false; int numOptions = 0; - QString user; + TQString user; Session session = DefaultSession; - QString sessionName; + TQString sessionName; // Scan for command-line options first for( int pos = 1 ; pos <= argc - 1 ; pos++ ) @@ -454,7 +454,7 @@ int main( int argc, char** argv ) { if( pos <= argc - 2 ) { - user = QString::fromLocal8Bit( argv[ pos + 1] ); + user = TQString::fromLocal8Bit( argv[ pos + 1] ); numOptions +=2; pos++; } @@ -558,11 +558,11 @@ a224 5 diff -nr dcop/client/marshall.cpp dcop2/client/marshall.cpp d245 1 a245 1 -void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) +void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type ) d247 71 a317 10 if (type == "TQStringList") - type = "QValueList"; + type = "QValueList"; if (type == "QCStringList") type = "QValueList"; if( i > args.count() ) @@ -570,7 +570,7 @@ a317 10 tqWarning("Not enough arguments."); exit(1); } - QString s = QString::fromLocal8Bit( args[ i ] ); + TQString s = TQString::fromLocal8Bit( args[ i ] ); d319 28 a346 57 if ( type == "int" ) @@ -599,7 +599,7 @@ a346 57 arg << s; else if ( type == "QCString" ) arg << QCString( args[ i ] ); - else if ( type == "QColor" ) + else if ( type == "TQColor" ) arg << mkColor( s ); else if ( type == "TQPoint" ) arg << mkPoint( s ); @@ -618,14 +618,14 @@ a346 57 arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); else if ( s.left( 6 ) == "QRect(" ) arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); - else if ( s.left( 7 ) == "QColor(" ) + else if ( s.left( 7 ) == "TQColor(" ) arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); else arg << QVariant( s ); } else if ( type.startsWith("QValueList<")) { type = type.mid(11, type.length() - 12); QStringList list; - QString delim = s; + TQString delim = s; if (delim == "[") delim = "]"; if (delim == "(") @@ -643,7 +643,7 @@ a347 34 tqWarning("List end-delimiter '%s' not found.", delim.latin1()); exit(1); } - if( QString::fromLocal8Bit( args[ j ] ) == delim ) + if( TQString::fromLocal8Bit( args[ j ] ) == delim ) break; marshall( dummy_arg, args, j, type ); count++; @@ -656,7 +656,7 @@ a347 34 tqWarning("List end-delimiter '%s' not found.", delim.latin1()); exit(1); } - if( QString::fromLocal8Bit( args[ i ] ) == delim ) + if( TQString::fromLocal8Bit( args[ i ] ) == delim ) break; marshall( arg, args, i, type ); } diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff index 49aff880..578bd3ba 100644 --- a/kompare/tests/diff/unifiedm.diff +++ b/kompare/tests/diff/unifiedm.diff @@ -33,7 +33,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp #include "marshall.cpp" -+typedef QMap UserList; ++typedef QMap UserList; + static DCOPClient* dcop = 0; @@ -62,7 +62,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); @@ -136,7 +163,7 @@ @@ -183,7 +183,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + * Return a list of available DCOP sessions for the specified user + * An empty list means no sessions are available, or an error occurred. + */ -+QStringList dcopSessionList( const QString &user, const QString &home ) ++QStringList dcopSessionList( const TQString &user, const TQString &home ) +{ + if( home.isEmpty() ) + { @@ -223,7 +223,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + * Do the actual DCOP call + */ +void runDCOP( QCStringList args, UserList users, Session session, -+ const QString sessionName, bool readStdin ) ++ const TQString sessionName, bool readStdin ) +{ QCString app; QCString objid; @@ -328,7 +328,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + QStringList sessions; + bool presetDCOPServer = false; +// char *dcopStr = 0L; -+ QString dcopServer; ++ TQString dcopServer; + + for( it = users.begin(); it != users.end() || firstRun; it++ ) + { @@ -397,8 +397,8 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) ) + { + // Check for ICE authority file and if the file can be read by us -+ QString home = it.data(); -+ QString iceFile = it.data() + "/.ICEauthority"; ++ TQString home = it.data(); ++ TQString iceFile = it.data() + "/.ICEauthority"; + QFileInfo fi( iceFile ); + if( iceFile.isEmpty() ) + { @@ -447,7 +447,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + { + if( !presetDCOPServer && !users.isEmpty() ) + { -+ QString dcopFile = it.data() + "/" + *sIt; ++ TQString dcopFile = it.data() + "/" + *sIt; + QFile f( dcopFile ); + if( !f.open( IO_ReadOnly ) ) + { @@ -544,9 +544,9 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp +{ + bool readStdin = false; + int numOptions = 0; -+ QString user; ++ TQString user; + Session session = DefaultSession; -+ QString sessionName; ++ TQString sessionName; + + // Scan for command-line options first + for( int pos = 1 ; pos <= argc - 1 ; pos++ ) @@ -562,7 +562,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + { + if( pos <= argc - 2 ) + { -+ user = QString::fromLocal8Bit( argv[ pos + 1] ); ++ user = TQString::fromLocal8Bit( argv[ pos + 1] ); + numOptions +=2; + pos++; + } @@ -656,7 +656,7 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. + TQString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; @@ -699,11 +699,11 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp } --void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) -+void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) +-void marshall(QDataStream &arg, int argc, char **argv, int &i, TQString type) ++void marshall( QDataStream &arg, QCStringList args, uint &i, TQString type ) { - if (type == "TQStringList") -- type = "QValueList"; +- type = "QValueList"; - if (type == "QCStringList") - type = "QValueList"; - if (i >= argc) @@ -711,7 +711,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp - tqWarning("Not enough arguments."); - exit(1); - } -- QString s = QString::fromLocal8Bit(argv[i]); +- TQString s = TQString::fromLocal8Bit(argv[i]); - - if ( type == "int" ) - arg << s.toInt(); @@ -739,7 +739,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp - arg << s; - else if ( type == "QCString" ) - arg << QCString( argv[i] ); -- else if ( type == "QColor" ) +- else if ( type == "TQColor" ) - arg << mkColor( s ); - else if ( type == "TQPoint" ) - arg << mkPoint( s ); @@ -758,14 +758,14 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp - arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); - else if ( s.left( 6 ) == "QRect(" ) - arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -- else if ( s.left( 7 ) == "QColor(" ) +- else if ( s.left( 7 ) == "TQColor(" ) - arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); - else - arg << QVariant( s ); - } else if ( type.startsWith("QValueList<")) { - type = type.mid(11, type.length() - 12); - QStringList list; -- QString delim = s; +- TQString delim = s; - if (delim == "[") - delim = "]"; - if (delim == "(") @@ -774,7 +774,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp - QByteArray dummy_data; - QDataStream dummy_arg(dummy_data, IO_WriteOnly); + if (type == "TQStringList") -+ type = "QValueList"; ++ type = "QValueList"; + if (type == "QCStringList") + type = "QValueList"; + if( i > args.count() ) @@ -782,7 +782,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp + tqWarning("Not enough arguments."); + exit(1); + } -+ QString s = QString::fromLocal8Bit( args[ i ] ); ++ TQString s = TQString::fromLocal8Bit( args[ i ] ); - int j = i; - int count = 0; @@ -838,7 +838,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp + arg << s; + else if ( type == "QCString" ) + arg << QCString( args[ i ] ); -+ else if ( type == "QColor" ) ++ else if ( type == "TQColor" ) + arg << mkColor( s ); + else if ( type == "TQPoint" ) + arg << mkPoint( s ); @@ -857,14 +857,14 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp + arg << QVariant( mkSize( s.mid(6, s.length()-7) ) ); + else if ( s.left( 6 ) == "QRect(" ) + arg << QVariant( mkRect( s.mid(6, s.length()-7) ) ); -+ else if ( s.left( 7 ) == "QColor(" ) ++ else if ( s.left( 7 ) == "TQColor(" ) + arg << QVariant( mkColor( s.mid(7, s.length()-8) ) ); + else + arg << QVariant( s ); + } else if ( type.startsWith("QValueList<")) { + type = type.mid(11, type.length() - 12); + QStringList list; -+ QString delim = s; ++ TQString delim = s; + if (delim == "[") + delim = "]"; + if (delim == "(") @@ -882,7 +882,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp + tqWarning("List end-delimiter '%s' not found.", delim.latin1()); + exit(1); + } -+ if( QString::fromLocal8Bit( args[ j ] ) == delim ) ++ if( TQString::fromLocal8Bit( args[ j ] ) == delim ) + break; + marshall( dummy_arg, args, j, type ); + count++; @@ -895,7 +895,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp + tqWarning("List end-delimiter '%s' not found.", delim.latin1()); + exit(1); + } -+ if( QString::fromLocal8Bit( args[ i ] ) == delim ) ++ if( TQString::fromLocal8Bit( args[ i ] ) == delim ) + break; + marshall( arg, args, i, type ); + } diff --git a/poxml/gettext.g b/poxml/gettext.g index 1e0a3b34..c50cd5b0 100644 --- a/poxml/gettext.g +++ b/poxml/gettext.g @@ -57,17 +57,17 @@ string c, mi, mip, ms; : c=comment mi=msgid ( ( ms=msgstr { - mb.comment = QString::fromUtf8(c.c_str()); - mb.msgid = QString::fromUtf8(mi.c_str()); - mb.msgstr = QString::fromUtf8(ms.c_str()); + mb.comment = TQString::fromUtf8(c.c_str()); + mb.msgid = TQString::fromUtf8(mi.c_str()); + mb.msgstr = TQString::fromUtf8(ms.c_str()); } ) | ( mip=msgid_plural ms=msgstr_plural { - mb.comment = QString::fromUtf8(c.c_str()); - mb.msgid = QString::fromUtf8(mi.c_str()); - mb.msgid_plural = QString::fromUtf8(mip.c_str()); - mb.msgstr = QString::fromUtf8(ms.c_str()); + mb.comment = TQString::fromUtf8(c.c_str()); + mb.msgid = TQString::fromUtf8(mi.c_str()); + mb.msgid_plural = TQString::fromUtf8(mip.c_str()); + mb.msgstr = TQString::fromUtf8(ms.c_str()); } ) ) diff --git a/scripts/add_trace.pl b/scripts/add_trace.pl index bad152c3..cf073a3b 100644 --- a/scripts/add_trace.pl +++ b/scripts/add_trace.pl @@ -97,8 +97,8 @@ while (<>) elsif ( m/^bool\s+([a-zA-Z0-9_]+)/ ) { $line = $line . " << \" $1=\" << (" . $1 . " ? \"true\" : \"false\" )"; } - ## QString and friends - elsif ( m/QString[\&\s]+([a-zA-Z0-9_]+)/ || m/QCString[\&\s]*([a-zA-Z0-9_]+)/ ) { + ## TQString and friends + elsif ( m/TQString[\&\s]+([a-zA-Z0-9_]+)/ || m/QCString[\&\s]*([a-zA-Z0-9_]+)/ ) { $line = $line . " << \" $1=\" << " . $1; } ## KURL diff --git a/scripts/fixheaders b/scripts/fixheaders index 73c7b581..eb9dbeb4 100644 --- a/scripts/fixheaders +++ b/scripts/fixheaders @@ -57,7 +57,7 @@ $lastdir = '.'; '`QUriDrag\' undeclared \(first use this function\)' => "qdragobject", '`kdDebug\' undeclared \(first use this function\)' => "kdebug", '`kdWarning\' undeclared \(first use this function\)' => "kdebug", - 'no matching function for call to `KMenuBar::insertItem\(QString, TDEPopupMenu' => "tdepopupmenu", + 'no matching function for call to `KMenuBar::insertItem\(TQString, TDEPopupMenu' => "tdepopupmenu", 'no matching function for call to `KMenuBar::' => "kmenubar", 'invalid use of undefined type `class QPointArray' => "qpointarray", 'variable `QPainter \S*\' has initializer but incomplete type' => "qpainter", @@ -79,7 +79,7 @@ $lastdir = '.'; '`DCOPClient\' undeclared \(first use this function\)' => "dcopclient", 'invalid use of undefined type `class KStatusBar\'' => "kstatusbar", 'invalid use of undefined type `class QLabel\'' => "qlabel", - 'invalid use of undefined type `class QImage\'' => "qimage", + 'invalid use of undefined type `class TQImage\'' => "qimage", 'invalid use of undefined type `class QImageIO\'' => "qimage", 'invalid use of undefined type `class QLineEdit\'' => "qlineedit", 'invalid use of undefined type `class QComboBox\'' => "qcombobox", @@ -97,7 +97,7 @@ $lastdir = '.'; 'error: incomplete type `Q3ValueList' => 'q3valuelist', 'error: variable `Q3ValueList<' => 'q3valuelist', 'error: `Q3PointArray\' undeclared' => 'q3pointarray', - 'error: invalid use of undefined type \`struct QColor' => 'qcolor', + 'error: invalid use of undefined type \`struct TQColor' => 'qcolor', 'error: `QX11Info::' => 'qx11info_x11', 'error: incomplete type \'QX11Info' => 'qx11info_x11', 'error: \'Q3AsciiDi' => 'q3asciidict' diff --git a/scripts/includemocs b/scripts/includemocs index 3b2c87f0..a96d4fd7 100755 --- a/scripts/includemocs +++ b/scripts/includemocs @@ -71,14 +71,14 @@ includemocs -- handle mocifyable headers, whose .moc file is nowhere included. =head1 DESCRIPTION -Header files declaring a QObject descendant have to be run through moc to +Header files declaring a TQObject descendant have to be run through moc to produce a .moc file. This .moc file has to be compiled, for which two possibilities exists: compile it separately, or #include it in the C++ file implementing that above mentioned class. The latter is more efficient in term of compilation speed. This script searches in the current directory and its subdirs for header files -declaring a QObject descendant class. If it finds some, it looks, if there is +declaring a TQObject descendant class. If it finds some, it looks, if there is a C++ file containing an '#include' for the generated .moc file. If thats not the case, it tries to guess into which C++ file that '#include' is placed best (based on the filename). If it fails to guess a proper place, it mentions diff --git a/scripts/kDebug2kdDebug.sh b/scripts/kDebug2kdDebug.sh index 2a08b610..871bc439 100755 --- a/scripts/kDebug2kdDebug.sh +++ b/scripts/kDebug2kdDebug.sh @@ -99,8 +99,8 @@ while (<>) if ( /(%[0-9]*[a-z])/ ) # This item is a format { ## 3 - Find argument - # kludge for QString(a,b) constructions - $arguments =~ s/(QString\s*\([^,]+,[^,]+\))/QStrKLUDGE/; + # kludge for TQString(a,b) constructions + $arguments =~ s/(TQString\s*\([^,]+,[^,]+\))/QStrKLUDGE/; $kludge = $1; $arguments =~ s/\s*([^,]+)\s*,//; # Remove trailing .ascii() and latin1() diff --git a/scripts/kde-devel-gdb b/scripts/kde-devel-gdb index 62a43aba..3901803e 100644 --- a/scripts/kde-devel-gdb +++ b/scripts/kde-devel-gdb @@ -12,7 +12,7 @@ define printqstring printqstringdata $arg0.d end document printqstring - Prints the contents of a QString + Prints the contents of a TQString end define printq4string printq4stringdata $arg0.d @@ -32,8 +32,8 @@ end document printqstringdata Prints the contents of a QStringData This is useful when the output of another command (e.g. printqmap) - shows {d = 0xdeadbeef} for a QString, i.e. the qstringdata address - instead of the QString object itself. + shows {d = 0xdeadbeef} for a TQString, i.e. the qstringdata address + instead of the TQString object itself. printqstring $s and printqstringdata $s.d are equivalent. end @@ -73,7 +73,7 @@ define printqstring_utf8 printf "\n" end document printqstring_utf8 - Prints the contents of a QString encoded in utf8. + Prints the contents of a TQString encoded in utf8. Nice if you run your debug session in a utf8 enabled terminal. end @@ -106,8 +106,8 @@ define printqcolor printf "(%d,%d,%d)\n", ($arg0).red(), ($arg0).green(), ($arg0).blue() end document printqcolor - Prints a QColor as (R,G,B). - Usage: 'printqcolor + Prints a TQColor as (R,G,B). + Usage: 'printqcolor end define printqmemarray diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index 4e9eaf65..a1832c51 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -215,7 +215,7 @@ function! MapIdentHeader( ident ) return '' elseif a:ident =~ 'QListBox.*' return '' - elseif a:ident == 'QChar' || + elseif a:ident == 'TQChar' || \a:ident == 'QCharRef' || \a:ident == 'QConstString' return '' diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el index 2b6989c4..d93fa0ff 100644 --- a/scripts/kde-emacs/klaralv.el +++ b/scripts/kde-emacs/klaralv.el @@ -73,7 +73,7 @@ (qaction.h QActionGroup) (qvalidator.h QIntValidator QDoubleValidator QRegExpValidator) (qlistbox.h QListBoxItem QListBoxText QListBoxPixmap) - (qstring.h QChar QCharRef QConstString) + (qstring.h TQChar QCharRef QConstString) (qcanvas.h QCanvasSprite QCanvasPolygonalItem QCanvasRectangle QCanvasPolygon QCanvasEllipse QCanvasText QCanvasLine QCanvasChunk QCanvas QCanvasItem QCanvasView QCanvasPixmap) diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui index a8fcccd5..86af506a 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui @@ -270,7 +270,7 @@ - QString + TQString string