diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 0813b39aed2cf4c84157a22c4c9594336d93d412 (patch) | |
tree | 0f6157f9c9ecc6ed26cb98f058219a8021d3f4a6 /kompare/tests | |
parent | 35dc58791106d7a1864264063df5f3ee3f1f0f15 (diff) | |
download | tdesdk-0813b39aed2cf4c84157a22c4c9594336d93d412.tar.gz tdesdk-0813b39aed2cf4c84157a22c4c9594336d93d412.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kompare/tests')
-rw-r--r-- | kompare/tests/cvsdiff/context.diff | 4 | ||||
-rw-r--r-- | kompare/tests/cvsdiff/contextm.diff | 24 | ||||
-rw-r--r-- | kompare/tests/cvsdiff/edm.diff | 6 | ||||
-rw-r--r-- | kompare/tests/cvsdiff/normalm.diff | 8 | ||||
-rw-r--r-- | kompare/tests/cvsdiff/rcsm.diff | 6 | ||||
-rw-r--r-- | kompare/tests/cvsdiff/unified.diff | 2 | ||||
-rw-r--r-- | kompare/tests/cvsdiff/unifiedm.diff | 16 | ||||
-rw-r--r-- | kompare/tests/diff/contextm.diff | 24 | ||||
-rw-r--r-- | kompare/tests/diff/edm.diff | 6 | ||||
-rw-r--r-- | kompare/tests/diff/normalm.diff | 8 | ||||
-rw-r--r-- | kompare/tests/diff/rcsm.diff | 6 | ||||
-rw-r--r-- | kompare/tests/diff/unifiedm.diff | 16 |
12 files changed, 63 insertions, 63 deletions
diff --git a/kompare/tests/cvsdiff/context.diff b/kompare/tests/cvsdiff/context.diff index eab790d0..8773139c 100644 --- a/kompare/tests/cvsdiff/context.diff +++ b/kompare/tests/cvsdiff/context.diff @@ -13,7 +13,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 tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; static bool bLaunchApp = 0; @@ -21,7 +21,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 tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); *************** *** 118,124 **** f = fc; diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff index cde99b5e..090c4c71 100644 --- a/kompare/tests/cvsdiff/contextm.diff +++ b/kompare/tests/cvsdiff/contextm.diff @@ -83,8 +83,8 @@ diff -c -r1.26 dcop.cpp { - QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); --- 146,153 ---- } } @@ -92,8 +92,8 @@ 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 tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); *************** *** 136,142 **** bool ok = false; @@ -116,7 +116,7 @@ diff -c -r1.26 dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! int a = (*it).tqcontains(','); +! int a = (*it).contains(','); ! if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) break; } @@ -127,12 +127,12 @@ diff -c -r1.26 dcop.cpp ! exit(1); } f = realfunc; - left = f.tqfind( '(' ); + left = f.find( '(' ); --- 180,195 ---- if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! uint a = (*it).tqcontains(','); +! uint a = (*it).contains(','); ! if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -144,7 +144,7 @@ diff -c -r1.26 dcop.cpp ! return; } f = realfunc; - left = f.tqfind( '(' ); + left = f.find( '(' ); *************** *** 243,253 **** QCString replyType; @@ -363,13 +363,13 @@ diff -c -r1.26 dcop.cpp QCString function; ! QCStringList params; ! DCOPClient *client = 0L; -! if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) +! if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) { ! // WARNING: This part (until the closing '}') could very ! // 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 ].tqfindRev( ',' ); +! int delimPos = args[ 0 ].findRev( ',' ); ! if( delimPos == -1 ) ! { ! cerr << "Error: '" << args[ 0 ] @@ -748,7 +748,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 tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; static bool bLaunchApp = 0; @@ -756,7 +756,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 tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); *************** *** 118,124 **** f = fc; diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff index a5672a1c..a3c7d41a 100644 --- a/kompare/tests/cvsdiff/edm.diff +++ b/kompare/tests/cvsdiff/edm.diff @@ -352,7 +352,7 @@ int main( int argc, char** argv ) // 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 ].tqfindRev( ',' ); + int delimPos = args[ 0 ].findRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] @@ -376,7 +376,7 @@ int main( int argc, char** argv ) 286,287c QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) . 282a /** @@ -498,7 +498,7 @@ void showHelp( int exitCode = 0 ) return; . 156,157c - uint a = (*it).tqcontains(','); + uint a = (*it).contains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) . 139c diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff index b191cb2c..ee47044e 100644 --- a/kompare/tests/cvsdiff/normalm.diff +++ b/kompare/tests/cvsdiff/normalm.diff @@ -60,10 +60,10 @@ diff -r1.26 dcop.cpp --- > if ( !ok && args.isEmpty() ) 156,157c183,184 -< int a = (*it).tqcontains(','); +< int a = (*it).contains(','); < if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) --- -> uint a = (*it).tqcontains(','); +> uint a = (*it).contains(','); > if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) 164c191,192 < exit(1); @@ -201,7 +201,7 @@ diff -r1.26 dcop.cpp --- > QCStringList params; > DCOPClient *client = 0L; -> if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) +> if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) 289,304c406,429 < char *delim = strchr(argv[1], ','); < if (!delim) @@ -224,7 +224,7 @@ diff -r1.26 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 ].tqfindRev( ',' ); +> int delimPos = args[ 0 ].findRev( ',' ); > if( delimPos == -1 ) > { > cerr << "Error: '" << args[ 0 ] diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff index a67d7e54..9b8f2ae3 100644 --- a/kompare/tests/cvsdiff/rcsm.diff +++ b/kompare/tests/cvsdiff/rcsm.diff @@ -53,7 +53,7 @@ a139 1 if ( !ok && args.isEmpty() ) d156 2 a157 2 - uint a = (*it).tqcontains(','); + uint a = (*it).contains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) d164 1 a164 2 @@ -175,14 +175,14 @@ d286 2 a287 3 QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) d289 16 a304 24 // WARNING: This part (until the closing '}') could very // 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 ].tqfindRev( ',' ); + int delimPos = args[ 0 ].findRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] diff --git a/kompare/tests/cvsdiff/unified.diff b/kompare/tests/cvsdiff/unified.diff index ab69a295..c9e56db8 100644 --- a/kompare/tests/cvsdiff/unified.diff +++ b/kompare/tests/cvsdiff/unified.diff @@ -13,7 +13,7 @@ diff -u -r1.2 dcopfind.cpp +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; } diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff index b4e8b2a1..3331435c 100644 --- a/kompare/tests/cvsdiff/unifiedm.diff +++ b/kompare/tests/cvsdiff/unifiedm.diff @@ -67,8 +67,8 @@ diff -u -r1.26 dcop.cpp { - QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); @@ -136,7 +163,7 @@ bool ok = false; QCStringList funcs = dcop->remoteFunctions( app, obj, &ok ); @@ -82,9 +82,9 @@ diff -u -r1.26 dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -- int a = (*it).tqcontains(','); +- int a = (*it).contains(','); - if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) -+ uint a = (*it).tqcontains(','); ++ uint a = (*it).contains(','); + if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -97,7 +97,7 @@ diff -u -r1.26 dcop.cpp + return; } f = realfunc; - left = f.tqfind( '(' ); + left = f.find( '(' ); @@ -243,11 +271,12 @@ QCString replyType; QDataStream arg(data, IO_WriteOnly); @@ -237,7 +237,7 @@ diff -u -r1.26 dcop.cpp - if ((argc > 1) && (strncmp(argv[1], "DCOPRef(", 8)) == 0) + QCStringList params; + DCOPClient *client = 0L; -+ if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) ++ if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) { - char *delim = strchr(argv[1], ','); - if (!delim) @@ -259,7 +259,7 @@ diff -u -r1.26 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 ].tqfindRev( ',' ); ++ int delimPos = args[ 0 ].findRev( ',' ); + if( delimPos == -1 ) + { + cerr << "Error: '" << args[ 0 ] @@ -669,7 +669,7 @@ diff -u -r1.2 dcopfind.cpp +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; } diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff index 1833fa06..76c3f974 100644 --- a/kompare/tests/diff/contextm.diff +++ b/kompare/tests/diff/contextm.diff @@ -79,8 +79,8 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp { - QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); --- 146,153 ---- } } @@ -88,8 +88,8 @@ 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 tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); *************** *** 136,142 **** bool ok = false; @@ -112,7 +112,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! int a = (*it).tqcontains(','); +! int a = (*it).contains(','); ! if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) break; } @@ -123,12 +123,12 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! exit(1); } f = realfunc; - left = f.tqfind( '(' ); + left = f.find( '(' ); --- 180,195 ---- if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! uint a = (*it).tqcontains(','); +! uint a = (*it).contains(','); ! if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -140,7 +140,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! return; } f = realfunc; - left = f.tqfind( '(' ); + left = f.find( '(' ); *************** *** 243,253 **** QCString replyType; @@ -357,13 +357,13 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp QCString function; ! QCStringList params; ! DCOPClient *client = 0L; -! if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) +! if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) { ! // WARNING: This part (until the closing '}') could very ! // 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 ].tqfindRev( ',' ); +! int delimPos = args[ 0 ].findRev( ',' ); ! if( delimPos == -1 ) ! { ! cerr << "Error: '" << args[ 0 ] @@ -738,7 +738,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 tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; static bool bLaunchApp = 0; @@ -746,7 +746,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 tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); *************** *** 118,124 **** f = fc; diff --git a/kompare/tests/diff/edm.diff b/kompare/tests/diff/edm.diff index e2ad0672..2d802765 100644 --- a/kompare/tests/diff/edm.diff +++ b/kompare/tests/diff/edm.diff @@ -348,7 +348,7 @@ int main( int argc, char** argv ) // 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 ].tqfindRev( ',' ); + int delimPos = args[ 0 ].findRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] @@ -372,7 +372,7 @@ int main( int argc, char** argv ) 286,287c QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) . 282a /** @@ -494,7 +494,7 @@ void showHelp( int exitCode = 0 ) return; . 156,157c - uint a = (*it).tqcontains(','); + uint a = (*it).contains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) . 139c diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff index c08da23b..2ce10d6a 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).tqcontains(','); +< int a = (*it).contains(','); < if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) --- -> uint a = (*it).tqcontains(','); +> uint a = (*it).contains(','); > 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 ].tqfind( "DCOPRef(" ) == 0 ) +> if ( !args.isEmpty() && args[ 0 ].find( "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 ].tqfindRev( ',' ); +> int delimPos = args[ 0 ].findRev( ',' ); > if( delimPos == -1 ) > { > cerr << "Error: '" << args[ 0 ] diff --git a/kompare/tests/diff/rcsm.diff b/kompare/tests/diff/rcsm.diff index 9df85d76..ac8061f5 100644 --- a/kompare/tests/diff/rcsm.diff +++ b/kompare/tests/diff/rcsm.diff @@ -49,7 +49,7 @@ a139 1 if ( !ok && args.isEmpty() ) d156 2 a157 2 - uint a = (*it).tqcontains(','); + uint a = (*it).contains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) d164 1 a164 2 @@ -171,14 +171,14 @@ d286 2 a287 3 QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) d289 16 a304 24 // WARNING: This part (until the closing '}') could very // 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 ].tqfindRev( ',' ); + int delimPos = args[ 0 ].findRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff index e4fbd157..4296e44f 100644 --- a/kompare/tests/diff/unifiedm.diff +++ b/kompare/tests/diff/unifiedm.diff @@ -63,8 +63,8 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp { - QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); @@ -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).tqcontains(','); +- int a = (*it).contains(','); - if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) -+ uint a = (*it).tqcontains(','); ++ uint a = (*it).contains(','); + 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.tqfind( '(' ); + left = f.find( '(' ); @@ -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 ].tqfind( "DCOPRef(" ) == 0 ) ++ if ( !args.isEmpty() && args[ 0 ].find( "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 ].tqfindRev( ',' ); ++ int delimPos = args[ 0 ].findRev( ',' ); + if( delimPos == -1 ) + { + cerr << "Error: '" << args[ 0 ] @@ -660,7 +660,7 @@ diff -aur 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 tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; } |