diff options
Diffstat (limited to 'kompare/tests/diff/normalm.diff')
| -rw-r--r-- | kompare/tests/diff/normalm.diff | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff index 3db667ba..c08da23b 100644 --- a/kompare/tests/diff/normalm.diff +++ b/kompare/tests/diff/normalm.diff @@ -56,10 +56,10 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp --- > if ( !ok && args.isEmpty() ) 156,157c183,184 -< 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() ) ) 164c191,192 < exit(1); @@ -197,7 +197,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp --- > QCStringList params; > DCOPClient *client = 0L; -> if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) +> if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) 289,304c406,429 < char *delim = strchr(argv[1], ','); < if (!delim) @@ -220,7 +220,7 @@ diff -r 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 ] @@ -643,7 +643,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp --- > void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) 247,317c247,256 -< if (type == "QStringList") +< if (type == TQSTRINGLIST_OBJECT_NAME_STRING) < type = "QValueList<QString>"; < if (type == "QCStringList") < type = "QValueList<QCString>"; @@ -676,13 +676,13 @@ diff -r 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 ); @@ -715,7 +715,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp < 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>"; @@ -777,13 +777,13 @@ diff -r 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 ); |