From f7e71d47719ab6094cf4a9fafffa5ea351973522 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 13 Jan 2011 08:32:36 +0000 Subject: Initial conversion for TQt for Qt4 3.4.0 TP2 This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- dcop/KDE-ICE/ICEmsg.h | 4 +- dcop/client/dcop.cpp | 32 +++++------ dcop/client/dcopfind.cpp | 10 ++-- dcop/client/dcopstart.cpp | 2 +- dcop/client/marshall.cpp | 40 +++++++------- dcop/dcopclient.cpp | 124 +++++++++++++++++++++--------------------- dcop/dcopclient.h | 7 ++- dcop/dcopidl/main.cpp | 2 +- dcop/dcopidl/scanner.cc | 4 +- dcop/dcopidl/scanner.ll | 1 + dcop/dcopidl/yacc.cc | 2 +- dcop/dcopidl/yacc.yy | 2 +- dcop/dcopidl2cpp/main.cpp | 6 +- dcop/dcopidl2cpp/skel.cpp | 4 +- dcop/dcopidl2cpp/stub.cpp | 10 ++-- dcop/dcopidl2cpp/stubimpl.cpp | 2 +- dcop/dcopobject.cpp | 6 +- dcop/dcopref.cpp | 8 +-- dcop/dcopref.h | 2 +- dcop/dcopserver.cpp | 56 +++++++++---------- dcop/dcopserver.h | 6 +- dcop/dcopsignals.cpp | 18 +++--- dcop/kdatastream.h | 12 ++-- dcop/testdcop.h | 4 +- 24 files changed, 183 insertions(+), 181 deletions(-) (limited to 'dcop') diff --git a/dcop/KDE-ICE/ICEmsg.h b/dcop/KDE-ICE/ICEmsg.h index cf4d98975..666d776b6 100644 --- a/dcop/KDE-ICE/ICEmsg.h +++ b/dcop/KDE-ICE/ICEmsg.h @@ -221,7 +221,7 @@ extern void _IceErrorBadValue ( /* - * Write pad bytes. Used to force 32 or 64 bit alignment. + * Write pad bytes. Used to force 32 or 64 bit tqalignment. * A maxium of 7 pad bytes can be specified. */ @@ -306,7 +306,7 @@ extern void _IceErrorBadValue ( /* - * Read pad bytes (for 32 or 64 bit alignment). + * Read pad bytes (for 32 or 64 bit tqalignment). * A maxium of 7 pad bytes can be specified. */ diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp index 1d167ce70..a76610505 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(partl.count()) && intTypes.contains(partl[s])) + while (s < static_cast(partl.count()) && intTypes.tqcontains(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 ].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 ); @@ -861,7 +861,7 @@ int main( int argc, char** argv ) if (prog[prog.length()-1] != '*') { // Strip a trailing - part. - int i = prog.findRev('-'); + int i = prog.tqfindRev('-'); 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 cd3e4d517..0cc48c435 100644 --- a/dcop/client/dcopfind.cpp +++ b/dcop/client/dcopfind.cpp @@ -40,9 +40,9 @@ static bool bLaunchApp = 0; bool findObject( const char* app, const char* obj, const char* func, 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 ) { @@ -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.find(' '); + int s = lt.tqfind(' '); // 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.contains(partl[s])) + while (s < (int)partl.count() && intTypes.tqcontains(partl[s])) { s++; } diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp index 5741ef775..f46531735 100644 --- a/dcop/client/dcopstart.cpp +++ b/dcop/client/dcopstart.cpp @@ -33,7 +33,7 @@ static DCOPClient* dcop = 0; void startApp(const char *_app, int argc, const char **args) { const char *function = 0; - TQString app = TQString::fromLatin1(_app); + TQString app = TQString::tqfromLatin1(_app); if (app.endsWith(".desktop")) function = "start_service_by_desktop_path(TQString,TQStringList)"; else diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp index f9b7955f2..496880aad 100644 --- a/dcop/client/marshall.cpp +++ b/dcop/client/marshall.cpp @@ -102,12 +102,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) { TQCString result; - if ( type == "int" || type == "Q_INT32" ) + if ( type == "int" || type == "TQ_INT32" ) { int i; stream >> i; result.setNum( i ); - } else if ( type == "uint" || type == "Q_UINT32" || type == "unsigned int" ) + } else if ( type == "uint" || type == "TQ_UINT32" || type == "unsigned int" ) { uint i; stream >> i; @@ -132,12 +132,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) double d; stream >> d; result.setNum( d, 'f' ); - } else if ( type == "Q_INT64" ) { - Q_INT64 i; + } else if ( type == "TQ_INT64" ) { + TQ_INT64 i; stream >> i; result.sprintf( "%lld", i ); - } else if ( type == "Q_UINT64" ) { - Q_UINT64 i; + } else if ( type == "TQ_UINT64" ) { + TQ_UINT64 i; stream >> i; result.sprintf( "%llu", i ); } else if ( type == "bool" ) @@ -163,7 +163,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) { TQColor c; stream >> c; - result = c.name().local8Bit(); + result = TQString(c.name()).local8Bit(); } else if ( type == "TQSize" ) { TQSize s; @@ -190,7 +190,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() ); } else if ( type == "TQVariant" ) { - Q_INT32 type; + TQ_INT32 type; stream >> type; return demarshal( stream, TQVariant::typeToName( (TQVariant::Type)type ) ); } else if ( type == "DCOPRef" ) @@ -205,7 +205,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) result = r.url().local8Bit(); } else if ( type.left( 11 ) == "TQValueList<" ) { - if ( (uint)type.find( '>', 11 ) != type.length() - 1 ) + if ( (uint)type.tqfind( '>', 11 ) != type.length() - 1 ) return result; TQString nestedType = type.mid( 11, type.length() - 12 ); @@ -213,10 +213,10 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) if ( nestedType.isEmpty() ) return result; - Q_UINT32 count; + TQ_UINT32 count; stream >> count; - Q_UINT32 i = 0; + TQ_UINT32 i = 0; for (; i < count; ++i ) { TQCString arg = demarshal( stream, nestedType ); @@ -227,21 +227,21 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) } } else if ( type.left( 5 ) == "TQMap<" ) { - int commaPos = type.find( ',', 5 ); + int commaPos = type.tqfind( ',', 5 ); if ( commaPos == -1 ) return result; - if ( (uint)type.find( '>', commaPos ) != type.length() - 1 ) + if ( (uint)type.tqfind( '>', commaPos ) != type.length() - 1 ) return result; TQString keyType = type.mid( 5, commaPos - 5 ); TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 ); - Q_UINT32 count; + TQ_UINT32 count; stream >> count; - Q_UINT32 i = 0; + TQ_UINT32 i = 0; for (; i < count; ++i ) { TQCString key = demarshal( stream, keyType ); @@ -291,15 +291,15 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) arg << s.toUInt(); else if ( type == "unsigned int" ) arg << s.toUInt(); - else if ( type == "Q_INT32" ) + else if ( type == "TQ_INT32" ) arg << s.toInt(); - else if ( type == "Q_INT64" ) { + else if ( type == "TQ_INT64" ) { TQVariant qv = TQVariant( s ); arg << qv.toLongLong(); } - else if ( type == "Q_UINT32" ) + else if ( type == "TQ_UINT32" ) arg << s.toUInt(); - else if ( type == "Q_UINT64" ) { + else if ( type == "TQ_UINT64" ) { TQVariant qv = TQVariant( s ); arg << qv.toULongLong(); } @@ -376,7 +376,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) marshall( dummy_arg, args, j, type ); count++; } - arg << (Q_UINT32) count; + arg << (TQ_UINT32) count; // Parse the list for real while (true) { if( i > args.count() ) diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index 8006ecd52..8f4b7ce15 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()->find(_appId.data()); + return cliMap()->tqfind(_appId.data()); } static void registerLocalClient( const TQCString &_appId, DCOPClient *client ) { - cliMap()->replace(_appId.data(), client); + cliMap()->tqreplace(_appId.data(), client); } static @@ -141,7 +141,7 @@ public: TQCString* replyType; TQByteArray* replyData; int replyId; - Q_INT32 transactionId; + TQ_INT32 transactionId; TQCString calledApp; TQGuardedPtr replyObject; TQCString replySlot; @@ -173,7 +173,7 @@ public: TQCString defaultObject; TQPtrList *transactionList; bool transaction; - Q_INT32 transactionId; + TQ_INT32 transactionId; int opcode; // Special key values: @@ -205,7 +205,7 @@ public: class DCOPClientTransaction { public: - Q_INT32 id; + TQ_INT32 id; CARD32 key; TQCString senderId; }; @@ -263,12 +263,12 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old) disp = "NODISPLAY"; int i; - if((i = disp.findRev('.')) > disp.findRev(KPATH_SEPARATOR) && i >= 0) + if((i = disp.tqfindRev('.')) > disp.tqfindRev(KPATH_SEPARATOR) && i >= 0) disp.truncate(i); if (!old) { - while( (i = disp.find(KPATH_SEPARATOR)) >= 0) + while( (i = disp.tqfind(KPATH_SEPARATOR)) >= 0) disp[i] = '_'; } @@ -382,7 +382,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject, case DCOPReplyWait: if ( replyStruct ) { TQCString calledApp, app; - Q_INT32 id; + TQ_INT32 id; TQDataStream ds( dataReceived, IO_ReadOnly ); ds >> calledApp >> app >> id; replyStruct->transactionId = id; @@ -398,7 +398,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject, { TQDataStream ds( dataReceived, IO_ReadOnly ); TQCString calledApp, app; - Q_INT32 id; + TQ_INT32 id; ds >> calledApp >> app >> id; if (replyStruct && (id == replyStruct->transactionId) && (calledApp == replyStruct->calledApp)) @@ -531,7 +531,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ TQByteArray reply; TQDataStream replyStream( reply, IO_WriteOnly ); - Q_INT32 id = c->transactionId(); + TQ_INT32 id = c->transactionId(); if (id) { // Call delayed. Send back the transaction ID. replyStream << d->appId << fromApp << id; @@ -672,9 +672,9 @@ bool DCOPClient::attach() void DCOPClient::bindToApp() { - // check if we have a qApp instantiated. If we do, + // check if we have a tqApp instantiated. If we do, // we can create a TQSocketNotifier and use it for receiving data. - if (qApp) { + if (tqApp) { if ( d->notifier ) delete d->notifier; d->notifier = new TQSocketNotifier(socket(), @@ -690,7 +690,7 @@ void DCOPClient::suspend() if (!d->notifier) return; #endif - assert(d->notifier); // Suspending makes no sense if we didn't had a qApp yet + assert(d->notifier); // Suspending makes no sense if we didn't had a tqApp yet d->notifier->setEnabled(false); } @@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) DCOPAuthCount, const_cast(DCOPAuthNames), DCOPClientAuthProcs, 0L)) < 0) { - emit attachFailed(TQString::fromLatin1( "Communications could not be established." )); + emit attachFailed(TQString::tqfromLatin1( "Communications could not be established." )); return false; } @@ -779,7 +779,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) TQCString fName = dcopServerFile(); TQFile f(TQFile::decodeName(fName)); if (!f.open(IO_ReadOnly)) { - emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName)); + emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName)); return false; } int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file @@ -790,7 +790,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) // Should we abort ? } contents[size] = '\0'; - int pos = contents.find('\n'); + int pos = contents.tqfind('\n'); if ( pos == -1 ) // Shouldn't happen { qDebug("Only one line in dcopserver file !: %s", contents.data()); @@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) delete [] d->serverAddr; d->serverAddr = 0; } - emit attachFailed(TQString::fromLatin1( errBuf )); + emit attachFailed(TQString::tqfromLatin1( errBuf )); return false; } fcntl(socket(), F_SETFL, FD_CLOEXEC); @@ -845,7 +845,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) delete [] d->serverAddr; d->serverAddr = 0; } - emit attachFailed(TQString::fromLatin1( errBuf )); + emit attachFailed(TQString::tqfromLatin1( errBuf )); return false; } else if (setupstat == IceProtocolAlreadyActive) { if (bClearServerAddr) { @@ -853,7 +853,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) d->serverAddr = 0; } /* should not happen because 3rd arg to IceOpenConnection was 0. */ - emit attachFailed(TQString::fromLatin1( "internal error in IceOpenConnection" )); + emit attachFailed(TQString::tqfromLatin1( "internal error in IceOpenConnection" )); return false; } @@ -863,7 +863,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) delete [] d->serverAddr; d->serverAddr = 0; } - emit attachFailed(TQString::fromLatin1( "DCOP server did not accept the connection." )); + emit attachFailed(TQString::tqfromLatin1( "DCOP server did not accept the connection." )); return false; } @@ -1017,7 +1017,7 @@ TQCString DCOPClient::normalizeFunctionSignature( const TQCString& fun ) { if ( fun.isEmpty() ) // nothing to do return fun.copy(); TQCString result( fun.size() ); - char *from = fun.data(); + char *from = const_cast(fun).data(); char *to = result.data(); char *first = to; char last = 0; @@ -1056,7 +1056,7 @@ bool DCOPClient::send(const TQCString &remApp, const TQCString &remObjId, if ( localClient ) { bool saveTransaction = d->transaction; - Q_INT32 saveTransactionId = d->transactionId; + TQ_INT32 saveTransactionId = d->transactionId; TQCString saveSenderId = d->senderId; d->senderId = 0; // Local call @@ -1167,13 +1167,13 @@ bool DCOPClient::findObject(const TQCString &remApp, const TQCString &remObj, if ( (phase == 1) && localClient ) { // In phase 1 we do all local clients bool saveTransaction = d->transaction; - Q_INT32 saveTransactionId = d->transactionId; + TQ_INT32 saveTransactionId = d->transactionId; TQCString saveSenderId = d->senderId; d->senderId = 0; // Local call result = localClient->find( remApp, remObj, remFun, data, replyType, replyData ); - Q_INT32 id = localClient->transactionId(); + TQ_INT32 id = localClient->transactionId(); if (id) { // Call delayed. We have to wait till it has been processed. do { @@ -1298,7 +1298,7 @@ void DCOPClient::setNotifications(bool enabled) { TQByteArray data; TQDataStream ds(data, IO_WriteOnly); - ds << static_cast(enabled); + ds << static_cast(enabled); TQCString replyType; TQByteArray reply; @@ -1310,7 +1310,7 @@ void DCOPClient::setDaemonMode( bool daemonMode ) { TQByteArray data; TQDataStream ds(data, IO_WriteOnly); - ds << static_cast( daemonMode ); + ds << static_cast( daemonMode ); TQCString replyType; TQByteArray reply; @@ -1331,9 +1331,9 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path ) path += '/'; int unnamed = 0; - const TQObjectList *list = o ? o->tqchildren() : TQObject::objectTrees(); - if ( list ) { - TQObjectListIt it( *list ); + const TQObjectList list = o ? o->childrenListObject() : TQObject::objectTreesListObject(); + if ( !list.isEmpty() ) { + TQObjectListIt it( list ); TQObject *obj; while ( (obj=it.current()) ) { ++it; @@ -1341,11 +1341,11 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path ) if ( n == "unnamed" || n.isEmpty() ) { n.sprintf("%p", (void *) obj); - n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1(); + n = TQString(TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n))).latin1(); } TQCString fn = path + n; l.append( fn ); - if ( obj->tqchildren() ) + if ( !obj->childrenListObject().isEmpty() ) fillQtObjects( l, obj, fn ); } } @@ -1368,9 +1368,9 @@ static void fillQtObjectsEx( TQValueList& l, TQObject* o, TQCString path ) path += '/'; int unnamed = 0; - const TQObjectList *list = o ? o->tqchildren() : TQObject::objectTrees(); - if ( list ) { - TQObjectListIt it( *list ); + const TQObjectList list = o ? o->childrenListObject() : TQObject::objectTreesListObject(); + if ( !list.isEmpty() ) { + TQObjectListIt it( list ); TQObject *obj; while ( (obj=it.current()) ) { ++it; @@ -1378,11 +1378,11 @@ static void fillQtObjectsEx( TQValueList& l, TQObject* o, TQCString path ) if ( n == "unnamed" || n.isEmpty() ) { n.sprintf("%p", (void *) obj); - n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1(); + n = TQString(TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n))).latin1(); } TQCString fn = path + n; l.append( O( fn, obj ) ); - if ( obj->tqchildren() ) + if ( !obj->childrenListObject().isEmpty() ) fillQtObjectsEx( l, obj, fn ); } } @@ -1399,7 +1399,7 @@ static TQObject* findQtObject( TQCString id ) for ( TQValueList::ConstIterator it = l.begin(); it != l.end(); ++it ) { if ( (*it).s == id ) // exact match return (*it).o; - if ( !firstContains && (*it).s.contains( expr ) ) { + if ( !firstContains && (*it).s.tqcontains( expr ) ) { firstContains = (*it).o; } } @@ -1413,7 +1413,7 @@ static QCStringList findQtObjects( TQCString id ) fillQtObjectsEx( l, 0, "qt" ); QCStringList result; for ( TQValueList::ConstIterator it = l.begin(); it != l.end(); ++it ) { - if ( (*it).s.contains( expr ) ) + if ( (*it).s.tqcontains( expr ) ) result << (*it).s; } return result; @@ -1470,10 +1470,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const l << "QCStringList properties()"; l << "bool setProperty(TQCString,TQVariant)"; l << "TQVariant property(TQCString)"; - TQStrList lst = o->metaObject()->slotNames( true ); + TQStrList lst = o->tqmetaObject()->slotNames( true ); int i = 0; for ( TQPtrListIterator it( lst ); it.current(); ++it ) { - if ( o->metaObject()->slot( i++, true )->tqaccess != QMetaData::Public ) + if ( o->tqmetaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public ) continue; TQCString slot = it.current(); if ( slot.contains( "()" ) ) { @@ -1487,10 +1487,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const replyType = "QCStringList"; TQDataStream reply( replyData, IO_WriteOnly ); QCStringList l; - TQMetaObject *meta = o->metaObject(); + TQMetaObject *meta = o->tqmetaObject(); while ( meta ) { l.prepend( meta->className() ); - meta = meta->superClass(); + meta = meta->tqsuperClass(); } reply << l; return true; @@ -1498,10 +1498,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const replyType = "QCStringList"; TQDataStream reply( replyData, IO_WriteOnly ); QCStringList l; - TQStrList lst = o->metaObject()->propertyNames( true ); + TQStrList lst = o->tqmetaObject()->propertyNames( true ); for ( TQPtrListIterator it( lst ); it.current(); ++it ) { - TQMetaObject *mo = o->metaObject(); - const TQMetaProperty* p = mo->property( mo->findProperty( it.current(), true ), true ); + TQMetaObject *mo = o->tqmetaObject(); + const TQMetaProperty* p = mo->property( mo->tqfindProperty( it.current(), true ), true ); if ( !p ) continue; TQCString prop = p->type(); @@ -1529,13 +1529,13 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const ds >> name >> value; replyType = "bool"; TQDataStream reply( replyData, IO_WriteOnly ); - reply << (Q_INT8) o->setProperty( name, value ); + reply << (TQ_INT8) o->setProperty( name, value ); return true; } else { - int slot = o->metaObject()->findSlot( fun, true ); + int slot = o->tqmetaObject()->tqfindSlot( fun, true ); if ( slot != -1 ) { replyType = "void"; - QUObject uo[ 1 ]; + TQUObject uo[ 1 ]; o->qt_invoke( slot, uo ); return true; } @@ -1656,7 +1656,7 @@ bool DCOPClient::receive(const TQCString &/*app*/, const TQCString &objId, // return true. Return false otherwise. static bool findResultOk(TQCString &replyType, TQByteArray &replyData) { - Q_INT8 success; // Tsk.. why is there no operator>>(bool)? + TQ_INT8 success; // Tsk.. why is there no operator>>(bool)? if (replyType != "bool") return false; TQDataStream reply( replyData, IO_ReadOnly ); @@ -1746,13 +1746,13 @@ bool DCOPClient::call(const TQCString &remApp, const TQCString &remObjId, if ( localClient ) { bool saveTransaction = d->transaction; - Q_INT32 saveTransactionId = d->transactionId; + TQ_INT32 saveTransactionId = d->transactionId; TQCString saveSenderId = d->senderId; d->senderId = 0; // Local call bool b = localClient->receive( remApp, remObjId, remFun, data, replyType, replyData ); - Q_INT32 id = localClient->transactionId(); + TQ_INT32 id = localClient->transactionId(); if (id) { // Call delayed. We have to wait till it has been processed. do { @@ -1882,7 +1882,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId for(;;) { bool checkMessages = true; if ( useEventLoop - ? d->notifier != NULL // useEventLoop needs a socket notifier and a qApp + ? d->notifier != NULL // useEventLoop needs a socket notifier and a tqApp : timeout >= 0 ) { // !useEventLoop doesn't block only for timeout >= 0 const int guiTimeout = 100; checkMessages = false; @@ -1907,7 +1907,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId } if( timeout >= 0 ) d->eventLoopTimer.start(time_left - guiTimeout, true); - qApp->enter_loop(); + tqApp->enter_loop(); d->eventLoopTimer.stop(); if ( !old_lock ) { d->non_blocking_call_lock = false; @@ -1974,7 +1974,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId // Wake up parent call, maybe it's reply is available already. if ( d->non_blocking_call_lock ) { - qApp->exit_loop(); + tqApp->exit_loop(); } d->currentKey = oldCurrentKey; @@ -1983,7 +1983,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId void DCOPClient::eventLoopTimeout() { - qApp->exit_loop(); + tqApp->exit_loop(); } void DCOPClient::processSocketData(int fd) @@ -2000,8 +2000,8 @@ void DCOPClient::processSocketData(int fd) return; if ( d->non_blocking_call_lock ) { - if( qApp ) - qApp->exit_loop(); + if( tqApp ) + tqApp->exit_loop(); return; } @@ -2034,7 +2034,7 @@ TQCString DCOPClient::defaultObject() const } bool -DCOPClient::isLocalTransactionFinished(Q_INT32 id, TQCString &replyType, TQByteArray &replyData) +DCOPClient::isLocalTransactionFinished(TQ_INT32 id, TQCString &replyType, TQByteArray &replyData) { DCOPClientPrivate::LocalTransactionResult *result = d->localTransActionList.take(id); if (!result) @@ -2068,7 +2068,7 @@ DCOPClient::beginTransaction() return trans; } -Q_INT32 +TQ_INT32 DCOPClient::transactionId() const { if (d->transaction) @@ -2147,7 +2147,7 @@ DCOPClient::connectDCOPSignal( const TQCString &sender, const TQCString &senderO { TQCString replyType; TQByteArray data, replyData; - Q_INT8 iVolatile = Volatile ? 1 : 0; + TQ_INT8 iVolatile = Volatile ? 1 : 0; TQDataStream args(data, IO_WriteOnly ); args << sender << senderObj << normalizeFunctionSignature(signal) << receiverObj << normalizeFunctionSignature(slot) << iVolatile; @@ -2163,7 +2163,7 @@ DCOPClient::connectDCOPSignal( const TQCString &sender, const TQCString &senderO return false; TQDataStream reply(replyData, IO_ReadOnly ); - Q_INT8 result; + TQ_INT8 result; reply >> result; return (result != 0); } @@ -2197,7 +2197,7 @@ DCOPClient::disconnectDCOPSignal( const TQCString &sender, const TQCString &send return false; TQDataStream reply(replyData, IO_ReadOnly ); - Q_INT8 result; + TQ_INT8 result; reply >> result; return (result != 0); } diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h index 41266c187..0575cd1ed 100644 --- a/dcop/dcopclient.h +++ b/dcop/dcopclient.h @@ -65,9 +65,10 @@ typedef TQValueList QCStringList; * @see KApplication::dcopClient() * @author Preston Brown , Matthias Ettrich */ -class DCOP_EXPORT DCOPClient : public QObject +class DCOP_EXPORT DCOPClient : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -511,7 +512,7 @@ class DCOP_EXPORT DCOPClient : public QObject * @see process() * @see beginTransaction() */ - Q_INT32 transactionId() const; + TQ_INT32 transactionId() const; /** * Checks whether @p remApp is registered with the DCOP server. @@ -816,7 +817,7 @@ public: private: - bool isLocalTransactionFinished(Q_INT32 id, TQCString &replyType, TQByteArray &replyData); + bool isLocalTransactionFinished(TQ_INT32 id, TQCString &replyType, TQByteArray &replyData); bool attachInternal( bool registerAsAnonymous = true ); diff --git a/dcop/dcopidl/main.cpp b/dcop/dcopidl/main.cpp index aa60e2c41..0cbb32a1e 100644 --- a/dcop/dcopidl/main.cpp +++ b/dcop/dcopidl/main.cpp @@ -47,7 +47,7 @@ int main( int argc, char** argv ) return -1; } - TQByteArray arr = file.readAll(); + TQByteArray arr = TQByteArray(file.readAll()); uint len = arr.size(); uint j = 1; for (uint i = 1; i]"), i); + int i = s.tqfind(TQRegExp("[\"<]"))+1; + int j = s.tqfind(TQRegExp("[\">]"), i); yylval._str = new TQString( s.mid( i, j - i ) ); idl_line_no++; return T_INCLUDE; diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll index 63e8ca59c..d9f870512 100644 --- a/dcop/dcopidl/scanner.ll +++ b/dcop/dcopidl/scanner.ll @@ -236,6 +236,7 @@ FALSE return T_FALSE; typedef return T_TYPEDEF; K_DCOP return T_DCOP; Q_OBJECT ; +TQ_OBJECT ; ("0"|"0L") return T_NULL; "extern "[A-Za-z0-9_ \t*]+ return T_EXTERN; "extern \"C\"" return T_EXTERN_C; diff --git a/dcop/dcopidl/yacc.cc b/dcop/dcopidl/yacc.cc index d41fa6dbd..1fbc4c0bd 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.findRev( "::", -3 ); + int pos = in_namespace.tqfindRev( "::", -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 ca22c65e1..7870eb6e9 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.findRev( "::", -3 ); + int pos = in_namespace.tqfindRev( "::", -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 5e0f27525..c0fb786c8 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.findRev( '.' ); + int pos = base.tqfindRev( '.' ); if ( pos != -1 ) base = base.left( pos ); - pos = idl.findRev('/'); + pos = idl.tqfindRev('/'); 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.findRev('/'); + pos = header.tqfindRev('/'); 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 5cc30de3e..7c26e5647 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.find( "::" ); + int pos = namespace_tmp.tqfind( "::" ); 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->find( fun );" << endl; + str << " int* fp = fdict->tqfind( 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 887945262..5191abde8 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.findRev( '.' ); + int pos = idl.tqfindRev( '.' ); 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.contains( DCOPParent + ".h" )) + if( all_includes.tqcontains( DCOPParent + ".h" )) str << "#include <" << DCOPParent << "_stub.h>" << endl; - else if( all_includes.contains( DCOPParent.lower() + ".h" )) + else if( all_includes.tqcontains( 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.find( ".h" ); + unsigned int pos = stub_h.tqfind( ".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.find( "::" ); + int pos = namespace_tmp.tqfind( "::" ); if( pos < 0 ) { className = namespace_tmp; break; diff --git a/dcop/dcopidl2cpp/stubimpl.cpp b/dcop/dcopidl2cpp/stubimpl.cpp index 5cdd2a00d..7e9990e61 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.find( "::" ); + int pos = namespace_tmp.tqfind( "::" ); if( pos < 0 ) { className_stub = namespace_tmp; break; diff --git a/dcop/dcopobject.cpp b/dcop/dcopobject.cpp index fd39fb347..348f13d4a 100644 --- a/dcop/dcopobject.cpp +++ b/dcop/dcopobject.cpp @@ -58,7 +58,7 @@ DCOPObject::DCOPObject(TQObject *obj) while (currentObj != 0L) { ident.prepend( currentObj->name() ); ident.prepend("/"); - currentObj = currentObj->parent(); + currentObj = TQT_TQOBJECT(currentObj->parent()); } if ( ident[0] == '/' ) ident = ident.mid(1); @@ -116,7 +116,7 @@ TQCString DCOPObject::objId() const bool DCOPObject::hasObject(const TQCString &_objId) { - if (objMap()->contains(_objId)) + if (objMap()->tqcontains(_objId)) return true; else return false; @@ -155,7 +155,7 @@ TQCString DCOPObject::objectName( TQObject* obj ) { identity.prepend( currentObj->name() ); identity.prepend("/"); - currentObj = currentObj->parent(); + currentObj = TQT_TQOBJECT(currentObj->parent()); } if ( identity[0] == '/' ) identity = identity.mid(1); diff --git a/dcop/dcopref.cpp b/dcop/dcopref.cpp index bb39c109b..c446eb0ee 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.find('(') == -1 ) { + if ( fun.tqfind('(') == -1 ) { sig += args; - if( args.find( "::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.find('(') == -1 ) { + if ( fun.tqfind('(') == -1 ) { sig += args; - if( args.find( "::send(\"%s\",%s", STR(m_app), STR(m_obj), STR(fun), args.data()+1 ); diff --git a/dcop/dcopref.h b/dcop/dcopref.h index 92cb921bb..c7fa69822 100644 --- a/dcop/dcopref.h +++ b/dcop/dcopref.h @@ -396,7 +396,7 @@ public: * Flag for allowing entering the event loop if the call blocks too long. * @p NoEventLoop disables entering the event loop. * @p UseEventLoop allows entering the event loop while waiting for long - * blocking DCOP call, thus making the GUI repaint if needed, and possibly + * blocking DCOP call, thus making the GUI tqrepaint if needed, and possibly * allowing also other code in the application to be executed. * @see DCOPClient::call() */ diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp index 41a639b2e..b8994f699 100644 --- a/dcop/dcopserver.cpp +++ b/dcop/dcopserver.cpp @@ -124,9 +124,9 @@ void DCOPIceWriteChar(register IceConn iceConn, unsigned long nbytes, char *ptr) static TQCString readQCString(TQDataStream &ds) { TQCString result; - Q_UINT32 len; + TQ_UINT32 len; ds >> len; - TQIODevice *device = ds.device(); + TQIODevice *device = ds.tqdevice(); int bytesLeft = device->size()-device->at(); if ((bytesLeft < 0 ) || (len > (uint) bytesLeft)) { @@ -142,9 +142,9 @@ static TQCString readQCString(TQDataStream &ds) static TQByteArray readQByteArray(TQDataStream &ds) { TQByteArray result; - Q_UINT32 len; + TQ_UINT32 len; ds >> len; - TQIODevice *device = ds.device(); + TQIODevice *device = ds.tqdevice(); int bytesLeft = device->size()-device->at(); if ((bytesLeft < 0 ) || (len > (uint) bytesLeft)) { @@ -287,7 +287,7 @@ qWarning("DCOPServer: DCOPIceWrite() outputBlocked. Queuing %d bytes.", _data.si // assert(conn->outputBuffer.isEmpty()); } - unsigned long nleft = writeIceData(iceConn, _data.size(), _data.data()); + unsigned long nleft = writeIceData(iceConn, _data.size(), const_cast(_data).data()); if ((nleft > 0) && conn) { conn->waitForOutputReady(_data, _data.size() - nleft); @@ -319,7 +319,7 @@ void DCOPServer::slotOutputReady(int socket) qWarning("DCOPServer: slotOutputReady fd = %d", socket); #endif // Find out connection. - DCOPConnection *conn = fd_clients.find(socket); + DCOPConnection *conn = fd_clients.tqfind(socket); //assert(conn); //assert(conn->outputBlocked); //assert(conn->socket() == socket); @@ -396,7 +396,7 @@ qWarning("DCOPServer: Flushing data, fd = %d", IceConnectionNumber(_iceConn)); DCOPIceWrite(_iceConn, _data); } -class DCOPListener : public QSocketNotifier +class DCOPListener : public TQSocketNotifier { public: DCOPListener( IceListenObj obj ) @@ -710,7 +710,7 @@ void DCOPProcessMessage( IceConn iceConn, IcePointer /*clientData*/, void DCOPServer::processMessage( IceConn iceConn, int opcode, unsigned long length, Bool /*swap*/) { - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if ( !conn ) { qWarning("DCOPServer::processMessage message from unknown connection. [opcode = %d]", opcode); return; @@ -1109,7 +1109,7 @@ DCOPConnection* DCOPServer::findApp( const TQCString& appId ) { if ( appId.isNull() ) return 0; - DCOPConnection* conn = appIds.find( appId ); + DCOPConnection* conn = appIds.tqfind( appId ); return conn; } @@ -1204,7 +1204,7 @@ void DCOPServer::removeConnection( void* data ) while (!conn->waitingForReply.isEmpty()) { IceConn iceConn = conn->waitingForReply.take(0); if (iceConn) { - DCOPConnection* target = clients.find( iceConn ); + DCOPConnection* target = clients.tqfind( iceConn ); qWarning("DCOP aborting call from '%s' to '%s'", target ? target->appId.data() : "" , conn->appId.data() ); TQByteArray reply; DCOPMsg *pMsg; @@ -1226,7 +1226,7 @@ void DCOPServer::removeConnection( void* data ) while (!conn->waitingForDelayedReply.isEmpty()) { IceConn iceConn = conn->waitingForDelayedReply.take(0); if (iceConn) { - DCOPConnection* target = clients.find( iceConn ); + DCOPConnection* target = clients.tqfind( iceConn ); qWarning("DCOP aborting (delayed) call from '%s' to '%s'", target ? target->appId.data() : "", conn->appId.data() ); TQByteArray reply; DCOPMsg *pMsg; @@ -1247,7 +1247,7 @@ void DCOPServer::removeConnection( void* data ) { IceConn iceConn = conn->waitingOnReply.take(0); if (iceConn) { - DCOPConnection* target = clients.find( iceConn ); + DCOPConnection* target = clients.tqfind( iceConn ); if (!target) { qWarning("DCOP Error: still waiting for answer from non-existing client."); @@ -1359,7 +1359,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, if ( obj == "emit") { - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if (conn) { //qDebug("DCOPServer: %s emits %s", conn->appId.data(), fun.data()); dcopSignals->emitSignal(conn, fun, data, false); @@ -1370,13 +1370,13 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, if ( fun == "setDaemonMode(bool)" ) { TQDataStream args( data, IO_ReadOnly ); if ( !args.atEnd() ) { - Q_INT8 iDaemon; + TQ_INT8 iDaemon; bool daemon; args >> iDaemon; daemon = static_cast( iDaemon ); - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if ( conn && !conn->appId.isNull() ) { if ( daemon ) { if ( !conn->daemon ) @@ -1414,10 +1414,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.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if ( conn && !app2.isEmpty() ) { if ( !conn->appId.isNull() && - appIds.find( conn->appId ) == conn ) { + appIds.tqfind( conn->appId ) == conn ) { appIds.remove( conn->appId ); } @@ -1440,7 +1440,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, #endif conn->appId = app2; - if ( appIds.find( app2 ) != 0 ) { + if ( appIds.tqfind( app2 ) != 0 ) { // we already have this application, unify int n = 1; TQCString tmp; @@ -1449,12 +1449,12 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, tmp.setNum( n ); tmp.prepend("-"); tmp.prepend( app2 ); - } while ( appIds.find( tmp ) != 0 ); + } while ( appIds.tqfind( tmp ) != 0 ); conn->appId = tmp; } appIds.insert( conn->appId, conn ); - int c = conn->appId.find( '-' ); + int c = conn->appId.tqfind( '-' ); if ( c > 0 ) conn->plainAppId = conn->appId.left( c ); else @@ -1494,9 +1494,9 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, } else if ( fun == "setNotifications(bool)" ) { TQDataStream args( data, IO_ReadOnly ); if (!args.atEnd()) { - Q_INT8 notifyActive; + TQ_INT8 notifyActive; args >> notifyActive; - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if ( conn ) { if ( notifyActive ) conn->notifyRegister++; @@ -1507,7 +1507,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.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if (!conn) return false; TQDataStream args(data, IO_ReadOnly ); if (args.atEnd()) return false; @@ -1516,16 +1516,16 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, TQCString signal = readQCString(args); TQCString receiverObj = readQCString(args); TQCString slot = readQCString(args); - Q_INT8 Volatile; + TQ_INT8 Volatile; args >> Volatile; //qDebug("DCOPServer: connectSignal(sender = %s senderObj = %s signal = %s recvObj = %s slot = %s)", sender.data(), senderObj.data(), signal.data(), receiverObj.data(), slot.data()); bool b = dcopSignals->connectSignal(sender, senderObj, signal, conn, receiverObj, slot, (Volatile != 0)); replyType = "bool"; TQDataStream reply( replyData, IO_WriteOnly ); - reply << (Q_INT8) (b?1:0); + reply << (TQ_INT8) (b?1:0); return true; } else if ( fun == "disconnectSignal(TQCString,TQCString,TQCString,TQCString,TQCString)") { - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if (!conn) return false; TQDataStream args(data, IO_ReadOnly ); if (args.atEnd()) return false; @@ -1538,7 +1538,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, bool b = dcopSignals->disconnectSignal(sender, senderObj, signal, conn, receiverObj, slot); replyType = "bool"; TQDataStream reply( replyData, IO_WriteOnly ); - reply << (Q_INT8) (b?1:0); + reply << (TQ_INT8) (b?1:0); return true; } @@ -1618,7 +1618,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.find('\n'); + int pos = contents.tqfind('\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 7b649ccf2..7abc6497a 100644 --- a/dcop/dcopserver.h +++ b/dcop/dcopserver.h @@ -66,7 +66,7 @@ typedef TQValueList QCStringList; /** * @internal */ -class DCOPConnection : public QSocketNotifier +class DCOPConnection : public TQSocketNotifier { public: DCOPConnection( IceConn conn ); @@ -112,7 +112,7 @@ public: /** * @internal */ -class DCOPServer : public QObject +class DCOPServer : public TQObject { Q_OBJECT public: @@ -130,7 +130,7 @@ public: DCOPConnection *findApp(const TQCString &appId); DCOPConnection *findConn(IceConn iceConn) - { return clients.find(iceConn); } + { return clients.tqfind(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 437051a55..1e0eee354 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.find('#'); + int i = fun.tqfind('#'); if (i > -1) { senderObj = fun.left(i); fun = fun.mid(i+1); } - DCOPSignalConnectionList *list = connections.find(fun); + DCOPSignalConnectionList *list = connections.tqfind(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.find('('); + i = signal.tqfind('('); if (i < 0) return false; signalArgs = signal.mid(i+1); - j = signalArgs.find(')'); + j = signalArgs.tqfind(')'); if (j < 0) return false; signalArgs.truncate(j); - i = slot.find('('); + i = slot.tqfind('('); if (i < 0) return false; slotArgs = slot.mid(i+1); - j = slotArgs.find(')'); + j = slotArgs.tqfind(')'); 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.find(signal); + DCOPSignalConnectionList *list = connections.tqfind(signal); if (!list) { list = new DCOPSignalConnectionList; @@ -177,7 +177,7 @@ DCOPSignals::disconnectSignal( const TQCString &sender, const TQCString &senderO return true; } - DCOPSignalConnectionList *list = connections.find(signal); + DCOPSignalConnectionList *list = connections.tqfind(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.find(current->signal); + DCOPSignalConnectionList *signalList = connections.tqfind(current->signal); if (signalList) { signalList->removeRef(current); diff --git a/dcop/kdatastream.h b/dcop/kdatastream.h index de85ebb47..6551295f6 100644 --- a/dcop/kdatastream.h +++ b/dcop/kdatastream.h @@ -6,13 +6,13 @@ #ifdef USE_QT3 inline TQDataStream & operator << (TQDataStream & str, bool b) { - str << Q_INT8(b); + str << TQ_INT8(b); return str; } inline TQDataStream & operator >> (TQDataStream & str, bool & b) { - Q_INT8 l; + TQ_INT8 l; str >> l; b = bool(l); return str; @@ -22,7 +22,7 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b) #if QT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) inline TQDataStream & operator << (TQDataStream & str, long long int ll) { - Q_UINT32 l1,l2; + TQ_UINT32 l1,l2; l1 = ll & 0xffffffffLL; l2 = ll >> 32; str << l1 << l2; @@ -31,7 +31,7 @@ inline TQDataStream & operator << (TQDataStream & str, long long int ll) inline TQDataStream & operator >> (TQDataStream & str, long long int&ll) { - Q_UINT32 l1,l2; + TQ_UINT32 l1,l2; str >> l1 >> l2; ll = ((unsigned long long int)(l2) << 32) + (long long int) l1; return str; @@ -39,7 +39,7 @@ inline TQDataStream & operator >> (TQDataStream & str, long long int&ll) inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll) { - Q_UINT32 l1,l2; + TQ_UINT32 l1,l2; l1 = ll & 0xffffffffLL; l2 = ll >> 32; str << l1 << l2; @@ -48,7 +48,7 @@ inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll inline TQDataStream & operator >> (TQDataStream & str, unsigned long long int &ll) { - Q_UINT32 l1,l2; + TQ_UINT32 l1,l2; str >> l1 >> l2; ll = ((unsigned long long int)(l2) << 32) + (unsigned long long int) l1; return str; diff --git a/dcop/testdcop.h b/dcop/testdcop.h index 135812e39..936632b55 100644 --- a/dcop/testdcop.h +++ b/dcop/testdcop.h @@ -35,13 +35,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include /** - $QTDIR/bin/moc testdcop.cpp -o testdcop.moc + $QTDIR/bin/tqmoc testdcop.cpp -o testdcop.moc g++ -o testdcop testdcop.cpp -I$QTDIR/include -L$QTDIR/lib @internal **/ -class TestObject : public QObject +class TestObject : public TQObject { Q_OBJECT public: -- cgit v1.2.1