diff options
Diffstat (limited to 'dcop/client/dcop.cpp')
-rw-r--r-- | dcop/client/dcop.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp index 1d167ce70..86b63cba6 100644 --- a/dcop/client/dcop.cpp +++ b/dcop/client/dcop.cpp @@ -158,9 +158,9 @@ void queryFunctions( const char* app, const char* obj ) int callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - TQString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); - int right = f.find( ')' ); + TQString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); + int right = f.tqfind( ')' ); if ( right < left ) { @@ -181,12 +181,12 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt return( 1 ); } for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { - int l = (*it).find( '(' ); + int l = (*it).tqfind( '(' ); int s; if (l > 0) - s = (*it).findRev( ' ', l); + s = (*it).tqfindRev( ' ', l); else - s = (*it).find( ' ' ); + s = (*it).tqfind( ' ' ); if ( s < 0 ) s = 0; @@ -195,8 +195,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); - const TQString arguments = (*it).mid(l+1,(*it).find( ')' )-l-1); - uint a = arguments.contains(','); + const TQString arguments = (*it).mid(l+1,(*it).tqfind( ')' )-l-1); + uint a = arguments.tqcontains(','); if ( (a==0 && !arguments.isEmpty()) || a>0) a++; if ( a == args.count() ) @@ -209,8 +209,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt return( 1 ); } f = realfunc; - left = f.find( '(' ); - right = f.find( ')' ); + left = f.tqfind( '(' ); + right = f.tqfind( ')' ); } doit: @@ -230,7 +230,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) { TQString lt = (*it).simplifyWhiteSpace(); - int s = lt.find(' '); + int s = lt.tqfind(' '); // If there are spaces in the name, there may be two // reasons: the parameter name is still there, ie. @@ -250,7 +250,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt // s=1; - while (s < static_cast<int>(partl.count()) && intTypes.contains(partl[s])) + while (s < static_cast<int>(partl.count()) && intTypes.tqcontains(partl[s])) { s++; } @@ -345,7 +345,7 @@ void showHelp( int exitCode = 0 ) << " in bash, but because no new dcop instance has to be started" << endl << " for each line this is generally much faster, especially for" << endl << " the slower GNU dynamic linkers." << endl - << " The '%1' placeholder cannot be used to replace e.g. the" << endl + << " The '%1' placeholder cannot be used to tqreplace e.g. the" << endl << " program, object or method name." << endl << " --user <user> Connect to the given user's DCOP server. This option will" << endl << " ignore the values of the environment vars $DCOPSERVER and" << endl @@ -464,9 +464,9 @@ int runDCOP( QCStringList args, UserList users, Session session, QCStringList params; DCOPClient *client = 0L; int retval = 0; - if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) { - int delimPos = args[ 0 ].findRev( ',' ); + int delimPos = args[ 0 ].tqfindRev( ',' ); if( delimPos == -1 ) { cerr_ << "Error: '" << args[ 0 ] @@ -569,7 +569,7 @@ int runDCOP( QCStringList args, UserList users, Session session, } else if( !sessionName.isEmpty() ) { - if( sessions.contains( sessionName ) ) + if( sessions.tqcontains( sessionName ) ) { sessions.clear(); sessions.append( sessionName ); @@ -625,7 +625,7 @@ int runDCOP( QCStringList args, UserList users, Session session, continue; else { - cerr_ << "WARNING: Cannot find ICE authority file " + cerr_ << "WARNING: Cannot tqfind ICE authority file " << iceFile << "!" << endl << "Please check permissions or set the $ICEAUTHORITY" << " variable manually before" << endl @@ -706,12 +706,12 @@ int runDCOP( QCStringList args, UserList users, Session session, sendUserTime( app ); if( readStdin ) { - QCStringList::Iterator replaceArg = params.end(); + QCStringList::Iterator tqreplaceArg = params.end(); QCStringList::Iterator it = params.begin(); for( ; it != params.end(); ++it ) if( *it == "%1" ) - replaceArg = it; + tqreplaceArg = it; // Read from stdin until EOF and call function for each // read line @@ -719,8 +719,8 @@ int runDCOP( QCStringList args, UserList users, Session session, { TQString buf = cin_.readLine(); - if( replaceArg != params.end() ) - *replaceArg = buf.local8Bit(); + if( tqreplaceArg != params.end() ) + *tqreplaceArg = buf.local8Bit(); if( !buf.isNull() ) { @@ -861,7 +861,7 @@ int main( int argc, char** argv ) if (prog[prog.length()-1] != '*') { // Strip a trailing -<PID> part. - int i = prog.findRev('-'); + int i = prog.tqfindRev('-'); if ((i >= 0) && prog.mid(i+1).toLong()) { prog = prog.left(i); |