From 7485c8248a1bb3a2fed851d389a291d60bba7752 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 25 Sep 2023 20:06:11 +0900 Subject: Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version Signed-off-by: Michele Calgaro (cherry picked from commit 0ffe839d6e363933ed4d9d212b6fd325a6fc3225) --- 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 ++++++++++++++++++------------------- 5 files changed, 114 insertions(+), 114 deletions(-) (limited to 'kompare/tests/diff') 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 ); + } -- cgit v1.2.1