diff options
Diffstat (limited to 'kompare/tests/cvsdiff/rcsm.diff')
| -rw-r--r-- | kompare/tests/cvsdiff/rcsm.diff | 36 |
1 files changed, 18 insertions, 18 deletions
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<QString, QString> UserList; +typedef QMap<TQString, TQString> 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<QString>"; + type = "QValueList<TQString>"; if (type == "QCStringList") type = "QValueList<QCString>"; 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 ); } |