diff options
Diffstat (limited to 'kompare/tests/diff/unifiedm.diff')
| -rw-r--r-- | kompare/tests/diff/unifiedm.diff | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff index 4a30c6b4..e4fbd157 100644 --- a/kompare/tests/diff/unifiedm.diff +++ b/kompare/tests/diff/unifiedm.diff @@ -62,9 +62,9 @@ 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. - int left = f.find( '(' ); - int right = f.find( ')' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); + int right = f.tqfind( ')' ); @@ -136,7 +163,7 @@ bool ok = false; QCStringList funcs = dcop->remoteFunctions( app, obj, &ok ); @@ -78,9 +78,9 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -- int a = (*it).contains(','); +- int a = (*it).tqcontains(','); - if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) -+ uint a = (*it).contains(','); ++ uint a = (*it).tqcontains(','); + if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -93,7 +93,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + return; } f = realfunc; - left = f.find( '(' ); + left = f.tqfind( '(' ); @@ -243,11 +271,12 @@ QCString replyType; QDataStream arg(data, IO_WriteOnly); @@ -232,7 +232,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp - if ((argc > 1) && (strncmp(argv[1], "DCOPRef(", 8)) == 0) + QCStringList params; + DCOPClient *client = 0L; -+ if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) ++ if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) { - char *delim = strchr(argv[1], ','); - if (!delim) @@ -254,7 +254,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + // well be broken now. As I don't know how to trigger and test + // dcoprefs this code is *not* tested. It compiles and it looks + // ok to me, but that's all I can say - Martijn (2001/12/24) -+ int delimPos = args[ 0 ].findRev( ',' ); ++ int delimPos = args[ 0 ].tqfindRev( ',' ); + if( delimPos == -1 ) + { + cerr << "Error: '" << args[ 0 ] @@ -659,8 +659,8 @@ 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. - int left = f.find( '(' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); @@ -118,7 +118,7 @@ f = fc; } @@ -705,7 +705,7 @@ 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 ) { -- if (type == "QStringList") +- if (type == TQSTRINGLIST_OBJECT_NAME_STRING) - type = "QValueList<QString>"; - if (type == "QCStringList") - type = "QValueList<QCString>"; @@ -738,13 +738,13 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp - arg << s.toDouble(); - else if ( type == "bool" ) - arg << mkBool( s ); -- else if ( type == "QString" ) +- else if ( type == TQSTRING_OBJECT_NAME_STRING ) - arg << s; - else if ( type == "QCString" ) - arg << QCString( argv[i] ); - else if ( type == "QColor" ) - arg << mkColor( s ); -- else if ( type == "QPoint" ) +- else if ( type == TQPOINT_OBJECT_NAME_STRING ) - arg << mkPoint( s ); - else if ( type == "QSize" ) - arg << mkSize( s ); @@ -776,7 +776,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp - i++; - QByteArray dummy_data; - QDataStream dummy_arg(dummy_data, IO_WriteOnly); -+ if (type == "QStringList") ++ if (type == TQSTRINGLIST_OBJECT_NAME_STRING) + type = "QValueList<QString>"; + if (type == "QCStringList") + type = "QValueList<QCString>"; @@ -837,13 +837,13 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp + arg << s.toDouble(); + else if ( type == "bool" ) + arg << mkBool( s ); -+ else if ( type == "QString" ) ++ else if ( type == TQSTRING_OBJECT_NAME_STRING ) + arg << s; + else if ( type == "QCString" ) + arg << QCString( args[ i ] ); + else if ( type == "QColor" ) + arg << mkColor( s ); -+ else if ( type == "QPoint" ) ++ else if ( type == TQPOINT_OBJECT_NAME_STRING ) + arg << mkPoint( s ); + else if ( type == "QSize" ) + arg << mkSize( s ); |