summaryrefslogtreecommitdiffstats
path: root/dcop
diff options
context:
space:
mode:
Diffstat (limited to 'dcop')
-rw-r--r--dcop/client/dcop.cpp30
-rw-r--r--dcop/client/dcopfind.cpp8
-rw-r--r--dcop/client/marshall.cpp6
-rw-r--r--dcop/dcopclient.cpp18
-rw-r--r--dcop/dcopidl/scanner.cc4
-rw-r--r--dcop/dcopidl/yacc.cc2
-rw-r--r--dcop/dcopidl/yacc.yy2
-rw-r--r--dcop/dcopidl2cpp/main.cpp6
-rw-r--r--dcop/dcopidl2cpp/skel.cpp4
-rw-r--r--dcop/dcopidl2cpp/stub.cpp10
-rw-r--r--dcop/dcopidl2cpp/stubimpl.cpp2
-rw-r--r--dcop/dcopobject.cpp2
-rw-r--r--dcop/dcopref.cpp8
-rw-r--r--dcop/dcopserver.cpp34
-rw-r--r--dcop/dcopserver.h2
-rw-r--r--dcop/dcopsignals.cpp18
16 files changed, 78 insertions, 78 deletions
diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp
index c58945904..4086d75b3 100644
--- a/dcop/client/dcop.cpp
+++ b/dcop/client/dcop.cpp
@@ -159,8 +159,8 @@ 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 tqunicode strings, so use one.
- int left = f.tqfind( '(' );
- int right = f.tqfind( ')' );
+ int left = f.find( '(' );
+ int right = f.find( ')' );
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).tqfind( '(' );
+ int l = (*it).find( '(' );
int s;
if (l > 0)
- s = (*it).tqfindRev( ' ', l);
+ s = (*it).findRev( ' ', l);
else
- s = (*it).tqfind( ' ' );
+ s = (*it).find( ' ' );
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).tqfind( ')' )-l-1);
- uint a = arguments.tqcontains(',');
+ const TQString arguments = (*it).mid(l+1,(*it).find( ')' )-l-1);
+ uint a = arguments.contains(',');
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.tqfind( '(' );
- right = f.tqfind( ')' );
+ left = f.find( '(' );
+ right = f.find( ')' );
}
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.tqfind(' ');
+ int s = lt.find(' ');
// 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.tqcontains(partl[s]))
+ while (s < static_cast<int>(partl.count()) && intTypes.contains(partl[s]))
{
s++;
}
@@ -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 ].tqfind( "DCOPRef(" ) == 0 )
+ if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
{
- int delimPos = args[ 0 ].tqfindRev( ',' );
+ int delimPos = args[ 0 ].findRev( ',' );
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.tqcontains( sessionName ) )
+ if( sessions.contains( sessionName ) )
{
sessions.clear();
sessions.append( sessionName );
@@ -861,7 +861,7 @@ int main( int argc, char** argv )
if (prog[prog.length()-1] != '*')
{
// Strip a trailing -<PID> part.
- int i = prog.tqfindRev('-');
+ int i = prog.findRev('-');
if ((i >= 0) && prog.mid(i+1).toLong())
{
prog = prog.left(i);
diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp
index 9d5e6182f..bde116f65 100644
--- a/dcop/client/dcopfind.cpp
+++ b/dcop/client/dcopfind.cpp
@@ -41,8 +41,8 @@ static bool bLaunchApp = 0;
bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
TQString 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( ')' );
if ( right < left )
{
@@ -66,7 +66,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
TQString lt = (*it).simplifyWhiteSpace();
- int s = lt.tqfind(' ');
+ int s = lt.find(' ');
// If there are spaces in the name, there may be two
// reasons: the parameter name is still there, ie.
@@ -86,7 +86,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
//
s=1;
- while (s < (int)partl.count() && intTypes.tqcontains(partl[s]))
+ while (s < (int)partl.count() && intTypes.contains(partl[s]))
{
s++;
}
diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp
index 27a73495b..9defa6d47 100644
--- a/dcop/client/marshall.cpp
+++ b/dcop/client/marshall.cpp
@@ -205,7 +205,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
result = r.url().local8Bit();
} else if ( type.left( 11 ) == "TQValueList<" )
{
- if ( (uint)type.tqfind( '>', 11 ) != type.length() - 1 )
+ if ( (uint)type.find( '>', 11 ) != type.length() - 1 )
return result;
TQString nestedType = type.mid( 11, type.length() - 12 );
@@ -227,12 +227,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
}
} else if ( type.left( 5 ) == "TQMap<" )
{
- int commaPos = type.tqfind( ',', 5 );
+ int commaPos = type.find( ',', 5 );
if ( commaPos == -1 )
return result;
- if ( (uint)type.tqfind( '>', commaPos ) != type.length() - 1 )
+ if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
return result;
TQString keyType = type.mid( 5, commaPos - 5 );
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp
index 892884af3..6a2bb3c98 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -97,13 +97,13 @@ client_map_t *cliMap()
DCOPClient *DCOPClient::findLocalClient( const TQCString &_appId )
{
- return cliMap()->tqfind(_appId.data());
+ return cliMap()->find(_appId.data());
}
static
void registerLocalClient( const TQCString &_appId, DCOPClient *client )
{
- cliMap()->tqreplace(_appId.data(), client);
+ cliMap()->replace(_appId.data(), client);
}
static
@@ -263,12 +263,12 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old)
disp = "NODISPLAY";
int i;
- if((i = disp.tqfindRev('.')) > disp.tqfindRev(KPATH_SEPARATOR) && i >= 0)
+ if((i = disp.findRev('.')) > disp.findRev(KPATH_SEPARATOR) && i >= 0)
disp.truncate(i);
if (!old)
{
- while( (i = disp.tqfind(KPATH_SEPARATOR)) >= 0)
+ while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
disp[i] = '_';
}
@@ -790,7 +790,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
// Should we abort ?
}
contents[size] = '\0';
- int pos = contents.tqfind('\n');
+ int pos = contents.find('\n');
if ( pos == -1 ) // Shouldn't happen
{
qDebug("Only one line in dcopserver file !: %s", contents.data());
@@ -1399,7 +1399,7 @@ static TQObject* findQtObject( TQCString id )
for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) {
if ( (*it).s == id ) // exact match
return (*it).o;
- if ( !firstContains && (*it).s.tqcontains( expr ) ) {
+ if ( !firstContains && (*it).s.contains( expr ) ) {
firstContains = (*it).o;
}
}
@@ -1413,7 +1413,7 @@ static QCStringList findQtObjects( TQCString id )
fillQtObjectsEx( l, 0, "qt" );
QCStringList result;
for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) {
- if ( (*it).s.tqcontains( expr ) )
+ if ( (*it).s.contains( expr ) )
result << (*it).s;
}
return result;
@@ -1501,7 +1501,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
TQStrList lst = o->tqmetaObject()->propertyNames( true );
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
TQMetaObject *mo = o->tqmetaObject();
- const TQMetaProperty* p = mo->property( mo->tqfindProperty( it.current(), true ), true );
+ const TQMetaProperty* p = mo->property( mo->findProperty( it.current(), true ), true );
if ( !p )
continue;
TQCString prop = p->type();
@@ -1532,7 +1532,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
reply << (TQ_INT8) o->setProperty( name, value );
return true;
} else {
- int slot = o->tqmetaObject()->tqfindSlot( fun, true );
+ int slot = o->tqmetaObject()->findSlot( fun, true );
if ( slot != -1 ) {
replyType = "void";
TQUObject uo[ 1 ];
diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cc
index f118a67e9..e91b21d68 100644
--- a/dcop/dcopidl/scanner.cc
+++ b/dcop/dcopidl/scanner.cc
@@ -1226,8 +1226,8 @@ YY_RULE_SETUP
#line 170 "scanner.ll"
{
TQString s( yytext );
- int i = s.tqfind(TQRegExp("[\"<]"))+1;
- int j = s.tqfind(TQRegExp("[\">]"), i);
+ int i = s.find(TQRegExp("[\"<]"))+1;
+ int j = s.find(TQRegExp("[\">]"), i);
yylval._str = new TQString( s.mid( i, j - i ) );
idl_line_no++;
return T_INCLUDE;
diff --git a/dcop/dcopidl/yacc.cc b/dcop/dcopidl/yacc.cc
index 1fbc4c0bd..d41fa6dbd 100644
--- a/dcop/dcopidl/yacc.cc
+++ b/dcop/dcopidl/yacc.cc
@@ -1643,7 +1643,7 @@ yyreduce:
case 15:
#line 221 "yacc.yy"
{
- int pos = in_namespace.tqfindRev( "::", -3 );
+ int pos = in_namespace.findRev( "::", -3 );
if( pos >= 0 )
in_namespace = in_namespace.left( pos + 2 );
else
diff --git a/dcop/dcopidl/yacc.yy b/dcop/dcopidl/yacc.yy
index 7870eb6e9..ca22c65e1 100644
--- a/dcop/dcopidl/yacc.yy
+++ b/dcop/dcopidl/yacc.yy
@@ -219,7 +219,7 @@ declaration
}
main T_RIGHT_CURLY_BRACKET opt_semicolon
{
- int pos = in_namespace.tqfindRev( "::", -3 );
+ int pos = in_namespace.findRev( "::", -3 );
if( pos >= 0 )
in_namespace = in_namespace.left( pos + 2 );
else
diff --git a/dcop/dcopidl2cpp/main.cpp b/dcop/dcopidl2cpp/main.cpp
index c0fb786c8..5e0f27525 100644
--- a/dcop/dcopidl2cpp/main.cpp
+++ b/dcop/dcopidl2cpp/main.cpp
@@ -104,11 +104,11 @@ int main( int argc, char** argv )
TQString base( argv[argpos] );
TQString idl = base;
- int pos = base.tqfindRev( '.' );
+ int pos = base.findRev( '.' );
if ( pos != -1 )
base = base.left( pos );
- pos = idl.tqfindRev('/');
+ pos = idl.findRev('/');
if ( pos != -1 )
idl = idl.mid( pos+1 );
@@ -118,7 +118,7 @@ int main( int argc, char** argv )
if ( generate_stub ) {
TQString header = base;
generateStub( idl, header + "_stub.h", de );
- pos = header.tqfindRev('/');
+ pos = header.findRev('/');
if ( pos != -1 )
header = header.mid( pos+1 );
generateStubImpl( idl, header + "_stub.h", base+".h", base + "_stub." + suffix, de);
diff --git a/dcop/dcopidl2cpp/skel.cpp b/dcop/dcopidl2cpp/skel.cpp
index 7c26e5647..5cc30de3e 100644
--- a/dcop/dcopidl2cpp/skel.cpp
+++ b/dcop/dcopidl2cpp/skel.cpp
@@ -177,7 +177,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
TQString namespace_tmp = className;
str << endl;
for(;;) {
- int pos = namespace_tmp.tqfind( "::" );
+ int pos = namespace_tmp.find( "::" );
if( pos < 0 ) {
className = namespace_tmp;
break;
@@ -223,7 +223,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
str << "\t fdict->insert( " << className << "_ftable[i][1], new int( i ) );" << endl;
str << " }" << endl;
- str << " int* fp = fdict->tqfind( fun );" << endl;
+ str << " int* fp = fdict->find( fun );" << endl;
str << " switch ( fp?*fp:-1) {" << endl;
}
s = n.nextSibling().toElement();
diff --git a/dcop/dcopidl2cpp/stub.cpp b/dcop/dcopidl2cpp/stub.cpp
index 5191abde8..887945262 100644
--- a/dcop/dcopidl2cpp/stub.cpp
+++ b/dcop/dcopidl2cpp/stub.cpp
@@ -54,7 +54,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
str << endl;
TQString ifdefstring = idl.upper();
- int pos = idl.tqfindRev( '.' );
+ int pos = idl.findRev( '.' );
if ( pos != -1 )
ifdefstring = ifdefstring.left( pos );
@@ -107,13 +107,13 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
}
if( DCOPParent != "DCOPObject" ) { // we need to include the .h file for the base stub
- if( all_includes.tqcontains( DCOPParent + ".h" ))
+ if( all_includes.contains( DCOPParent + ".h" ))
str << "#include <" << DCOPParent << "_stub.h>" << endl;
- else if( all_includes.tqcontains( DCOPParent.lower() + ".h" ))
+ else if( all_includes.contains( DCOPParent.lower() + ".h" ))
str << "#include <" << DCOPParent.lower() << "_stub.h>" << endl;
else {// damn ... let's assume it's the last include
TQString stub_h = all_includes.last();
- unsigned int pos = stub_h.tqfind( ".h" );
+ unsigned int pos = stub_h.find( ".h" );
if( pos > 0 ) {
stub_h = stub_h.remove( pos, 100000 );
str << "#include <" << stub_h << "_stub.h>" << endl;
@@ -128,7 +128,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
int namespace_count = 0;
TQString namespace_tmp = className;
for(;;) {
- int pos = namespace_tmp.tqfind( "::" );
+ int pos = namespace_tmp.find( "::" );
if( pos < 0 ) {
className = namespace_tmp;
break;
diff --git a/dcop/dcopidl2cpp/stubimpl.cpp b/dcop/dcopidl2cpp/stubimpl.cpp
index 7e9990e61..5cdd2a00d 100644
--- a/dcop/dcopidl2cpp/stubimpl.cpp
+++ b/dcop/dcopidl2cpp/stubimpl.cpp
@@ -98,7 +98,7 @@ void generateStubImpl( const TQString& idl, const TQString& header, const TQStri
TQString namespace_tmp = className_stub;
str << endl;
for(;;) {
- int pos = namespace_tmp.tqfind( "::" );
+ int pos = namespace_tmp.find( "::" );
if( pos < 0 ) {
className_stub = namespace_tmp;
break;
diff --git a/dcop/dcopobject.cpp b/dcop/dcopobject.cpp
index 348f13d4a..f02d07325 100644
--- a/dcop/dcopobject.cpp
+++ b/dcop/dcopobject.cpp
@@ -116,7 +116,7 @@ TQCString DCOPObject::objId() const
bool DCOPObject::hasObject(const TQCString &_objId)
{
- if (objMap()->tqcontains(_objId))
+ if (objMap()->contains(_objId))
return true;
else
return false;
diff --git a/dcop/dcopref.cpp b/dcop/dcopref.cpp
index c446eb0ee..bb39c109b 100644
--- a/dcop/dcopref.cpp
+++ b/dcop/dcopref.cpp
@@ -62,9 +62,9 @@ DCOPReply DCOPRef::callInternal( const TQCString& fun, const TQCString& args, co
return reply;
}
TQCString sig = fun;
- if ( fun.tqfind('(') == -1 ) {
+ if ( fun.find('(') == -1 ) {
sig += args;
- if( args.tqfind( "<unknown" ) != -1 )
+ if( args.find( "<unknown" ) != -1 )
qWarning("DCOPRef: unknown type error "
"<\"%s\",\"%s\">::call(\"%s\",%s",
STR(m_app), STR(m_obj), STR(fun), args.data()+1 );
@@ -87,9 +87,9 @@ bool DCOPRef::sendInternal( const TQCString& fun, const TQCString& args, const T
}
Q_UNUSED( data );
TQCString sig = fun;
- if ( fun.tqfind('(') == -1 ) {
+ if ( fun.find('(') == -1 ) {
sig += args;
- if( args.tqfind( "<unknown" ) != -1 )
+ if( args.find( "<unknown" ) != -1 )
qWarning("DCOPRef: unknown type error "
"<\"%s\",\"%s\">::send(\"%s\",%s",
STR(m_app), STR(m_obj), STR(fun), args.data()+1 );
diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp
index c78664f9a..8da59df04 100644
--- a/dcop/dcopserver.cpp
+++ b/dcop/dcopserver.cpp
@@ -320,7 +320,7 @@ void DCOPServer::slotOutputReady(int socket)
qWarning("DCOPServer: slotOutputReady fd = %d", socket);
#endif
// Find out connection.
- DCOPConnection *conn = fd_clients.tqfind(socket);
+ DCOPConnection *conn = fd_clients.find(socket);
//assert(conn);
//assert(conn->outputBlocked);
//assert(conn->socket() == socket);
@@ -711,7 +711,7 @@ void DCOPProcessMessage( IceConn iceConn, IcePointer /*clientData*/,
void DCOPServer::processMessage( IceConn iceConn, int opcode,
unsigned long length, Bool /*swap*/)
{
- DCOPConnection* conn = clients.tqfind( iceConn );
+ DCOPConnection* conn = clients.find( iceConn );
if ( !conn ) {
qWarning("DCOPServer::processMessage message from unknown connection. [opcode = %d]", opcode);
return;
@@ -1110,7 +1110,7 @@ DCOPConnection* DCOPServer::findApp( const TQCString& appId )
{
if ( appId.isNull() )
return 0;
- DCOPConnection* conn = appIds.tqfind( appId );
+ DCOPConnection* conn = appIds.find( appId );
return conn;
}
@@ -1205,7 +1205,7 @@ void DCOPServer::removeConnection( void* data )
while (!conn->waitingForReply.isEmpty()) {
IceConn iceConn = conn->waitingForReply.take(0);
if (iceConn) {
- DCOPConnection* target = clients.tqfind( iceConn );
+ DCOPConnection* target = clients.find( iceConn );
qWarning("DCOP aborting call from '%s' to '%s'", target ? target->appId.data() : "<unknown>" , conn->appId.data() );
TQByteArray reply;
DCOPMsg *pMsg;
@@ -1227,7 +1227,7 @@ void DCOPServer::removeConnection( void* data )
while (!conn->waitingForDelayedReply.isEmpty()) {
IceConn iceConn = conn->waitingForDelayedReply.take(0);
if (iceConn) {
- DCOPConnection* target = clients.tqfind( iceConn );
+ DCOPConnection* target = clients.find( iceConn );
qWarning("DCOP aborting (delayed) call from '%s' to '%s'", target ? target->appId.data() : "<unknown>", conn->appId.data() );
TQByteArray reply;
DCOPMsg *pMsg;
@@ -1248,7 +1248,7 @@ void DCOPServer::removeConnection( void* data )
{
IceConn iceConn = conn->waitingOnReply.take(0);
if (iceConn) {
- DCOPConnection* target = clients.tqfind( iceConn );
+ DCOPConnection* target = clients.find( iceConn );
if (!target)
{
qWarning("DCOP Error: still waiting for answer from non-existing client.");
@@ -1360,7 +1360,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
if ( obj == "emit")
{
- DCOPConnection* conn = clients.tqfind( iceConn );
+ DCOPConnection* conn = clients.find( iceConn );
if (conn) {
//qDebug("DCOPServer: %s emits %s", conn->appId.data(), fun.data());
dcopSignals->emitSignal(conn, fun, data, false);
@@ -1377,7 +1377,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
daemon = static_cast<bool>( iDaemon );
- DCOPConnection* conn = clients.tqfind( iceConn );
+ DCOPConnection* conn = clients.find( iceConn );
if ( conn && !conn->appId.isNull() ) {
if ( daemon ) {
if ( !conn->daemon )
@@ -1415,10 +1415,10 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
if (!args.atEnd()) {
TQCString app2 = readQCString(args);
TQDataStream reply( replyData, IO_WriteOnly );
- DCOPConnection* conn = clients.tqfind( iceConn );
+ DCOPConnection* conn = clients.find( iceConn );
if ( conn && !app2.isEmpty() ) {
if ( !conn->appId.isNull() &&
- appIds.tqfind( conn->appId ) == conn ) {
+ appIds.find( conn->appId ) == conn ) {
appIds.remove( conn->appId );
}
@@ -1441,7 +1441,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
#endif
conn->appId = app2;
- if ( appIds.tqfind( app2 ) != 0 ) {
+ if ( appIds.find( app2 ) != 0 ) {
// we already have this application, unify
int n = 1;
TQCString tmp;
@@ -1450,12 +1450,12 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
tmp.setNum( n );
tmp.prepend("-");
tmp.prepend( app2 );
- } while ( appIds.tqfind( tmp ) != 0 );
+ } while ( appIds.find( tmp ) != 0 );
conn->appId = tmp;
}
appIds.insert( conn->appId, conn );
- int c = conn->appId.tqfind( '-' );
+ int c = conn->appId.find( '-' );
if ( c > 0 )
conn->plainAppId = conn->appId.left( c );
else
@@ -1497,7 +1497,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
if (!args.atEnd()) {
TQ_INT8 notifyActive;
args >> notifyActive;
- DCOPConnection* conn = clients.tqfind( iceConn );
+ DCOPConnection* conn = clients.find( iceConn );
if ( conn ) {
if ( notifyActive )
conn->notifyRegister++;
@@ -1508,7 +1508,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
return true;
}
} else if ( fun == "connectSignal(TQCString,TQCString,TQCString,TQCString,TQCString,bool)") {
- DCOPConnection* conn = clients.tqfind( iceConn );
+ DCOPConnection* conn = clients.find( iceConn );
if (!conn) return false;
TQDataStream args(data, IO_ReadOnly );
if (args.atEnd()) return false;
@@ -1528,7 +1528,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
reply << (TQ_INT8) (b?1:0);
return true;
} else if ( fun == "disconnectSignal(TQCString,TQCString,TQCString,TQCString,TQCString)") {
- DCOPConnection* conn = clients.tqfind( iceConn );
+ DCOPConnection* conn = clients.find( iceConn );
if (!conn) return false;
TQDataStream args(data, IO_ReadOnly );
if (args.atEnd()) return false;
@@ -1623,7 +1623,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false)
TQCString contents( size+1 );
bool ok = f.readBlock( contents.data(), size ) == size;
contents[size] = '\0';
- int pos = contents.tqfind('\n');
+ int pos = contents.find('\n');
ok = ok && ( pos != -1 );
pid_t pid = ok ? contents.mid(pos+1).toUInt(&ok) : 0;
f.close();
diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h
index 0a5d96f0e..f5d0ea9f0 100644
--- a/dcop/dcopserver.h
+++ b/dcop/dcopserver.h
@@ -130,7 +130,7 @@ public:
DCOPConnection *findApp(const TQCString &appId);
DCOPConnection *findConn(IceConn iceConn)
- { return clients.tqfind(iceConn); }
+ { return clients.find(iceConn); }
void sendMessage(DCOPConnection *conn, const TQCString &sApp,
const TQCString &rApp, const TQCString &rObj,
diff --git a/dcop/dcopsignals.cpp b/dcop/dcopsignals.cpp
index 1e0eee354..437051a55 100644
--- a/dcop/dcopsignals.cpp
+++ b/dcop/dcopsignals.cpp
@@ -39,14 +39,14 @@ DCOPSignals::emitSignal( DCOPConnection *conn, const TQCString &_fun, const TQBy
{
TQCString senderObj;
TQCString fun = _fun;
- int i = fun.tqfind('#');
+ int i = fun.find('#');
if (i > -1)
{
senderObj = fun.left(i);
fun = fun.mid(i+1);
}
- DCOPSignalConnectionList *list = connections.tqfind(fun);
+ DCOPSignalConnectionList *list = connections.find(fun);
if (!list) return;
for(DCOPSignalConnection *current = list->first(); current; current = list->next())
{
@@ -102,16 +102,16 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj,
// TODO: Check if signal and slot match
TQCString signalArgs, slotArgs;
int i,j;
- i = signal.tqfind('(');
+ i = signal.find('(');
if (i < 0) return false;
signalArgs = signal.mid(i+1);
- j = signalArgs.tqfind(')');
+ j = signalArgs.find(')');
if (j < 0) return false;
signalArgs.truncate(j);
- i = slot.tqfind('(');
+ i = slot.find('(');
if (i < 0) return false;
slotArgs = slot.mid(i+1);
- j = slotArgs.tqfind(')');
+ j = slotArgs.find(')');
if (j < 0) return false;
slotArgs.truncate(j);
@@ -142,7 +142,7 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj,
current->recvObj = receiverObj;
current->slot = slot;
- DCOPSignalConnectionList *list = connections.tqfind(signal);
+ DCOPSignalConnectionList *list = connections.find(signal);
if (!list)
{
list = new DCOPSignalConnectionList;
@@ -177,7 +177,7 @@ DCOPSignals::disconnectSignal( const TQCString &sender, const TQCString &senderO
return true;
}
- DCOPSignalConnectionList *list = connections.tqfind(signal);
+ DCOPSignalConnectionList *list = connections.find(signal);
if (!list)
return false; // Not found...
@@ -255,7 +255,7 @@ DCOPSignals::removeConnections(DCOPConnection *conn, const TQCString &obj)
if (current->recvConn != conn)
current->recvConn->signalConnectionList()->removeRef(current);
- DCOPSignalConnectionList *signalList = connections.tqfind(current->signal);
+ DCOPSignalConnectionList *signalList = connections.find(current->signal);
if (signalList)
{
signalList->removeRef(current);