From 4fb897b216c41c13f128c71bcc66f60e2dc601c4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:33:40 -0600 Subject: Rename additional global TQt functions --- dcop/HOWTO | 12 ++--- dcop/Mainpage.dox | 12 ++--- dcop/client/dcop.cpp | 20 ++++---- dcop/client/dcopfind.cpp | 14 +++--- dcop/client/dcopstart.cpp | 6 +-- dcop/client/marshall.cpp | 8 +-- dcop/dcop_deadlock_test.cpp | 8 +-- dcop/dcopclient.cpp | 48 +++++++++--------- dcop/dcopidl/scanner.cc | 2 +- dcop/dcopidl/scanner.ll | 2 +- dcop/dcopidl/yacc.cc | 2 +- dcop/dcopidl/yacc.yy | 2 +- dcop/dcopidl2cpp/main.cpp | 4 +- dcop/dcopidl2cpp/skel.cpp | 4 +- dcop/dcopidl2cpp/stub.cpp | 2 +- dcop/dcopidl2cpp/stubimpl.cpp | 2 +- dcop/dcopref.cpp | 14 +++--- dcop/dcopref.h | 2 +- dcop/dcopserver.cpp | 110 +++++++++++++++++++++--------------------- dcop/dcopsignals.cpp | 2 +- dcop/testdcop.cpp | 70 +++++++++++++-------------- dcop/testdcop.h | 2 +- dcop/tests/driver.cpp | 2 +- 23 files changed, 175 insertions(+), 175 deletions(-) (limited to 'dcop') diff --git a/dcop/HOWTO b/dcop/HOWTO index c12939ce9..b0e653dfe 100644 --- a/dcop/HOWTO +++ b/dcop/HOWTO @@ -152,7 +152,7 @@ QDataStream arg(data, IO_WriteOnly); arg << 5; if (!client->send("someAppId", "fooObject/barObject", "doIt(int)", data)) - qDebug("there was some error using DCOP."); + tqDebug("there was some error using DCOP."); OK, now let's say we wanted to get the data back from the remotely called function. You have to execute a call() instead of a send(). @@ -166,7 +166,7 @@ QDataStream arg(data, IO_WriteOnly); arg << 5; if (!client->call("someAppId", "fooObject/barObject", "doIt(int)", data, replyType, replyData)) - qDebug("there was some error using DCOP."); + tqDebug("there was some error using DCOP."); else { QDataStream reply(replyData, IO_ReadOnly); if (replyType == "QString") { @@ -174,7 +174,7 @@ else { reply >> result; print("the result is: %s",result.latin1()); } else - qDebug("doIt returned an unexpected type of reply!"); + tqDebug("doIt returned an unexpected type of reply!"); } N.B.: You cannot call() a method belonging to an application which has @@ -216,7 +216,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, replyType = "QString"; return true; } else { - qDebug("unknown function call to BarObject::process()"); + tqDebug("unknown function call to BarObject::process()"); return false; } } @@ -255,7 +255,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, return true; } else { - qDebug("unknown function call to BarObject::process()"); + tqDebug("unknown function call to BarObject::process()"); return false; } } @@ -421,7 +421,7 @@ Example: void MyClass::myAsynchronousMethod(QString someParameter) { - qDebug("myAsyncMethod called with param `" + someParameter + "'"); + tqDebug("myAsyncMethod called with param `" + someParameter + "'"); } diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox index ece626186..a92fb4e50 100644 --- a/dcop/Mainpage.dox +++ b/dcop/Mainpage.dox @@ -115,7 +115,7 @@ QDataStream arg(data, IO_WriteOnly); arg << 5; if (!client->send("someAppId", "fooObject/barObject", "doIt(int)", data)) - qDebug("there was some error using DCOP."); + tqDebug("there was some error using DCOP."); \endcode OK, now let's say we wanted to get the data back from the remotely @@ -131,7 +131,7 @@ QDataStream arg(data, IO_WriteOnly); arg << 5; if (!client->call("someAppId", "fooObject/barObject", "doIt(int)", data, replyType, replyData)) - qDebug("there was some error using DCOP."); + tqDebug("there was some error using DCOP."); else { QDataStream reply(replyData, IO_ReadOnly); if (replyType == "QString") { @@ -139,7 +139,7 @@ else { reply >> result; print("the result is: %s",result.latin1()); } else - qDebug("doIt returned an unexpected type of reply!"); + tqDebug("doIt returned an unexpected type of reply!"); } \endcode @@ -175,7 +175,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, replyType = "QString"; return true; } else { - qDebug("unknown function call to BarObject::process()"); + tqDebug("unknown function call to BarObject::process()"); return false; } } @@ -216,7 +216,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, return true; } else { - qDebug("unknown function call to BarObject::process()"); + tqDebug("unknown function call to BarObject::process()"); return false; } } @@ -329,7 +329,7 @@ Example: \code void MyClass::myAsynchronousMethod(QString someParameter) { - qDebug("myAsyncMethod called with param `" + someParameter + "'"); + tqDebug("myAsyncMethod called with param `" + someParameter + "'"); } \endcode diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp index baa2a7142..74e6911f2 100644 --- a/dcop/client/dcop.cpp +++ b/dcop/client/dcop.cpp @@ -102,7 +102,7 @@ void queryApplications(const TQCString &filter) if ( !dcop->isAttached() ) { - qWarning( "server not accessible" ); + tqWarning( "server not accessible" ); exit(1); } } @@ -135,9 +135,9 @@ void queryObjects( const TQCString &app, const TQCString &filter ) if ( !ok ) { if (!dcop->isApplicationRegistered(app)) - qWarning( "No such application: '%s'", app.data()); + tqWarning( "No such application: '%s'", app.data()); else - qWarning( "Application '%s' not accessible", app.data() ); + tqWarning( "Application '%s' not accessible", app.data() ); exit(1); } } @@ -151,7 +151,7 @@ void queryFunctions( const char* app, const char* obj ) } if ( !ok ) { - qWarning( "object '%s' in application '%s' not accessible", obj, app ); + tqWarning( "object '%s' in application '%s' not accessible", obj, app ); exit( 1 ); } } @@ -164,7 +164,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt if ( right < left ) { - qWarning( "parentheses do not match" ); + tqWarning( "parentheses do not match" ); return( 1 ); } @@ -177,7 +177,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt goto doit; if ( !ok ) { - qWarning( "object not accessible" ); + tqWarning( "object not accessible" ); return( 1 ); } for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { @@ -205,7 +205,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt } if ( realfunc.isEmpty() ) { - qWarning("no such function"); + tqWarning("no such function"); return( 1 ); } f = realfunc; @@ -257,7 +257,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt if ( s < static_cast(partl.count())-1) { - qWarning("The argument `%s' seems syntactically wrong.", + tqWarning("The argument `%s' seems syntactically wrong.", lt.latin1()); } if ( s == static_cast(partl.count())-1) @@ -294,12 +294,12 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt if ( i != args.count() ) { - qWarning( "arguments do not match" ); + tqWarning( "arguments do not match" ); return( 1 ); } if ( !dcop->call( app, obj, f.latin1(), data, replyType, replyData) ) { - qWarning( "call failed"); + tqWarning( "call failed"); return( 1 ); } else { TQDataStream reply(replyData, IO_ReadOnly); diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp index cd3e4d517..d12cecddf 100644 --- a/dcop/client/dcopfind.cpp +++ b/dcop/client/dcopfind.cpp @@ -46,7 +46,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis if ( right < left ) { - qWarning( "parentheses do not match" ); + tqWarning( "parentheses do not match" ); exit(1); } @@ -93,7 +93,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis if (s<(int)partl.count()-1) { - qWarning("The argument `%s' seems syntactically wrong.", + tqWarning("The argument `%s' seems syntactically wrong.", lt.latin1()); } if (s==(int)partl.count()-1) @@ -121,7 +121,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis } if ( types.count() != args.count() ) { - qWarning( "arguments do not match" ); + tqWarning( "arguments do not match" ); exit(1); } @@ -133,7 +133,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis marshall(arg, args, i, *it); } if ( (uint) i != args.count() ) { - qWarning( "arguments do not match" ); + tqWarning( "arguments do not match" ); exit(1); } @@ -168,14 +168,14 @@ bool launchApp(TQString app) if ( !dcop->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)", data, replyType, replyData) ) { - qWarning( "call to klauncher failed."); + tqWarning( "call to klauncher failed."); return false; } TQDataStream reply(replyData, IO_ReadOnly); if ( replyType != "serviceResult" ) { - qWarning( "unexpected result '%s' from klauncher.", replyType.data()); + tqWarning( "unexpected result '%s' from klauncher.", replyType.data()); return false; } int result; @@ -184,7 +184,7 @@ bool launchApp(TQString app) reply >> result >> dcopName >> error; if (result != 0) { - qWarning("Error starting '%s': %s", app.local8Bit().data(), error.local8Bit().data()); + tqWarning("Error starting '%s': %s", app.local8Bit().data(), error.local8Bit().data()); return false; } return true; diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp index 5741ef775..737184385 100644 --- a/dcop/client/dcopstart.cpp +++ b/dcop/client/dcopstart.cpp @@ -50,14 +50,14 @@ void startApp(const char *_app, int argc, const char **args) arg << app << URLs; if ( !dcop->call( "klauncher", "klauncher", function, data, replyType, replyData) ) { - qWarning( "call failed"); + tqWarning( "call failed"); exit(1); } else { TQDataStream reply(replyData, IO_ReadOnly); if ( replyType != "serviceResult" ) { - qWarning( "unexpected result '%s'", replyType.data()); + tqWarning( "unexpected result '%s'", replyType.data()); exit(1); } int result; @@ -66,7 +66,7 @@ void startApp(const char *_app, int argc, const char **args) reply >> result >> dcopName >> error; if (result != 0) { - qWarning("Error: %s", error.local8Bit().data()); + tqWarning("Error: %s", error.local8Bit().data()); exit(1); } if (!dcopName.isEmpty()) diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp index e848ac761..c78a1569d 100644 --- a/dcop/client/marshall.cpp +++ b/dcop/client/marshall.cpp @@ -273,7 +273,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) { if( i >= args.count() ) { - qWarning("Not enough arguments (expected %d, got %d).", i, args.count()); + tqWarning("Not enough arguments (expected %d, got %d).", i, args.count()); exit(1); } TQString s = TQString::fromLocal8Bit( args[ i ] ); @@ -368,7 +368,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) while (true) { if( j > args.count() ) { - qWarning("List end-delimiter '%s' not found.", delim.latin1()); + tqWarning("List end-delimiter '%s' not found.", delim.latin1()); exit(1); } if( TQString::fromLocal8Bit( args[ j ] ) == delim ) @@ -381,7 +381,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) while (true) { if( i > args.count() ) { - qWarning("List end-delimiter '%s' not found.", delim.latin1()); + tqWarning("List end-delimiter '%s' not found.", delim.latin1()); exit(1); } if( TQString::fromLocal8Bit( args[ i ] ) == delim ) @@ -389,7 +389,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) marshall( arg, args, i, type ); } } else { - qWarning( "cannot handle datatype '%s'", type.latin1() ); + tqWarning( "cannot handle datatype '%s'", type.latin1() ); exit(1); } i++; diff --git a/dcop/dcop_deadlock_test.cpp b/dcop/dcop_deadlock_test.cpp index 71e8ba66c..a5869b2a7 100644 --- a/dcop/dcop_deadlock_test.cpp +++ b/dcop/dcop_deadlock_test.cpp @@ -45,7 +45,7 @@ TQCString& replyType, TQByteArray &replyData) struct timeval tv; gettimeofday(&tv, 0); -qWarning("%s: function('%s') %d:%06d", name(), m_remoteName.data(), tv.tv_sec % 100, tv.tv_usec); +tqWarning("%s: function('%s') %d:%06d", name(), m_remoteName.data(), tv.tv_sec % 100, tv.tv_usec); replyType = "TQString"; TQDataStream reply( replyData, IO_WriteOnly ); @@ -60,13 +60,13 @@ void MyDCOPObject::slotTimeout() { struct timeval tv; gettimeofday(&tv, 0); -qWarning("%s: slotTimeout() %d:%06d", name(), tv.tv_sec % 100, tv.tv_usec); +tqWarning("%s: slotTimeout() %d:%06d", name(), tv.tv_sec % 100, tv.tv_usec); m_timer.start(1000, true); TQString result; DCOPRef(m_remoteName, m_remoteName).call("function", TQCString(name())).get(result); gettimeofday(&tv, 0); -qWarning("%s: Got result '%s' %d:%06d", name(), result.latin1(), tv.tv_sec % 100, tv.tv_usec); +tqWarning("%s: Got result '%s' %d:%06d", name(), result.latin1(), tv.tv_sec % 100, tv.tv_usec); } int main(int argc, char **argv) @@ -74,7 +74,7 @@ int main(int argc, char **argv) TQCString myName = KApplication::dcopClient()->registerAs("testdcop", false); KApplication app(argc, argv, "testdcop"); - qWarning("%d:I am '%s'", getpid(), app.dcopClient()->appId().data()); + tqWarning("%d:I am '%s'", getpid(), app.dcopClient()->appId().data()); if (myName == "testdcop") { diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index 24e90c75b..9913913f7 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -359,7 +359,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject, *replyWaitRet = True; return; } else { - qWarning("Very strange! got a DCOPReplyFailed opcode, but we were not waiting for a reply!"); + tqWarning("Very strange! got a DCOPReplyFailed opcode, but we were not waiting for a reply!"); return; } case DCOPReply: @@ -376,7 +376,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject, *replyWaitRet = True; return; } else { - qWarning("Very strange! got a DCOPReply opcode, but we were not waiting for a reply!"); + tqWarning("Very strange! got a DCOPReply opcode, but we were not waiting for a reply!"); return; } case DCOPReplyWait: @@ -391,7 +391,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject, *replyWaitRet = True; return; } else { - qWarning("Very strange! got a DCOPReplyWait opcode, but we were not waiting for a reply!"); + tqWarning("Very strange! got a DCOPReplyWait opcode, but we were not waiting for a reply!"); return; } case DCOPReplyDelayed: @@ -426,7 +426,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject, } } } - qWarning("Very strange! got a DCOPReplyDelayed opcode, but we were not waiting for a reply!"); + tqWarning("Very strange! got a DCOPReplyDelayed opcode, but we were not waiting for a reply!"); return; case DCOPCall: case DCOPFind: @@ -494,7 +494,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ d->objId = objId; d->function = fun; -// qWarning("DCOP: %s got call: %s:%s:%s key = %d currentKey = %d", d->appId.data(), app.data(), objId.data(), fun.data(), key, d->currentKey); +// tqWarning("DCOP: %s got call: %s:%s:%s key = %d currentKey = %d", d->appId.data(), app.data(), objId.data(), fun.data(), key, d->currentKey); if ( canPost && d->currentKey && key != d->currentKey ) { DCOPClientMessage* msg = new DCOPClientMessage; @@ -621,20 +621,20 @@ DCOPClient::DCOPClient() DCOPClient::~DCOPClient() { #ifdef DCOPCLIENT_DEBUG - qWarning("d->messages.count() = %d", d->messages.count()); + tqWarning("d->messages.count() = %d", d->messages.count()); TQPtrListIterator it (d->messages ); DCOPClientMessage* msg ; while ( ( msg = it.current() ) ) { ++it; d->messages.removeRef( msg ); - qWarning("DROPPING UNHANDLED DCOP MESSAGE:"); - qWarning(" opcode = %d key = %d", msg->opcode, msg->key); + tqWarning("DROPPING UNHANDLED DCOP MESSAGE:"); + tqWarning(" opcode = %d key = %d", msg->opcode, msg->key); TQDataStream ds( msg->data, IO_ReadOnly ); TQCString fromApp, app, objId, fun; ds >> fromApp >> app >> objId >> fun; - qWarning(" from = %s", fromApp.data()); - qWarning(" to = %s / %s / %s", app.data(), objId.data(), fun.data()); + tqWarning(" from = %s", fromApp.data()); + tqWarning(" to = %s / %s / %s", app.data(), objId.data(), fun.data()); delete msg; } #endif @@ -659,7 +659,7 @@ void DCOPClient::setServerAddress(const TQCString &addr) TQCString env = "DCOPSERVER=" + addr; putenv(strdup(env.data())); delete [] DCOPClientPrivate::serverAddr; - DCOPClientPrivate::serverAddr = qstrdup( addr.data() ); + DCOPClientPrivate::serverAddr = tqstrdup( addr.data() ); } bool DCOPClient::attach() @@ -786,14 +786,14 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) TQCString contents( size+1 ); if ( f.readBlock( contents.data(), size ) != size ) { - qDebug("Error reading from %s, didn't read the expected %d bytes", fName.data(), size); + tqDebug("Error reading from %s, didn't read the expected %d bytes", fName.data(), size); // Should we abort ? } contents[size] = '\0'; int pos = contents.find('\n'); if ( pos == -1 ) // Shouldn't happen { - qDebug("Only one line in dcopserver file !: %s", contents.data()); + tqDebug("Only one line in dcopserver file !: %s", contents.data()); dcopSrv = contents; } else @@ -802,18 +802,18 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) pos--; dcopSrv = contents.left( pos ); //#ifndef NDEBUG -// qDebug("dcopserver address: %s", dcopSrv.data()); +// tqDebug("dcopserver address: %s", dcopSrv.data()); //#endif } } - d->serverAddr = qstrdup( const_cast(dcopSrv.data()) ); + d->serverAddr = tqstrdup( const_cast(dcopSrv.data()) ); bClearServerAddr = true; } if ((d->iceConn = IceOpenConnection(const_cast(d->serverAddr), static_cast(this), False, d->majorOpcode, sizeof(errBuf), errBuf)) == 0L) { - qDebug("DCOPClient::attachInternal. Attach failed %s", errBuf); + tqDebug("DCOPClient::attachInternal. Attach failed %s", errBuf); d->iceConn = 0; if (bClearServerAddr) { delete [] d->serverAddr; @@ -1303,7 +1303,7 @@ void DCOPClient::setNotifications(bool enabled) TQCString replyType; TQByteArray reply; if (!call("DCOPServer", "", "setNotifications( bool )", data, replyType, reply)) - qWarning("I couldn't enable notifications at the dcopserver!"); + tqWarning("I couldn't enable notifications at the dcopserver!"); } void DCOPClient::setDaemonMode( bool daemonMode ) @@ -1315,7 +1315,7 @@ void DCOPClient::setDaemonMode( bool daemonMode ) TQCString replyType; TQByteArray reply; if (!call("DCOPServer", "", "setDaemonMode(bool)", data, replyType, reply)) - qWarning("I couldn't enable daemon mode at the dcopserver!"); + tqWarning("I couldn't enable daemon mode at the dcopserver!"); } @@ -1687,7 +1687,7 @@ bool DCOPClient::find(const TQCString &app, const TQCString &objId, { d->transaction = false; // Transactions are not allowed. if ( !app.isEmpty() && app != d->appId && app[app.length()-1] != '*') { - qWarning("WEIRD! we somehow received a DCOP message w/a different appId"); + tqWarning("WEIRD! we somehow received a DCOP message w/a different appId"); return false; } @@ -1852,7 +1852,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId int datalen = ba.size() + data.size(); pMsg->length += datalen; -// qWarning("DCOP: %s made call %s:%s:%s key = %d", d->appId.data(), remApp.data(), remObjId.data(), remFun.data(), pMsg->key); +// tqWarning("DCOP: %s made call %s:%s:%s key = %d", d->appId.data(), remApp.data(), remObjId.data(), remFun.data(), pMsg->key); IceSendData(d->iceConn, ba.size(), const_cast(ba.data())); IceSendData(d->iceConn, data.size(), const_cast(data.data())); @@ -2010,7 +2010,7 @@ void DCOPClient::processSocketData(int fd) if( d->notifier ) d->notifier->deleteLater(); d->notifier = 0; - qWarning("received an error processing data from the DCOP server!"); + tqWarning("received an error processing data from the DCOP server!"); return; } @@ -2018,7 +2018,7 @@ void DCOPClient::processSocketData(int fd) if (s == IceProcessMessagesIOError) { detach(); - qWarning("received an error processing data from the DCOP server!"); + tqWarning("received an error processing data from the DCOP server!"); return; } } @@ -2089,12 +2089,12 @@ DCOPClient::endTransaction( DCOPClientTransaction *trans, TQCString& replyType, return; if ( !d->transactionList) { - qWarning("Transaction unknown: No pending transactions!"); + tqWarning("Transaction unknown: No pending transactions!"); return; // No pending transactions! } if ( !d->transactionList->removeRef( trans ) ) { - qWarning("Transaction unknown: Not on list of pending transactions!"); + tqWarning("Transaction unknown: Not on list of pending transactions!"); return; // Transaction } diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cc index 3c6f99daa..afc411cca 100644 --- a/dcop/dcopidl/scanner.cc +++ b/dcop/dcopidl/scanner.cc @@ -1758,7 +1758,7 @@ YY_RULE_SETUP if (function_mode) return yylex(); // call once again - qFatal("could not parse %c(%d) at line %d" , yytext[0], yytext[0], idl_line_no); + tqFatal("could not parse %c(%d) at line %d" , yytext[0], yytext[0], idl_line_no); return T_UNKNOWN; } YY_BREAK diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll index 61f9e5ca6..ad0f564e9 100644 --- a/dcop/dcopidl/scanner.ll +++ b/dcop/dcopidl/scanner.ll @@ -281,7 +281,7 @@ TQ_OBJECT ; if (function_mode) return yylex(); // call once again - qFatal("could not parse %c(%d) at line %d" , yytext[0], yytext[0], idl_line_no); + tqFatal("could not parse %c(%d) at line %d" , yytext[0], yytext[0], idl_line_no); return T_UNKNOWN; } diff --git a/dcop/dcopidl/yacc.cc b/dcop/dcopidl/yacc.cc index 446fc7b49..615af46ef 100644 --- a/dcop/dcopidl/yacc.cc +++ b/dcop/dcopidl/yacc.cc @@ -126,7 +126,7 @@ void dcopidlInitFlex( const char *_code ); void yyerror( const char *s ) { - qDebug( "In line %i : %s", idl_line_no, s ); + tqDebug( "In line %i : %s", idl_line_no, s ); exit(1); // theParser->parse_error( idl_lexFile, s, idl_line_no ); } diff --git a/dcop/dcopidl/yacc.yy b/dcop/dcopidl/yacc.yy index ed38f320f..ac744e902 100644 --- a/dcop/dcopidl/yacc.yy +++ b/dcop/dcopidl/yacc.yy @@ -55,7 +55,7 @@ void dcopidlInitFlex( const char *_code ); void yyerror( const char *s ) { - qDebug( "In line %i : %s", idl_line_no, s ); + tqDebug( "In line %i : %s", idl_line_no, s ); exit(1); // theParser->parse_error( idl_lexFile, s, idl_line_no ); } diff --git a/dcop/dcopidl2cpp/main.cpp b/dcop/dcopidl2cpp/main.cpp index 5e0f27525..f95983a2e 100644 --- a/dcop/dcopidl2cpp/main.cpp +++ b/dcop/dcopidl2cpp/main.cpp @@ -41,7 +41,7 @@ void usage() int main( int argc, char** argv ) { - if ( *qVersion() == '1' ) { + if ( *tqVersion() == '1' ) { fprintf( stderr, "dcopidl2cpp appears to be linked to Qt 1 instead of Qt >= 2 ! Aborting.\n" ); exit(1); } @@ -93,7 +93,7 @@ int main( int argc, char** argv ) TQFile in( TQFile::decodeName(argv[argpos]) ); if ( !in.open( IO_ReadOnly ) ) - qFatal("Could not read %s", argv[argpos] ); + tqFatal("Could not read %s", argv[argpos] ); TQDomDocument doc; doc.setContent( &in ); diff --git a/dcop/dcopidl2cpp/skel.cpp b/dcop/dcopidl2cpp/skel.cpp index 5cc30de3e..cc3dae6bb 100644 --- a/dcop/dcopidl2cpp/skel.cpp +++ b/dcop/dcopidl2cpp/skel.cpp @@ -68,7 +68,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d { TQFile skel( filename ); if ( !skel.open( IO_WriteOnly ) ) - qFatal("Could not write to %s", filename.local8Bit().data() ); + tqFatal("Could not write to %s", filename.local8Bit().data() ); TQTextStream str( &skel ); @@ -418,7 +418,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d funcName += ")"; if ( result != "void" ) - qFatal("Error in DCOP signal %s::%s: DCOP signals can not return values.", className.latin1(), funcName.latin1()); + tqFatal("Error in DCOP signal %s::%s: DCOP signals can not return values.", className.latin1(), funcName.latin1()); str << " TQByteArray data;" << endl; if ( !args.isEmpty() ) { diff --git a/dcop/dcopidl2cpp/stub.cpp b/dcop/dcopidl2cpp/stub.cpp index 887945262..bc2a7f29f 100644 --- a/dcop/dcopidl2cpp/stub.cpp +++ b/dcop/dcopidl2cpp/stub.cpp @@ -40,7 +40,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d { TQFile stub( filename ); if ( !stub.open( IO_WriteOnly ) ) - qFatal("Could not write to %s", filename.local8Bit().data() ); + tqFatal("Could not write to %s", filename.local8Bit().data() ); TQTextStream str( &stub ); diff --git a/dcop/dcopidl2cpp/stubimpl.cpp b/dcop/dcopidl2cpp/stubimpl.cpp index 5cdd2a00d..1e42eea37 100644 --- a/dcop/dcopidl2cpp/stubimpl.cpp +++ b/dcop/dcopidl2cpp/stubimpl.cpp @@ -66,7 +66,7 @@ void generateStubImpl( const TQString& idl, const TQString& header, const TQStri { TQFile impl( filename ); if ( !impl.open( IO_WriteOnly ) ) - qFatal("Could not write to %s", filename.latin1() ); + tqFatal("Could not write to %s", filename.latin1() ); TQTextStream str( &impl ); diff --git a/dcop/dcopref.cpp b/dcop/dcopref.cpp index bb39c109b..6c4ca180e 100644 --- a/dcop/dcopref.cpp +++ b/dcop/dcopref.cpp @@ -41,7 +41,7 @@ bool DCOPReply::typeCheck( const char* t, bool warn ) return true; if( warn || strcmp( t, "" )) // type not listed in dcoptypes.h - qWarning( "WARNING: DCOPReply<%s>: cast to '%s' error", + tqWarning( "WARNING: DCOPReply<%s>: cast to '%s' error", STR( type ), t ); return false; } @@ -57,7 +57,7 @@ DCOPReply DCOPRef::callInternal( const TQCString& fun, const TQCString& args, co { DCOPReply reply; if ( isNull() ) { - qWarning( "DCOPRef: call '%s' on null reference error", + tqWarning( "DCOPRef: call '%s' on null reference error", STR( fun ) ); return reply; } @@ -65,13 +65,13 @@ DCOPReply DCOPRef::callInternal( const TQCString& fun, const TQCString& args, co if ( fun.find('(') == -1 ) { sig += args; if( args.find( "::call(\"%s\",%s", STR(m_app), STR(m_obj), STR(fun), args.data()+1 ); } DCOPClient* dc = dcopClient(); if ( !dc || !dc->isAttached() ) { - qWarning( "DCOPRef::call(): no DCOP client or client not attached error" ); + tqWarning( "DCOPRef::call(): no DCOP client or client not attached error" ); return reply; } dc->call( m_app, m_obj, sig, data, reply.type, reply.data, useEventLoop == UseEventLoop, timeout ); @@ -81,7 +81,7 @@ DCOPReply DCOPRef::callInternal( const TQCString& fun, const TQCString& args, co bool DCOPRef::sendInternal( const TQCString& fun, const TQCString& args, const TQByteArray& data ) { if ( isNull() ) { - qWarning( "DCOPRef: send '%s' on null reference error", + tqWarning( "DCOPRef: send '%s' on null reference error", STR( fun ) ); return false; } @@ -90,13 +90,13 @@ bool DCOPRef::sendInternal( const TQCString& fun, const TQCString& args, const T if ( fun.find('(') == -1 ) { sig += args; if( args.find( "::send(\"%s\",%s", STR(m_app), STR(m_obj), STR(fun), args.data()+1 ); } DCOPClient* dc = dcopClient(); if ( !dc || !dc->isAttached() ) { - qWarning( "DCOPRef::send(): no DCOP client or client not attached error" ); + tqWarning( "DCOPRef::send(): no DCOP client or client not attached error" ); return false; } return dc->send( m_app, m_obj, sig, data ); diff --git a/dcop/dcopref.h b/dcop/dcopref.h index 46116124d..c85654e0e 100644 --- a/dcop/dcopref.h +++ b/dcop/dcopref.h @@ -263,7 +263,7 @@ inline TQDataStream & operator << (TQDataStream & str, const DCOPArg& arg ) * * \code * if ( example.send( "pingMe", "message" ) == false ) - * qWarning("could not ping example" ); + * tqWarning("could not ping example" ); * \endcode * * A DCOP reference operates on DCOPClient::mainClient(), unless you diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp index a4c123b85..695909ea7 100644 --- a/dcop/dcopserver.cpp +++ b/dcop/dcopserver.cpp @@ -130,7 +130,7 @@ static TQCString readQCString(TQDataStream &ds) int bytesLeft = device->size()-device->at(); if ((bytesLeft < 0 ) || (len > (uint) bytesLeft)) { - qWarning("Corrupt data!\n"); + tqWarning("Corrupt data!\n"); printf("bytesLeft: %d, len: %d\n", bytesLeft, len); return result; } @@ -149,7 +149,7 @@ static TQByteArray readQByteArray(TQDataStream &ds) int bytesLeft = device->size()-device->at(); if ((bytesLeft < 0 ) || (len > (uint) bytesLeft)) { - qWarning("Corrupt data!\n"); + tqWarning("Corrupt data!\n"); return result; } result.resize( (uint)len ); @@ -241,7 +241,7 @@ void DCOPIceWriteChar(register IceConn iceConn, unsigned long nbytes, char *ptr) { DCOPConnection* conn = the_server->findConn( iceConn ); #ifdef DCOP_DEBUG -qWarning("DCOPServer: DCOPIceWriteChar() Writing %d bytes [%s]", nbytes, conn ? conn->appId.data() : ""); +tqWarning("DCOPServer: DCOPIceWriteChar() Writing %d bytes [%s]", nbytes, conn ? conn->appId.data() : ""); #endif if (conn) @@ -251,7 +251,7 @@ qWarning("DCOPServer: DCOPIceWriteChar() Writing %d bytes [%s]", nbytes, conn ? TQByteArray _data(nbytes); memcpy(_data.data(), ptr, nbytes); #ifdef DCOP_DEBUG -qWarning("DCOPServer: _IceWrite() outputBlocked. Queuing %d bytes.", _data.size()); +tqWarning("DCOPServer: _IceWrite() outputBlocked. Queuing %d bytes.", _data.size()); #endif conn->outputBuffer.append(_data); return; @@ -273,14 +273,14 @@ static void DCOPIceWrite(IceConn iceConn, const TQByteArray &_data) { DCOPConnection* conn = the_server->findConn( iceConn ); #ifdef DCOP_DEBUG -qWarning("DCOPServer: DCOPIceWrite() Writing %d bytes [%s]", _data.size(), conn ? conn->appId.data() : ""); +tqWarning("DCOPServer: DCOPIceWrite() Writing %d bytes [%s]", _data.size(), conn ? conn->appId.data() : ""); #endif if (conn) { if (conn->outputBlocked) { #ifdef DCOP_DEBUG -qWarning("DCOPServer: DCOPIceWrite() outputBlocked. Queuing %d bytes.", _data.size()); +tqWarning("DCOPServer: DCOPIceWrite() outputBlocked. Queuing %d bytes.", _data.size()); #endif conn->outputBuffer.append(_data); return; @@ -299,7 +299,7 @@ qWarning("DCOPServer: DCOPIceWrite() outputBlocked. Queuing %d bytes.", _data.si void DCOPConnection::waitForOutputReady(const TQByteArray &_data, int start) { #ifdef DCOP_DEBUG -qWarning("DCOPServer: waitForOutputReady fd = %d datasize = %d start = %d", socket(), _data.size(), start); +tqWarning("DCOPServer: waitForOutputReady fd = %d datasize = %d start = %d", socket(), _data.size(), start); #endif outputBlocked = true; outputBuffer.append(_data); @@ -317,7 +317,7 @@ qWarning("DCOPServer: waitForOutputReady fd = %d datasize = %d start = %d", sock void DCOPServer::slotOutputReady(int socket) { #ifdef DCOP_DEBUG -qWarning("DCOPServer: slotOutputReady fd = %d", socket); +tqWarning("DCOPServer: slotOutputReady fd = %d", socket); #endif // Find out connection. DCOPConnection *conn = fd_clients.find(socket); @@ -351,7 +351,7 @@ void DCOPConnection::slotOutputReady() fcntl(fd, F_SETFL, fd_fl); #ifdef DCOP_DEBUG -qWarning("DCOPServer: slotOutputReady() %d bytes written", nwritten); +tqWarning("DCOPServer: slotOutputReady() %d bytes written", nwritten); #endif if (nwritten < 0) @@ -370,7 +370,7 @@ qWarning("DCOPServer: slotOutputReady() %d bytes written", nwritten); if (outputBuffer.isEmpty()) { #ifdef DCOP_DEBUG -qWarning("DCOPServer: slotOutputRead() all data transmitted."); +tqWarning("DCOPServer: slotOutputRead() all data transmitted."); #endif outputBlocked = false; outputBufferNotifier->setEnabled(false); @@ -378,7 +378,7 @@ qWarning("DCOPServer: slotOutputRead() all data transmitted."); #ifdef DCOP_DEBUG else { -qWarning("DCOPServer: slotOutputRead() more data to send."); +tqWarning("DCOPServer: slotOutputRead() more data to send."); } #endif } @@ -390,7 +390,7 @@ static void DCOPIceSendData(register IceConn _iceConn, if (_iceConn->outbufptr > _iceConn->outbuf) { #ifdef DCOP_DEBUG -qWarning("DCOPServer: Flushing data, fd = %d", IceConnectionNumber(_iceConn)); +tqWarning("DCOPServer: Flushing data, fd = %d", IceConnectionNumber(_iceConn)); #endif IceFlush( _iceConn ); } @@ -713,7 +713,7 @@ void DCOPServer::processMessage( IceConn iceConn, int opcode, { DCOPConnection* conn = clients.find( iceConn ); if ( !conn ) { - qWarning("DCOPServer::processMessage message from unknown connection. [opcode = %d]", opcode); + tqWarning("DCOPServer::processMessage message from unknown connection. [opcode = %d]", opcode); return; } switch( opcode ) { @@ -733,13 +733,13 @@ void DCOPServer::processMessage( IceConn iceConn, int opcode, int datalen = ba.size(); if ( opcode == DCOPReplyDelayed ) { if ( !target ) - qWarning("DCOPServer::DCOPReplyDelayed for unknown connection."); + tqWarning("DCOPServer::DCOPReplyDelayed for unknown connection."); else if ( !conn ) - qWarning("DCOPServer::DCOPReplyDelayed from unknown connection."); + tqWarning("DCOPServer::DCOPReplyDelayed from unknown connection."); else if (!conn->waitingForDelayedReply.removeRef( target->iceConn )) - qWarning("DCOPServer::DCOPReplyDelayed from/to does not match. (#2)"); + tqWarning("DCOPServer::DCOPReplyDelayed from/to does not match. (#2)"); else if (!target->waitingOnReply.removeRef(iceConn)) - qWarning("DCOPServer::DCOPReplyDelayed for client who wasn't waiting on one!"); + tqWarning("DCOPServer::DCOPReplyDelayed for client who wasn't waiting on one!"); } if ( target ) { #ifdef DCOP_DEBUG @@ -747,7 +747,7 @@ if (opcode == DCOPSend) { TQCString obj = readQCString(ds); TQCString fun = readQCString(ds); - qWarning("Sending %d bytes from %s to %s. DCOPSend %s", length, fromApp.data(), toApp.data(), fun.data()); + tqWarning("Sending %d bytes from %s to %s. DCOPSend %s", length, fromApp.data(), toApp.data(), fun.data()); } #endif IceGetHeader( target->iceConn, majorOpcode, opcode, @@ -765,7 +765,7 @@ if (opcode == DCOPSend) TQCString replyType; TQByteArray replyData; if ( !receive( toApp, obj, fun, data, replyType, replyData, iceConn ) ) { - qWarning("%s failure: object '%s' has no function '%s'", toApp.data(), obj.data(), fun.data() ); + tqWarning("%s failure: object '%s' has no function '%s'", toApp.data(), obj.data(), fun.data() ); } } else if ( toApp[toApp.length()-1] == '*') { #ifdef DCOP_DEBUG @@ -773,7 +773,7 @@ if (opcode == DCOPSend) { TQCString obj = readQCString(ds); TQCString fun = readQCString(ds); - qWarning("Sending %d bytes from %s to %s. DCOPSend %s", length, fromApp.data(), toApp.data(), fun.data()); + tqWarning("Sending %d bytes from %s to %s. DCOPSend %s", length, fromApp.data(), toApp.data(), fun.data()); } #endif // handle a multicast. @@ -815,7 +815,7 @@ if (opcode == DCOPCall) { TQCString obj = readQCString(ds); TQCString fun = readQCString(ds); - qWarning("Sending %d bytes from %s to %s. DCOPCall %s", length, fromApp.data(), toApp.data(), fun.data()); + tqWarning("Sending %d bytes from %s to %s. DCOPCall %s", length, fromApp.data(), toApp.data(), fun.data()); } #endif target->waitingForReply.append( iceConn ); @@ -839,7 +839,7 @@ if (opcode == DCOPCall) TQByteArray data = readQByteArray(ds); b = receive( toApp, obj, fun, data, replyType, replyData, iceConn ); if ( !b ) - qWarning("%s failure: object '%s' has no function '%s'", toApp.data(), obj.data(), fun.data() ); + tqWarning("%s failure: object '%s' has no function '%s'", toApp.data(), obj.data(), fun.data() ); } if (b) { @@ -893,7 +893,7 @@ if (opcode == DCOPCall) int datalen = ba.size(); if ( !connreply ) - qWarning("DCOPServer::DCOPReply for unknown connection."); + tqWarning("DCOPServer::DCOPReply for unknown connection."); else { conn->waitingForReply.removeRef( connreply->iceConn ); if ( opcode == DCOPReplyWait ) @@ -903,7 +903,7 @@ if (opcode == DCOPCall) else { // DCOPReply or DCOPReplyFailed if (!connreply->waitingOnReply.removeRef(iceConn)) - qWarning("DCOPServer::DCOPReply from %s to %s who wasn't waiting on one!", + tqWarning("DCOPServer::DCOPReply from %s to %s who wasn't waiting on one!", fromApp.data(), toApp.data()); } IceGetHeader( connreply->iceConn, majorOpcode, opcode, @@ -917,7 +917,7 @@ if (opcode == DCOPCall) } break; default: - qWarning("DCOPServer::processMessage unknown message"); + tqWarning("DCOPServer::processMessage unknown message"); } } @@ -986,7 +986,7 @@ DCOPServer::DCOPServer(bool _suicide) DCOPAuthCount, const_cast(DCOPAuthNames), DCOPClientAuthProcs, 0); if (_kde_IceLastMajorOpcode < 1 ) - qWarning("DCOPServer Error: incorrect major opcode!"); + tqWarning("DCOPServer Error: incorrect major opcode!"); the_server = this; if (( majorOpcode = IceRegisterForProtocolReply (const_cast("DCOP"), @@ -1004,7 +1004,7 @@ DCOPServer::DCOPServer(bool _suicide) NULL /* IceIOErrorProc */ )) < 0) { - qWarning("Could not register DCOP protocol with ICE"); + tqWarning("Could not register DCOP protocol with ICE"); } char errormsg[256]; @@ -1043,10 +1043,10 @@ DCOPServer::DCOPServer(bool _suicide) #if 0 if (!SetAuthentication_local(numTransports, listenObjs)) - qFatal("DCOPSERVER: authentication setup failed."); + tqFatal("DCOPSERVER: authentication setup failed."); #endif if (!SetAuthentication(numTransports, listenObjs, &authDataEntries)) - qFatal("DCOPSERVER: authentication setup failed."); + tqFatal("DCOPSERVER: authentication setup failed."); IceAddConnectionWatch (DCOPWatchProc, static_cast(this)); _IceWriteHandler = DCOPIceWriteChar; @@ -1119,7 +1119,7 @@ DCOPConnection* DCOPServer::findApp( const TQCString& appId ) */ void DCOPServer::slotCleanDeadConnections() { -qWarning("DCOP Cleaning up dead connections."); +tqWarning("DCOP Cleaning up dead connections."); while(!deadConnections.isEmpty()) { IceConn iceConn = deadConnections.take(0); @@ -1158,9 +1158,9 @@ void DCOPServer::newClient( int /*socket*/ ) IceConn iceConn = IceAcceptConnection( static_cast(sender())->listenObj, &status); if (!iceConn) { if (status == IceAcceptBadMalloc) - qWarning("Failed to alloc connection object!\n"); + tqWarning("Failed to alloc connection object!\n"); else // IceAcceptFailure - qWarning("Failed to accept ICE connection!\n"); + tqWarning("Failed to accept ICE connection!\n"); return; } @@ -1173,9 +1173,9 @@ void DCOPServer::newClient( int /*socket*/ ) if (cstatus != IceConnectAccepted) { if (cstatus == IceConnectIOError) - qWarning ("IO error opening ICE Connection!\n"); + tqWarning ("IO error opening ICE Connection!\n"); else - qWarning ("ICE Connection rejected!\n"); + tqWarning ("ICE Connection rejected!\n"); deadConnections.removeRef(iceConn); (void) IceCloseConnection (iceConn); } @@ -1206,7 +1206,7 @@ void DCOPServer::removeConnection( void* data ) IceConn iceConn = conn->waitingForReply.take(0); if (iceConn) { DCOPConnection* target = clients.find( iceConn ); - qWarning("DCOP aborting call from '%s' to '%s'", target ? target->appId.data() : "" , conn->appId.data() ); + tqWarning("DCOP aborting call from '%s' to '%s'", target ? target->appId.data() : "" , conn->appId.data() ); TQByteArray reply; DCOPMsg *pMsg; IceGetHeader( iceConn, majorOpcode, DCOPReplyFailed, @@ -1217,9 +1217,9 @@ void DCOPServer::removeConnection( void* data ) DCOPIceSendData(iceConn, reply); _DCOPIceSendEnd(); if (!target) - qWarning("DCOP Error: unknown target in waitingForReply"); + tqWarning("DCOP Error: unknown target in waitingForReply"); else if (!target->waitingOnReply.removeRef(conn->iceConn)) - qWarning("DCOP Error: client in waitingForReply wasn't waiting on reply"); + tqWarning("DCOP Error: client in waitingForReply wasn't waiting on reply"); } } @@ -1228,7 +1228,7 @@ void DCOPServer::removeConnection( void* data ) IceConn iceConn = conn->waitingForDelayedReply.take(0); if (iceConn) { DCOPConnection* target = clients.find( iceConn ); - qWarning("DCOP aborting (delayed) call from '%s' to '%s'", target ? target->appId.data() : "", conn->appId.data() ); + tqWarning("DCOP aborting (delayed) call from '%s' to '%s'", target ? target->appId.data() : "", conn->appId.data() ); TQByteArray reply; DCOPMsg *pMsg; IceGetHeader( iceConn, majorOpcode, DCOPReplyFailed, @@ -1239,9 +1239,9 @@ void DCOPServer::removeConnection( void* data ) DCOPIceSendData( iceConn, reply ); _DCOPIceSendEnd(); if (!target) - qWarning("DCOP Error: unknown target in waitingForDelayedReply"); + tqWarning("DCOP Error: unknown target in waitingForDelayedReply"); else if (!target->waitingOnReply.removeRef(conn->iceConn)) - qWarning("DCOP Error: client in waitingForDelayedReply wasn't waiting on reply"); + tqWarning("DCOP Error: client in waitingForDelayedReply wasn't waiting on reply"); } } while (!conn->waitingOnReply.isEmpty()) @@ -1251,19 +1251,19 @@ void DCOPServer::removeConnection( void* data ) DCOPConnection* target = clients.find( iceConn ); if (!target) { - qWarning("DCOP Error: still waiting for answer from non-existing client."); + tqWarning("DCOP Error: still waiting for answer from non-existing client."); continue; } - qWarning("DCOP aborting while waiting for answer from '%s'", target->appId.data()); + tqWarning("DCOP aborting while waiting for answer from '%s'", target->appId.data()); if (!target->waitingForReply.removeRef(conn->iceConn) && !target->waitingForDelayedReply.removeRef(conn->iceConn)) - qWarning("DCOP Error: called client has forgotten about caller"); + tqWarning("DCOP Error: called client has forgotten about caller"); } } if ( !conn->appId.isNull() ) { #ifndef NDEBUG - qDebug("DCOP: unregister '%s'", conn->appId.data() ); + tqDebug("DCOP: unregister '%s'", conn->appId.data() ); #endif if ( !conn->daemon ) { @@ -1362,7 +1362,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, { DCOPConnection* conn = clients.find( iceConn ); if (conn) { - //qDebug("DCOPServer: %s emits %s", conn->appId.data(), fun.data()); + //tqDebug("DCOPServer: %s emits %s", conn->appId.data(), fun.data()); dcopSignals->emitSignal(conn, fun, data, false); } replyType = "void"; @@ -1385,7 +1385,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, conn->daemon = true; #ifndef NDEBUG - qDebug( "DCOP: new daemon %s", conn->appId.data() ); + tqDebug( "DCOP: new daemon %s", conn->appId.data() ); #endif currentClientNumber--; @@ -1429,14 +1429,14 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, currentClientNumber++; m_timer->stop(); // abort termination if we were planning one #ifndef NDEBUG - qDebug("DCOP: register '%s' -> number of clients is now %d", app2.data(), currentClientNumber ); + tqDebug("DCOP: register '%s' -> number of clients is now %d", app2.data(), currentClientNumber ); #endif } #ifndef NDEBUG else { oldAppId = conn->appId; - qDebug("DCOP: '%s' now known as '%s'", conn->appId.data(), app2.data() ); + tqDebug("DCOP: '%s' now known as '%s'", conn->appId.data(), app2.data() ); } #endif @@ -1520,7 +1520,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, TQ_INT8 Volatile; args >> Volatile; #ifdef DCOP_DEBUG - qDebug("DCOPServer: connectSignal(sender = %s senderObj = %s signal = %s recvObj = %s slot = %s)", sender.data(), senderObj.data(), signal.data(), receiverObj.data(), slot.data()); + tqDebug("DCOPServer: connectSignal(sender = %s senderObj = %s signal = %s recvObj = %s slot = %s)", sender.data(), senderObj.data(), signal.data(), receiverObj.data(), slot.data()); #endif bool b = dcopSignals->connectSignal(sender, senderObj, signal, conn, receiverObj, slot, (Volatile != 0)); replyType = "bool"; @@ -1538,7 +1538,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, TQCString receiverObj = readQCString(args); TQCString slot = readQCString(args); #ifdef DCOP_DEBUG - qDebug("DCOPServer: disconnectSignal(sender = %s senderObj = %s signal = %s recvObj = %s slot = %s)", sender.data(), senderObj.data(), signal.data(), receiverObj.data(), slot.data()); + tqDebug("DCOPServer: disconnectSignal(sender = %s senderObj = %s signal = %s recvObj = %s slot = %s)", sender.data(), senderObj.data(), signal.data(), receiverObj.data(), slot.data()); #endif bool b = dcopSignals->disconnectSignal(sender, senderObj, signal, conn, receiverObj, slot); replyType = "bool"; @@ -1629,9 +1629,9 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false) f.close(); if (ok && pid && (kill(pid, SIGHUP) == 0)) { if (printNetworkId) - qWarning("%s", contents.left(pos).data()); + tqWarning("%s", contents.left(pos).data()); else - qWarning( "---------------------------------\n" + tqWarning( "---------------------------------\n" "It looks like dcopserver is already running. If you are sure\n" "that it is not already running, remove %s\n" "and start dcopserver again.\n" @@ -1719,8 +1719,8 @@ extern "C" DCOP_EXPORT int kdemain( int argc, char* argv[] ) if (retcode != 0) { - qWarning("dcopserver: Could not raise limit on number of open files."); - qWarning("dcopserver: Current limit = %d", cur_limit); + tqWarning("dcopserver: Could not raise limit on number of open files."); + tqWarning("dcopserver: Current limit = %d", cur_limit); } } } @@ -1743,7 +1743,7 @@ extern "C" DCOP_EXPORT int kdemain( int argc, char* argv[] ) if (client.attach()) return 0; } - qWarning("DCOPServer self-test failed."); + tqWarning("DCOPServer self-test failed."); system(findDcopserverShutdown()+" --kill"); return 1; } diff --git a/dcop/dcopsignals.cpp b/dcop/dcopsignals.cpp index 437051a55..46b1dcd14 100644 --- a/dcop/dcopsignals.cpp +++ b/dcop/dcopsignals.cpp @@ -264,7 +264,7 @@ DCOPSignals::removeConnections(DCOPConnection *conn, const TQCString &obj) } else { - qDebug("Error: Signal Connection was not in signalList!\n"); + tqDebug("Error: Signal Connection was not in signalList!\n"); } list->removeRef(current); delete current; diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp index e43b41c31..0de10d1cd 100644 --- a/dcop/testdcop.cpp +++ b/dcop/testdcop.cpp @@ -38,7 +38,7 @@ DCOPClient *client = 0; bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData) { - qDebug("in MyDCOPObject::process, fun = %s", fun.data()); + tqDebug("in MyDCOPObject::process, fun = %s", fun.data()); // note "fun" is normlized here (i.e. whitespace clean) if (fun == "aFunction(TQString,int)") { @@ -65,13 +65,13 @@ bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data, } if (fun == "isAliveSlot(int)") { - qDebug("isAliveSlot(int)"); + tqDebug("isAliveSlot(int)"); bool connectResult = client->disconnectDCOPSignal("", objId(), "", objId(), "" ); - qDebug("disconnectDCOPSignal returns %s", connectResult ? "true" : "false"); + tqDebug("disconnectDCOPSignal returns %s", connectResult ? "true" : "false"); return true; } if (fun == "countDown()") { -qDebug("countDown() countDownAction = %p", countDownAction); +tqDebug("countDown() countDownAction = %p", countDownAction); if (countDownAction2) { replyType = "TQString"; @@ -100,7 +100,7 @@ qDebug("countDown() countDownAction = %p", countDownAction); void MyDCOPObject::slotTimeout() { - qDebug("MyDCOPObject::slotTimeout() %d", countDownCount); + tqDebug("MyDCOPObject::slotTimeout() %d", countDownCount); countDownCount--; if (countDownCount == 0) { @@ -119,7 +119,7 @@ void MyDCOPObject::slotTimeout() void MyDCOPObject::slotTimeout2() { - qDebug("MyDCOPObject::slotTimeout2() %d", countDownCount2); + tqDebug("MyDCOPObject::slotTimeout2() %d", countDownCount2); countDownCount2--; if (countDownCount2 == 0) { @@ -153,25 +153,25 @@ void TestObject::slotTimeout() { TQCString replyType; TQByteArray data, reply; - qWarning("#3 Calling countDown"); + tqWarning("#3 Calling countDown"); if (!client->call(m_app, "object1", "countDown()", data, replyType, reply)) - qDebug("#3 I couldn't call countDown"); + tqDebug("#3 I couldn't call countDown"); else - qDebug("#3 countDown() return type was '%s'", replyType.data() ); + tqDebug("#3 countDown() return type was '%s'", replyType.data() ); } void TestObject::slotCallBack(int callId, const TQCString &replyType, const TQByteArray &replyData) { - qWarning("Call Back! callId = %d", callId); - qWarning("Type = %s", replyType.data()); + tqWarning("Call Back! callId = %d", callId); + tqWarning("Type = %s", replyType.data()); TQDataStream args(replyData, IO_ReadOnly); TQString arg1; args >> arg1; - qWarning("Value = %s", arg1.latin1()); + tqWarning("Value = %s", arg1.latin1()); } #ifdef Q_OS_WIN @@ -190,12 +190,12 @@ int main(int argc, char **argv) { TQCString appId = argv[1]; TestObject obj(appId); - qWarning("#1 Calling countDown"); + tqWarning("#1 Calling countDown"); int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); - qDebug("#1 countDown() call id = %d", result); - qWarning("#2 Calling countDown"); + tqDebug("#1 countDown() call id = %d", result); + tqWarning("#2 Calling countDown"); result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); - qDebug("#2 countDown() call id = %d", result); + tqDebug("#2 countDown() call id = %d", result); app.exec(); return 0; @@ -204,10 +204,10 @@ int main(int argc, char **argv) // client->attach(); // attach to the server, now we can use DCOP service client->registerAs( app.name(), false ); // register at the server, now others can call us. - qDebug("I registered as '%s'", client->appId().data() ); + tqDebug("I registered as '%s'", client->appId().data() ); if ( client->isApplicationRegistered( app.name() ) ) - qDebug("indeed, we are registered!"); + tqDebug("indeed, we are registered!"); TQDataStream dataStream( data, IO_WriteOnly ); dataStream << (int) 43; @@ -216,23 +216,23 @@ int main(int argc, char **argv) MyDCOPObject *obj1 = new MyDCOPObject("object1"); bool connectResult = client->connectDCOPSignal("", "alive(int , TQCString)", "object1", "isAliveSlot(int)", false); - qDebug("connectDCOPSignal returns %s", connectResult ? "true" : "false"); + tqDebug("connectDCOPSignal returns %s", connectResult ? "true" : "false"); TQDataStream ds(data, IO_WriteOnly); ds << TQString("fourty-two") << 42; if (!client->call(app.name(), "object1", "aFunction(TQString,int)", data, replyType, reply)) { - qDebug("I couldn't call myself"); + tqDebug("I couldn't call myself"); assert( 0 ); } else { - qDebug("return type was '%s'", replyType.data() ); + tqDebug("return type was '%s'", replyType.data() ); assert( replyType == "void" ); } client->send(app.name(), "object1", "aFunction(TQString,int)", data ); int n = client->registeredApplications().count(); - qDebug("number of attached applications = %d", n ); + tqDebug("number of attached applications = %d", n ); TQObject::connect( client, TQT_SIGNAL( applicationRegistered( const TQCString&)), obj1, TQT_SLOT( registered( const TQCString& ))); @@ -249,46 +249,46 @@ int main(int argc, char **argv) // Find a object called "object1" in any application that // meets the criteria "canLaunchRockets()" // bool boolResult = client->findObject( "", "object1", "canLaunchRockets()", data, foundApp, foundObj); -// qDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", +// tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", // foundApp.data(), foundObj.data()); // Find an application that matches with "konqueror*" bool boolResult = client->findObject( "konqueror*", "", "", data, foundApp, foundObj); - qDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", + tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", foundApp.data(), foundObj.data()); // Find an object called "object1" in any application. boolResult = client->findObject( "", "ksycoca", "", data, foundApp, foundObj); - qDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", + tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", foundApp.data(), foundObj.data()); // Find ourselves in any application. boolResult = client->findObject( "testdcop", "ksycoca", "", data, foundApp, foundObj); - qDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", + tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", foundApp.data(), foundObj.data()); DCOPClient *client2 = new DCOPClient(); client2->registerAs(app.name(), false); - qDebug("I2 registered as '%s'", client2->appId().data() ); + tqDebug("I2 registered as '%s'", client2->appId().data() ); -qDebug("Sending to object1"); +tqDebug("Sending to object1"); client2->send(app.name(), "object1", "aFunction(TQString,int)", data ); -qDebug("Calling object1"); +tqDebug("Calling object1"); if (!client2->call(app.name(), "object1", "aFunction(TQString,int)", data, replyType, reply)) - qDebug("I couldn't call myself"); + tqDebug("I couldn't call myself"); else - qDebug("return type was '%s'", replyType.data() ); + tqDebug("return type was '%s'", replyType.data() ); -qDebug("Calling countDown() in object1"); +tqDebug("Calling countDown() in object1"); if (!client2->call(app.name(), "object1", "countDown()", data, replyType, reply)) - qDebug("I couldn't call myself"); + tqDebug("I couldn't call myself"); else - qDebug("return type was '%s'", replyType.data() ); + tqDebug("return type was '%s'", replyType.data() ); // Find ourselves in any application. boolResult = client2->findObject( "testdcop", "object1", "", data, foundApp, foundObj); - qDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", + tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", foundApp.data(), foundObj.data()); client->detach(); diff --git a/dcop/testdcop.h b/dcop/testdcop.h index 936632b55..aede0f98e 100644 --- a/dcop/testdcop.h +++ b/dcop/testdcop.h @@ -63,7 +63,7 @@ public: MyDCOPObject(const TQCString &name) : DCOPObject(name) {} bool process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData); - void function(const TQString &arg1, int arg2) { qDebug("function got arg: %s and %d", arg1.utf8().data(), arg2); } + void function(const TQString &arg1, int arg2) { tqDebug("function got arg: %s and %d", arg1.utf8().data(), arg2); } public slots: void slotTimeout(); void slotTimeout2(); diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp index 147d2a748..0c9513305 100644 --- a/dcop/tests/driver.cpp +++ b/dcop/tests/driver.cpp @@ -50,7 +50,7 @@ void Driver::test() int main(int argc, char** argv) { - if ( argc < 2 ) { qWarning("Usage: driver "); return 1; } + if ( argc < 2 ) { tqWarning("Usage: driver "); return 1; } const char* appname = strdup( argv[ 1 ] ); argv[ 1 ] = 0; // sue me KCmdLineArgs::init( argc, argv, "TestAppDriver", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME -- cgit v1.2.3