diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-09-25 20:06:11 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-09-25 20:33:38 +0900 |
commit | 7485c8248a1bb3a2fed851d389a291d60bba7752 (patch) | |
tree | 01530186491285c596ad8bea4ee9368436e38a48 /kompare/tests/cvsdiff/contextm.diff | |
parent | 2611dd9a2020f335eff619aeeffc3730144ce657 (diff) | |
download | tdesdk-7485c8248a1bb3a2fed851d389a291d60bba7752.tar.gz tdesdk-7485c8248a1bb3a2fed851d389a291d60bba7752.zip |
Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* versionr14.1.1
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 0ffe839d6e363933ed4d9d212b6fd325a6fc3225)
Diffstat (limited to 'kompare/tests/cvsdiff/contextm.diff')
-rw-r--r-- | kompare/tests/cvsdiff/contextm.diff | 56 |
1 files changed, 28 insertions, 28 deletions
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<QString, QString> UserList; ++ typedef QMap<TQString, TQString> 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<QString>"; +! type = "QValueList<TQString>"; ! if (type == "QCStringList") ! type = "QValueList<QCString>"; ! 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<QString>"; +! type = "QValueList<TQString>"; ! if (type == "QCStringList") ! type = "QValueList<QCString>"; ! 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 ); + } |