diff options
Diffstat (limited to 'dcop')
35 files changed, 344 insertions, 374 deletions
diff --git a/dcop/HOWTO b/dcop/HOWTO index dedcf97dd..344ed82d1 100644 --- a/dcop/HOWTO +++ b/dcop/HOWTO @@ -169,8 +169,8 @@ if (!client->call("someAppId", "fooObject/barObject", "doIt(int)", tqDebug("there was some error using DCOP."); else { QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QString") { - QString result; + if (replyType == "TQString") { + TQString result; reply >> result; print("the result is: %s",result.latin1()); } else @@ -190,7 +190,7 @@ Receiving Data via DCOP: Currently the only real way to receive data from DCOP is to multiply inherit from the normal class that you are inheriting (usually some -sort of QWidget subclass or QObject) as well as the DCOPObject class. +sort of TQWidget subclass or TQObject) as well as the DCOPObject class. DCOPObject provides one very important method: DCOPObject::process(). This is a pure virtual method that you must implement in order to process DCOP messages that you receive. It takes a function @@ -210,10 +210,10 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, QDataStream arg(data, IO_ReadOnly); int i; // parameter arg >> i; - QString result = self->doIt (i); + TQString result = self->doIt (i); QDataStream reply(replyData, IO_WriteOnly); reply << result; - replyType = "QString"; + replyType = "TQString"; return true; } else { tqDebug("unknown function call to BarObject::process()"); @@ -244,7 +244,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, QDataStream arg(data, IO_ReadOnly); int i; // parameter arg >> i; - QString result = self->doIt(i); + TQString result = self->doIt(i); DCOPClientTransaction *myTransaction; myTransaction = kapp->dcopClient()->beginTransaction(); @@ -260,9 +260,9 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, } } -slotProcessingDone(DCOPClientTransaction *myTransaction, const QString &result) +slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result) { - QCString replyType = "QString"; + QCString replyType = "TQString"; QByteArray replyData; QDataStream reply(replyData, IO_WriteOnly); reply << result; @@ -358,7 +358,7 @@ class MyInterface : virtual public DCOPObject k_dcop: - virtual ASYNC myAsynchronousMethod(QString someParameter) = 0; + virtual ASYNC myAsynchronousMethod(TQString someParameter) = 0; virtual QRect mySynchronousMethod() = 0; }; @@ -385,19 +385,19 @@ but virtual, not pure virtual. Example: -class MyClass: public QObject, virtual public MyInterface +class MyClass: public TQObject, virtual public MyInterface { - Q_OBJECT + TQ_OBJECT public: MyClass(); ~MyClass(); - ASYNC myAsynchronousMethod(QString someParameter); + ASYNC myAsynchronousMethod(TQString someParameter); QRect mySynchronousMethod(); }; -Note: (Qt issue) Remember that if you are inheriting from QObject, you must +Note: (Qt issue) Remember that if you are inheriting from TQObject, you must place it first in the list of inherited classes. In the implementation of your class' ctor, you must explicitly initialize @@ -408,7 +408,7 @@ the interface which your are implementing. Example: MyClass::MyClass() - : QObject(), + : TQObject(), DCOPObject("MyInterface") { // whatever... @@ -419,7 +419,7 @@ exactly the same as you would normally. Example: -void MyClass::myAsynchronousMethod(QString someParameter) +void MyClass::myAsynchronousMethod(TQString someParameter) { tqDebug("myAsyncMethod called with param `" + someParameter + "'"); } @@ -429,9 +429,9 @@ It is not necessary (though very clean) to define an interface as an abstract class of its own, like we did in the example above. We could just as well have defined a k_dcop section directly within MyClass: -class MyClass: public QObject, virtual public DCOPObject +class MyClass: public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: @@ -439,7 +439,7 @@ class MyClass: public QObject, virtual public DCOPObject ~MyClass(); k_dcop: - ASYNC myAsynchronousMethod(QString someParameter); + ASYNC myAsynchronousMethod(TQString someParameter); QRect mySynchronousMethod(); }; diff --git a/dcop/KDE-ICE/ICElibint.h b/dcop/KDE-ICE/ICElibint.h index f36ab7acc..268b664db 100644 --- a/dcop/KDE-ICE/ICElibint.h +++ b/dcop/KDE-ICE/ICElibint.h @@ -27,7 +27,7 @@ Author: Ralph Mor, X Consortium #define _ICELIBINT_H_ #include "config.h" -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xos.h> #include <X11/Xfuncs.h> #include <X11/Xmd.h> //schroder diff --git a/dcop/KDE-ICE/ICEproto.h b/dcop/KDE-ICE/ICEproto.h index f66b86ac0..471b80314 100644 --- a/dcop/KDE-ICE/ICEproto.h +++ b/dcop/KDE-ICE/ICEproto.h @@ -27,7 +27,7 @@ Author: Ralph Mor, X Consortium #define _ICEPROTO_H_ #include "config.h" -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xmd.h> #else #if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) diff --git a/dcop/KDE-ICE/Xtrans.h b/dcop/KDE-ICE/Xtrans.h index 95c817fa1..08d28966f 100644 --- a/dcop/KDE-ICE/Xtrans.h +++ b/dcop/KDE-ICE/Xtrans.h @@ -51,7 +51,7 @@ from The Open Group. #define _XTRANS_H_ #include "config.h" -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xfuncproto.h> #include <X11/Xos.h> #else diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox index 62fd3cf44..ca596022c 100644 --- a/dcop/Mainpage.dox +++ b/dcop/Mainpage.dox @@ -134,8 +134,8 @@ if (!client->call("someAppId", "fooObject/barObject", "doIt(int)", tqDebug("there was some error using DCOP."); else { QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QString") { - QString result; + if (replyType == "TQString") { + TQString result; reply >> result; print("the result is: %s",result.latin1()); } else @@ -148,7 +148,7 @@ else { Currently the only real way to receive data from DCOP is to multiply inherit from the normal class that you are inheriting (usually some -sort of QWidget subclass or QObject) as well as the DCOPObject class. +sort of TQWidget subclass or TQObject) as well as the DCOPObject class. DCOPObject provides one very important method: DCOPObject::process(). This is a pure virtual method that you must implement in order to process DCOP messages that you receive. It takes a function @@ -169,10 +169,10 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, QDataStream arg(data, IO_ReadOnly); int i; // parameter arg >> i; - QString result = self->doIt (i); + TQString result = self->doIt (i); QDataStream reply(replyData, IO_WriteOnly); reply << result; - replyType = "QString"; + replyType = "TQString"; return true; } else { tqDebug("unknown function call to BarObject::process()"); @@ -205,7 +205,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, QDataStream arg(data, IO_ReadOnly); int i; // parameter arg >> i; - QString result = self->doIt(i); + TQString result = self->doIt(i); DCOPClientTransaction *myTransaction; myTransaction = kapp->dcopClient()->beginTransaction(); @@ -221,9 +221,9 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, } } -slotProcessingDone(DCOPClientTransaction *myTransaction, const QString &result) +slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result) { - QCString replyType = "QString"; + QCString replyType = "TQString"; QByteArray replyData; QDataStream reply(replyData, IO_WriteOnly); reply << result; @@ -260,7 +260,7 @@ class MyInterface : virtual public DCOPObject k_dcop: - virtual ASYNC myAsynchronousMethod(QString someParameter) = 0; + virtual ASYNC myAsynchronousMethod(TQString someParameter) = 0; virtual QRect mySynchronousMethod() = 0; }; @@ -289,19 +289,19 @@ but virtual, not pure virtual. Example: \code -class MyClass: public QObject, virtual public MyInterface +class MyClass: public TQObject, virtual public MyInterface { - Q_OBJECT + TQ_OBJECT public: MyClass(); ~MyClass(); - ASYNC myAsynchronousMethod(QString someParameter); + ASYNC myAsynchronousMethod(TQString someParameter); QRect mySynchronousMethod(); }; \endcode -\note (Qt issue) Remember that if you are inheriting from QObject, you must +\note (Qt issue) Remember that if you are inheriting from TQObject, you must place it first in the list of inherited classes. In the implementation of your class' ctor, you must explicitly initialize @@ -313,7 +313,7 @@ Example: \code MyClass::MyClass() - : QObject(), + : TQObject(), DCOPObject("MyInterface") { // whatever... @@ -327,7 +327,7 @@ exactly the same as you would normally. Example: \code -void MyClass::myAsynchronousMethod(QString someParameter) +void MyClass::myAsynchronousMethod(TQString someParameter) { tqDebug("myAsyncMethod called with param `" + someParameter + "'"); } @@ -338,9 +338,9 @@ abstract class of its own, like we did in the example above. We could just as well have defined a k_dcop section directly within MyClass: \code -class MyClass: public QObject, virtual public DCOPObject +class MyClass: public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: @@ -348,7 +348,7 @@ class MyClass: public QObject, virtual public DCOPObject ~MyClass(); k_dcop: - ASYNC myAsynchronousMethod(QString someParameter); + ASYNC myAsynchronousMethod(TQString someParameter); QRect mySynchronousMethod(); }; \endcode diff --git a/dcop/client/README.dcop b/dcop/client/README.dcop index e352cb439..b20a9d2c0 100644 --- a/dcop/client/README.dcop +++ b/dcop/client/README.dcop @@ -43,10 +43,10 @@ error message is printed to stderr and the command exits with exit-code '2'. The default selection criteria is "any". Applications can declare their own select_func as they see fit, e.g. konqueror could declare -"isDoingProtocol(QString protocol)" and then the following command would +"isDoingProtocol(TQString protocol)" and then the following command would select a konqueror mainwindow that is currently handling the help-protocol: - "dcopfind 'konqueror*' 'konqueror-mainwindow*' 'isDoingProtocol(QString + "dcopfind 'konqueror*' 'konqueror-mainwindow*' 'isDoingProtocol(TQString protocol)' help" diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp index a07f6a41a..6a395c222 100644 --- a/dcop/client/dcop.cpp +++ b/dcop/client/dcop.cpp @@ -47,7 +47,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "marshall.cpp" -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xatom.h> #endif @@ -429,7 +429,7 @@ TQStringList dcopSessionList( const TQString &user, const TQString &home ) void sendUserTime( const char* app ) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 static unsigned long time = 0; if( time == 0 ) { diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp index 68e3e3f57..64c10857d 100644 --- a/dcop/client/marshall.cpp +++ b/dcop/client/marshall.cpp @@ -145,34 +145,34 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) bool b; stream >> b; result = b ? "true" : "false"; - } else if ( type == TQSTRING_OBJECT_NAME_STRING ) + } else if ( type == "TQString" ) { TQString s; stream >> s; result = s.local8Bit(); - } else if ( type == TQCSTRING_OBJECT_NAME_STRING ) + } else if ( type == "TQCString" ) { stream >> result; } else if ( type == "QCStringList" ) { - return demarshal( stream, TQVALUELIST_OBJECT_NAME_STRING "<" TQCSTRING_OBJECT_NAME_STRING ">" ); - } else if ( type == TQSTRINGLIST_OBJECT_NAME_STRING ) + return demarshal( stream, "TQValueList" "<" "TQCString" ">" ); + } else if ( type == "TQStringList" ) { - return demarshal( stream, TQVALUELIST_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING ">" ); + return demarshal( stream, "TQValueList" "<" "TQString" ">" ); } else if ( type == "TQStringVariantMap" ) { - return demarshal(stream, TQMAP_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING "," TQVARIANT_OBJECT_NAME_STRING ">"); - } else if ( type == TQCOLOR_OBJECT_NAME_STRING ) + return demarshal(stream, "TQMap" "<" "TQString" "," "TQVariant" ">"); + } else if ( type == "TQColor" ) { TQColor c; stream >> c; result = TQString(c.name()).local8Bit(); - } else if ( type == TQSIZE_OBJECT_NAME_STRING ) + } else if ( type == "TQSize" ) { TQSize s; stream >> s; result.sprintf( "%dx%d", s.width(), s.height() ); - } else if ( type == TQPIXMAP_OBJECT_NAME_STRING || type == TQIMAGE_OBJECT_NAME_STRING ) + } else if ( type == "TQPixmap" || type == "TQImage" ) { TQImage i; stream >> i; @@ -181,17 +181,17 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) buf.open( IO_WriteOnly ); i.save( &buf, "XPM" ); result = buf.buffer(); - } else if ( type == TQPOINT_OBJECT_NAME_STRING ) + } else if ( type == "TQPoint" ) { TQPoint p; stream >> p; result.sprintf( "+%d+%d", p.x(), p.y() ); - } else if ( type == TQRECT_OBJECT_NAME_STRING ) + } else if ( type == "TQRect" ) { TQRect r; stream >> r; result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() ); - } else if ( type == TQVARIANT_OBJECT_NAME_STRING ) + } else if ( type == "TQVariant" ) { TQ_INT32 type; stream >> type; @@ -206,7 +206,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) KURL r; stream >> r; result = r.url().local8Bit(); - } else if ( type.left( 12 ) == TQVALUELIST_OBJECT_NAME_STRING "<" ) + } else if ( type.left( 12 ) == "TQValueList" "<" ) { if ( (uint)type.find( '>', 12 ) != type.length() - 1 ) return result; @@ -228,7 +228,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) if ( i < count - 1 ) result += '\n'; } - } else if ( type.left( 6 ) == TQMAP_OBJECT_NAME_STRING "<" ) + } else if ( type.left( 6 ) == "TQMap" "<" ) { int commaPos = type.find( ',', 6 ); @@ -281,11 +281,11 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) } TQString s = TQString::fromLocal8Bit( args[ i ] ); - if (type == TQSTRINGLIST_OBJECT_NAME_STRING) { - type = TQVALUELIST_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING ">"; + if (type == "TQStringList") { + type = "TQValueList" "<" "TQString" ">"; } if (type == "QCStringList") { - type = TQVALUELIST_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING ">"; + type = "TQValueList" "<" "TQString" ">"; } if ( type == "int" ) @@ -322,52 +322,52 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) arg << s.toDouble(); else if ( type == "bool" ) arg << mkBool( s ); - else if ( type == TQSTRING_OBJECT_NAME_STRING ) + else if ( type == "TQString" ) arg << s; - else if ( type == TQCSTRING_OBJECT_NAME_STRING ) + else if ( type == "TQCString" ) arg << TQCString( args[ i ] ); - else if ( type == TQCOLOR_OBJECT_NAME_STRING ) + else if ( type == "TQColor" ) arg << mkColor( s ); - else if ( type == TQPOINT_OBJECT_NAME_STRING ) + else if ( type == "TQPoint" ) arg << mkPoint( s ); - else if ( type == TQSIZE_OBJECT_NAME_STRING ) + else if ( type == "TQSize" ) arg << mkSize( s ); - else if ( type == TQRECT_OBJECT_NAME_STRING ) + else if ( type == "TQRect" ) arg << mkRect( s ); else if ( type == "KURL" ) arg << KURL( s ); - else if ( type == TQVARIANT_OBJECT_NAME_STRING ) { - int tqPointKeywordLength = strlen(TQPOINT_OBJECT_NAME_STRING); - int tqSizeKeywordLength = strlen(TQSIZE_OBJECT_NAME_STRING); - int tqRectKeywordLength = strlen(TQRECT_OBJECT_NAME_STRING); - int tqColorKeywordLength = strlen(TQCOLOR_OBJECT_NAME_STRING); + else if ( type == "TQVariant" ) { + int tqPointKeywordLength = strlen("TQPoint"); + int tqSizeKeywordLength = strlen("TQSize"); + int tqRectKeywordLength = strlen("TQRect"); + int tqColorKeywordLength = strlen("TQColor"); if ( s == "true" || s == "false" ) { arg << TQVariant( mkBool( s ) ); } else if ( s.left( 4 ) == "int(" ) { arg << TQVariant( s.mid(4, s.length()-5).toInt() ); } - else if ( s.left( (tqPointKeywordLength+1) ) == TQPOINT_OBJECT_NAME_STRING "(" ) { + else if ( s.left( (tqPointKeywordLength+1) ) == "TQPoint" "(" ) { arg << TQVariant( mkPoint( s.mid((tqPointKeywordLength+1), s.length()-(tqPointKeywordLength+2)) ) ); } - else if ( s.left( (tqSizeKeywordLength+1) ) == TQSIZE_OBJECT_NAME_STRING "(" ) { + else if ( s.left( (tqSizeKeywordLength+1) ) == "TQSize" "(" ) { arg << TQVariant( mkSize( s.mid((tqSizeKeywordLength+1), s.length()-(tqSizeKeywordLength+2)) ) ); } - else if ( s.left( (tqRectKeywordLength+1) ) == TQRECT_OBJECT_NAME_STRING "(" ) { + else if ( s.left( (tqRectKeywordLength+1) ) == "TQRect" "(" ) { arg << TQVariant( mkRect( s.mid((tqRectKeywordLength+1), s.length()-(tqRectKeywordLength+2)) ) ); } - else if ( s.left( (tqColorKeywordLength+1) ) == TQCOLOR_OBJECT_NAME_STRING "(" ) { + else if ( s.left( (tqColorKeywordLength+1) ) == "TQColor" "(" ) { arg << TQVariant( mkColor( s.mid((tqColorKeywordLength+1), s.length()-(tqColorKeywordLength+2)) ) ); } else { arg << TQVariant( s ); } - } else if ( type.startsWith(TQVALUELIST_OBJECT_NAME_STRING "<") || type == "KURL::List" ) { + } else if ( type.startsWith("TQValueList" "<") || type == "KURL::List" ) { if ( type == "KURL::List" ) { type = "KURL"; } else { - int tqValueListKeywordLength = strlen(TQVALUELIST_OBJECT_NAME_STRING); + int tqValueListKeywordLength = strlen("TQValueList"); type = type.mid((tqValueListKeywordLength+1), type.length() - (tqValueListKeywordLength+2)); } TQStringList list; diff --git a/dcop/dcop_deadlock_test.cpp b/dcop/dcop_deadlock_test.cpp index 1ab43f730..515aca6a1 100644 --- a/dcop/dcop_deadlock_test.cpp +++ b/dcop/dcop_deadlock_test.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. MyDCOPObject::MyDCOPObject(const TQCString &name, const TQCString &remoteName) : TQObject(0, name), DCOPObject(name), m_remoteName(remoteName) { - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data, @@ -47,7 +47,7 @@ TQCString& replyType, TQByteArray &replyData) gettimeofday(&tv, 0); tqWarning("%s: function('%s') %d:%06d", name(), m_remoteName.data(), tv.tv_sec % 100, tv.tv_usec); - replyType = TQSTRING_OBJECT_NAME_STRING; + replyType = "TQString"; TQDataStream reply( replyData, IO_WriteOnly ); reply << TQString("Hey"); m_timer.start(1000, true); diff --git a/dcop/dcop_deadlock_test.h b/dcop/dcop_deadlock_test.h index 461c53cba..a0ee25f19 100644 --- a/dcop/dcop_deadlock_test.h +++ b/dcop/dcop_deadlock_test.h @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class MyDCOPObject : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: MyDCOPObject(const TQCString &name, const TQCString &remoteName); bool process(const TQCString &fun, const TQByteArray &data, diff --git a/dcop/dcopc.c b/dcop/dcopc.c index 5f1818cae..0d34c7f4b 100644 --- a/dcop/dcopc.c +++ b/dcop/dcopc.c @@ -24,7 +24,7 @@ #include "config.h" #include <tqglobal.h> -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xlib.h> #include <X11/X.h> #include <X11/Xproto.h> diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index 5523365c8..8965b6062 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -50,6 +50,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdlib.h> #include <assert.h> #include <string.h> +#ifdef HAVE_UCRED_H +#include <ucred.h> +#endif /* HAVE_UCRED_H */ #include <tqguardedptr.h> #include <tqtextstream.h> @@ -65,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <dcopobject.h> -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xmd.h> #endif extern "C" { @@ -212,7 +215,7 @@ TQCString DCOPClient::iceauthPath() { #if defined(ICEAUTH_PATH) if ( -# if defined(Q_WS_WIN) +# if defined(TQ_WS_WIN) access(ICEAUTH_PATH, 0) == 0 # else access(ICEAUTH_PATH, X_OK) == 0 @@ -263,9 +266,9 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old) fprintf(stderr, "Aborting. $HOME is not set.\n"); exit(1); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQCString disp = getenv("DISPLAY"); -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) TQCString disp = getenv("QWS_DISPLAY"); #else TQCString disp; @@ -331,10 +334,10 @@ void DCOPClient::handleAsyncReply(ReplyStruct *replyStruct) { if (replyStruct->replyObject) { - TQObject::connect(this, TQT_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), + TQObject::connect(this, TQ_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), replyStruct->replyObject, replyStruct->replySlot); emit callBack(replyStruct->replyId, *(replyStruct->replyType), *(replyStruct->replyData)); - TQObject::disconnect(this, TQT_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), + TQObject::disconnect(this, TQ_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), replyStruct->replyObject, replyStruct->replySlot); } delete replyStruct; @@ -622,8 +625,8 @@ DCOPClient::DCOPClient() d->qt_bridge_enabled = true; d->transactionList = 0L; d->transactionId = 0; - TQObject::connect( &d->postMessageTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( processPostedMessagesInternal() ) ); - TQObject::connect( &d->eventLoopTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( eventLoopTimeout() ) ); + TQObject::connect( &d->postMessageTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( processPostedMessagesInternal() ) ); + TQObject::connect( &d->eventLoopTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( eventLoopTimeout() ) ); if ( !mainClient() ) setMainClient( this ); @@ -690,14 +693,14 @@ void DCOPClient::bindToApp() delete d->notifier; d->notifier = new TQSocketNotifier(socket(), TQSocketNotifier::Read, 0, 0); - TQObject::connect(d->notifier, TQT_SIGNAL(activated(int)), - TQT_SLOT(processSocketData(int))); + TQObject::connect(d->notifier, TQ_SIGNAL(activated(int)), + TQ_SLOT(processSocketData(int))); } } void DCOPClient::suspend() { -#ifdef Q_WS_WIN //TODO: remove (win32 ports sometimes do not create notifiers) +#ifdef TQ_WS_WIN //TODO: remove (win32 ports sometimes do not create notifiers) if (!d->notifier) return; #endif @@ -707,7 +710,7 @@ void DCOPClient::suspend() void DCOPClient::resume() { -#ifdef Q_WS_WIN //TODO: remove +#ifdef TQ_WS_WIN //TODO: remove if (!d->notifier) return; #endif @@ -717,14 +720,14 @@ void DCOPClient::resume() bool DCOPClient::isSuspended() const { -#if defined(Q_WS_WIN) || defined(Q_WS_MAC) //TODO: REMOVE +#if defined(TQ_WS_WIN) || defined(TQ_WS_MAC) //TODO: REMOVE if (!d->notifier) return false; #endif return !d->notifier->isEnabled(); } -#if defined(SO_PEERCRED) || defined(LOCAL_PEEREID) +#if defined(SO_PEERCRED) || defined(LOCAL_PEEREID) || defined(HAVE_GETPEERUCRED) #define USE_PEER_IS_US // Check whether the remote end is owned by the same user. static bool peerIsUs(int sockfd) @@ -745,6 +748,18 @@ static bool peerIsUs(int sockfd) if (getsockopt(sockfd, 0, LOCAL_PEEREID, &cred, &siz) != 0 || siz != sizeof(cred)) return false; return (cred.unp_euid == geteuid()); +#elif defined(HAVE_GETPEERUCRED) + ucred_t *cred = nullptr; + uint_t peer_uid; + + if (getpeerucred(sockfd, &cred) != 0) { + if (cred != nullptr) + ucred_free(cred); + return false; + } + peer_uid = ucred_geteuid(cred); + ucred_free(cred); + return (peer_uid == getuid()); #endif } #else @@ -806,7 +821,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName)); return false; } - int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file + int size = TQMIN( (long)1024, f.size() ); // protection against a huge file TQCString contents( size+1 ); if ( f.readBlock( contents.data(), size ) != size ) { @@ -1497,7 +1512,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const TQStrList lst = o->metaObject()->slotNames( true ); int i = 0; for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { - if ( o->metaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public ) + if ( o->metaObject()->slot( i++, true )->access != TQMetaData::Public ) continue; TQCString slot = it.current(); if ( slot.contains( "()" ) ) { @@ -1841,7 +1856,7 @@ int DCOPClient::callAsync(const TQCString &remApp, const TQCString &remObjId, if (replyStruct->transactionId == 0) { // Call is finished already - TQTimer::singleShot(0, this, TQT_SLOT(asyncReplyReady())); + TQTimer::singleShot(0, this, TQ_SLOT(asyncReplyReady())); d->asyncReplyQueue.append(replyStruct); } diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h index 4cb4b2f6e..af7e27557 100644 --- a/dcop/dcopclient.h +++ b/dcop/dcopclient.h @@ -67,7 +67,7 @@ typedef TQValueList<TQCString> QCStringList; */ class DCOP_EXPORT DCOPClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -448,7 +448,7 @@ class DCOP_EXPORT DCOPClient : public TQObject */ bool connectDCOPSignal( const TQCString &sender, const TQCString &signal, const TQCString &receiverObj, const TQCString &slot, - bool Volatile) KDE_DEPRECATED; + bool Volatile) TDE_DEPRECATED; /** * Disconnects a DCOP signal. @@ -476,7 +476,7 @@ class DCOP_EXPORT DCOPClient : public TQObject * For backwards compatibility */ bool disconnectDCOPSignal( const TQCString &sender, const TQCString &signal, - const TQCString &receiverObj, const TQCString &slot) KDE_DEPRECATED; + const TQCString &receiverObj, const TQCString &slot) TDE_DEPRECATED; /** * Reimplement this function to handle app-wide function calls unassociated w/an object. @@ -739,7 +739,7 @@ class DCOP_EXPORT DCOPClient : public TQObject * For backwards compatibility with KDE 2.x * // KDE4 remove */ - static TQCString dcopServerFileOld(const TQCString &hostname=0) KDE_DEPRECATED; + static TQCString dcopServerFileOld(const TQCString &hostname=0) TDE_DEPRECATED; /** * Return the path of iceauth or an empty string if not found. diff --git a/dcop/dcopglobal.h b/dcop/dcopglobal.h index 559037d2f..f8bf78789 100644 --- a/dcop/dcopglobal.h +++ b/dcop/dcopglobal.h @@ -37,8 +37,7 @@ #define DCOPReplyDelayed 6 #define DCOPFind 7 -#define INT32 QINT32 -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xmd.h> #endif diff --git a/dcop/dcopidl/dcopidl_output.kidl b/dcop/dcopidl/dcopidl_output.kidl index 678ff6732..a0ffc5353 100644 --- a/dcop/dcopidl/dcopidl_output.kidl +++ b/dcop/dcopidl/dcopidl_output.kidl @@ -8,13 +8,13 @@ <LINK_SCOPE>TDEUI_EXPORT</LINK_SCOPE> <SUPER>MyNamespace::MyParentClass</SUPER> <SUPER>DCOPObject</SUPER> - <SUPER>QValueList<<TYPE>QString</TYPE>></SUPER> + <SUPER>QValueList<<TYPE>TQString</TYPE>></SUPER> <FUNC> - <TYPE>QString</TYPE> + <TYPE>TQString</TYPE> <NAME>url</NAME> </FUNC> <FUNC qual="const"> - <TYPE>QString</TYPE> + <TYPE>TQString</TYPE> <NAME>constTest</NAME> </FUNC> <FUNC> diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll index 302da3e14..710cbc3f4 100644 --- a/dcop/dcopidl/scanner.ll +++ b/dcop/dcopidl/scanner.ll @@ -235,7 +235,6 @@ FALSE return T_FALSE; "k_dcop_signals" return T_DCOP_SIGNAL_AREA; 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; diff --git a/dcop/dcopidl/yacc.cpp b/dcop/dcopidl/yacc.cpp index 9a58cefc9..ada46126c 100644 --- a/dcop/dcopidl/yacc.cpp +++ b/dcop/dcopidl/yacc.cpp @@ -113,14 +113,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern int yylex(); -// extern QString idl_lexFile; +// extern TQString idl_lexFile; extern int idl_line_no; extern int function_mode; static int dcop_area = 0; static int dcop_signal_area = 0; -static QString in_namespace( "" ); +static TQString in_namespace( "" ); void dcopidlInitFlex( const char *_code ); @@ -238,7 +238,7 @@ typedef union YYSTYPE #line 67 "yacc.yy" long _int; - QString *_str; + TQString *_str; unsigned short _char; double _float; @@ -2096,7 +2096,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 308 "yacc.yy" { - QString* tmp = new QString( "%1::%2" ); + TQString* tmp = new TQString( "%1::%2" ); *tmp = tmp->arg(*((yyvsp[(1) - (3)]._str))).arg(*((yyvsp[(3) - (3)]._str))); (yyval._str) = tmp; ;} @@ -2107,7 +2107,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 317 "yacc.yy" { - QString* tmp = new QString( " <SUPER>%1</SUPER>\n" ); + TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" ); *tmp = tmp->arg( *((yyvsp[(1) - (1)]._str)) ); (yyval._str) = tmp; ;} @@ -2118,7 +2118,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 323 "yacc.yy" { - QString* tmp = new QString( " <SUPER>%1</SUPER>\n" ); + TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" ); *tmp = tmp->arg( *((yyvsp[(1) - (4)]._str)) + "<" + *((yyvsp[(3) - (4)]._str)) + ">" ); (yyval._str) = tmp; ;} @@ -2157,7 +2157,7 @@ yyreduce: #line 347 "yacc.yy" { /* $$ = $1; */ - (yyval._str) = new QString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); + (yyval._str) = new TQString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); ;} break; @@ -2175,7 +2175,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 359 "yacc.yy" { - (yyval._str) = new QString( "" ); + (yyval._str) = new TQString( "" ); ;} break; @@ -2192,7 +2192,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 373 "yacc.yy" { - (yyval._str) = new QString( "" ); + (yyval._str) = new TQString( "" ); ;} break; @@ -2201,7 +2201,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 377 "yacc.yy" { - (yyval._str) = new QString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) ); + (yyval._str) = new TQString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) ); ;} break; @@ -2210,7 +2210,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 381 "yacc.yy" { - (yyval._str) = new QString( *((yyvsp[(2) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); + (yyval._str) = new TQString( *((yyvsp[(2) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); ;} break; @@ -2219,7 +2219,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 385 "yacc.yy" { - (yyval._str) = new QString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) ); + (yyval._str) = new TQString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) ); ;} break; @@ -2416,11 +2416,11 @@ yyreduce: #line 475 "yacc.yy" { if (dcop_area) { - QString* tmp = new QString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n"); + TQString* tmp = new TQString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n"); *tmp = tmp->arg( *((yyvsp[(6) - (7)]._str)) ).arg( *((yyvsp[(2) - (7)]._str)) ).arg( *((yyvsp[(4) - (7)]._str)) ); (yyval._str) = tmp; } else { - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); } ;} break; @@ -2457,140 +2457,140 @@ yyreduce: /* Line 1455 of yacc.c */ #line 503 "yacc.yy" - { (yyval._str) = new QString("signed int"); ;} + { (yyval._str) = new TQString("signed int"); ;} break; case 90: /* Line 1455 of yacc.c */ #line 504 "yacc.yy" - { (yyval._str) = new QString("signed int"); ;} + { (yyval._str) = new TQString("signed int"); ;} break; case 91: /* Line 1455 of yacc.c */ #line 505 "yacc.yy" - { (yyval._str) = new QString("unsigned int"); ;} + { (yyval._str) = new TQString("unsigned int"); ;} break; case 92: /* Line 1455 of yacc.c */ #line 506 "yacc.yy" - { (yyval._str) = new QString("unsigned int"); ;} + { (yyval._str) = new TQString("unsigned int"); ;} break; case 93: /* Line 1455 of yacc.c */ #line 507 "yacc.yy" - { (yyval._str) = new QString("signed short int"); ;} + { (yyval._str) = new TQString("signed short int"); ;} break; case 94: /* Line 1455 of yacc.c */ #line 508 "yacc.yy" - { (yyval._str) = new QString("signed short int"); ;} + { (yyval._str) = new TQString("signed short int"); ;} break; case 95: /* Line 1455 of yacc.c */ #line 509 "yacc.yy" - { (yyval._str) = new QString("signed long int"); ;} + { (yyval._str) = new TQString("signed long int"); ;} break; case 96: /* Line 1455 of yacc.c */ #line 510 "yacc.yy" - { (yyval._str) = new QString("signed long int"); ;} + { (yyval._str) = new TQString("signed long int"); ;} break; case 97: /* Line 1455 of yacc.c */ #line 511 "yacc.yy" - { (yyval._str) = new QString("unsigned short int"); ;} + { (yyval._str) = new TQString("unsigned short int"); ;} break; case 98: /* Line 1455 of yacc.c */ #line 512 "yacc.yy" - { (yyval._str) = new QString("unsigned short int"); ;} + { (yyval._str) = new TQString("unsigned short int"); ;} break; case 99: /* Line 1455 of yacc.c */ #line 513 "yacc.yy" - { (yyval._str) = new QString("unsigned long int"); ;} + { (yyval._str) = new TQString("unsigned long int"); ;} break; case 100: /* Line 1455 of yacc.c */ #line 514 "yacc.yy" - { (yyval._str) = new QString("unsigned long int"); ;} + { (yyval._str) = new TQString("unsigned long int"); ;} break; case 101: /* Line 1455 of yacc.c */ #line 515 "yacc.yy" - { (yyval._str) = new QString("int"); ;} + { (yyval._str) = new TQString("int"); ;} break; case 102: /* Line 1455 of yacc.c */ #line 516 "yacc.yy" - { (yyval._str) = new QString("long int"); ;} + { (yyval._str) = new TQString("long int"); ;} break; case 103: /* Line 1455 of yacc.c */ #line 517 "yacc.yy" - { (yyval._str) = new QString("long int"); ;} + { (yyval._str) = new TQString("long int"); ;} break; case 104: /* Line 1455 of yacc.c */ #line 518 "yacc.yy" - { (yyval._str) = new QString("short int"); ;} + { (yyval._str) = new TQString("short int"); ;} break; case 105: /* Line 1455 of yacc.c */ #line 519 "yacc.yy" - { (yyval._str) = new QString("short int"); ;} + { (yyval._str) = new TQString("short int"); ;} break; case 106: /* Line 1455 of yacc.c */ #line 520 "yacc.yy" - { (yyval._str) = new QString("char"); ;} + { (yyval._str) = new TQString("char"); ;} break; case 107: /* Line 1455 of yacc.c */ #line 521 "yacc.yy" - { (yyval._str) = new QString("signed char"); ;} + { (yyval._str) = new TQString("signed char"); ;} break; case 108: /* Line 1455 of yacc.c */ #line 522 "yacc.yy" - { (yyval._str) = new QString("unsigned char"); ;} + { (yyval._str) = new TQString("unsigned char"); ;} break; case 111: @@ -2598,7 +2598,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 532 "yacc.yy" { - (yyval._str) = new QString( "" ); + (yyval._str) = new TQString( "" ); ;} break; @@ -2607,7 +2607,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 537 "yacc.yy" { - (yyval._str) = new QString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); + (yyval._str) = new TQString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); ;} break; @@ -2637,7 +2637,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 548 "yacc.yy" { - QString *tmp = new QString("%1<%2>"); + TQString *tmp = new TQString("%1<%2>"); *tmp = tmp->arg(*((yyvsp[(1) - (4)]._str))); *tmp = tmp->arg(*((yyvsp[(3) - (4)]._str))); (yyval._str) = tmp; @@ -2649,7 +2649,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 554 "yacc.yy" { - QString *tmp = new QString("%1<%2>::%3"); + TQString *tmp = new TQString("%1<%2>::%3"); *tmp = tmp->arg(*((yyvsp[(1) - (6)]._str))); *tmp = tmp->arg(*((yyvsp[(3) - (6)]._str))); *tmp = tmp->arg(*((yyvsp[(6) - (6)]._str))); @@ -2662,7 +2662,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 566 "yacc.yy" { - (yyval._str) = new QString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str))); + (yyval._str) = new TQString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str))); ;} break; @@ -2710,7 +2710,7 @@ yyreduce: #line 596 "yacc.yy" { if (dcop_area) { - QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); + TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); *tmp = tmp->arg( *((yyvsp[(2) - (3)]._str)) ); (yyval._str) = tmp; } @@ -2722,7 +2722,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 603 "yacc.yy" { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *((yyvsp[(2) - (2)]._str)) ); (yyval._str) = tmp; ;} @@ -2733,7 +2733,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 608 "yacc.yy" { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *((yyvsp[(1) - (2)]._str)) ); (yyval._str) = tmp; ;} @@ -2745,7 +2745,7 @@ yyreduce: #line 613 "yacc.yy" { if (dcop_area) { - QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); + TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); *tmp = tmp->arg( *((yyvsp[(1) - (3)]._str)) ); (yyval._str) = tmp; } @@ -2767,7 +2767,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 625 "yacc.yy" { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *((yyvsp[(1) - (1)]._str)) ); (yyval._str) = tmp; ;} @@ -2788,7 +2788,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 639 "yacc.yy" { - (yyval._str) = new QString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str))); + (yyval._str) = new TQString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str))); ;} break; @@ -2807,11 +2807,11 @@ yyreduce: #line 650 "yacc.yy" { if (dcop_area) { - QString* tmp = new QString("\n <ARG>%1<NAME>%2</NAME></ARG>"); + TQString* tmp = new TQString("\n <ARG>%1<NAME>%2</NAME></ARG>"); *tmp = tmp->arg( *((yyvsp[(1) - (3)]._str)) ); *tmp = tmp->arg( *((yyvsp[(2) - (3)]._str)) ); (yyval._str) = tmp; - } else (yyval._str) = new QString(); + } else (yyval._str) = new TQString(); ;} break; @@ -2821,10 +2821,10 @@ yyreduce: #line 659 "yacc.yy" { if (dcop_area) { - QString* tmp = new QString("\n <ARG>%1</ARG>"); + TQString* tmp = new TQString("\n <ARG>%1</ARG>"); *tmp = tmp->arg( *((yyvsp[(1) - (2)]._str)) ); (yyval._str) = tmp; - } else (yyval._str) = new QString(); + } else (yyval._str) = new TQString(); ;} break; @@ -2835,7 +2835,7 @@ yyreduce: { if (dcop_area) yyerror("variable arguments not supported in dcop area."); - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -2923,8 +2923,8 @@ yyreduce: #line 716 "yacc.yy" { if (dcop_area || dcop_signal_area) { - QString* tmp = 0; - tmp = new QString( + TQString* tmp = 0; + tmp = new TQString( " <%4>\n" " %2\n" " <NAME>%1</NAME>" @@ -2934,13 +2934,13 @@ yyreduce: *tmp = tmp->arg( *((yyvsp[(1) - (6)]._str)) ); *tmp = tmp->arg( *((yyvsp[(4) - (6)]._str)) ); - QString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC"; - QString attr = ((yyvsp[(6) - (6)]._int)) ? " qual=\"const\"" : ""; - *tmp = tmp->arg( QString("%1%2").arg(tagname).arg(attr) ); - *tmp = tmp->arg( QString("%1").arg(tagname) ); + TQString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC"; + TQString attr = ((yyvsp[(6) - (6)]._int)) ? " qual=\"const\"" : ""; + *tmp = tmp->arg( TQString("%1%2").arg(tagname).arg(attr) ); + *tmp = tmp->arg( TQString("%1").arg(tagname) ); (yyval._str) = tmp; } else - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -2951,7 +2951,7 @@ yyreduce: { if (dcop_area) yyerror("operators aren't allowed in dcop areas!"); - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -3031,7 +3031,7 @@ yyreduce: { /* The constructor */ assert(!dcop_area); - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -3042,7 +3042,7 @@ yyreduce: { /* The constructor */ assert(!dcop_area); - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -3053,7 +3053,7 @@ yyreduce: { /* The destructor */ assert(!dcop_area); - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -3068,7 +3068,7 @@ yyreduce: else yyerror("DCOP functions cannot be static"); } else { - (yyval._str) = new QString(); + (yyval._str) = new TQString(); } ;} break; diff --git a/dcop/dcopidl/yacc.cpp.h b/dcop/dcopidl/yacc.cpp.h index 2a6c1b403..5bbacfa1f 100644 --- a/dcop/dcopidl/yacc.cpp.h +++ b/dcop/dcopidl/yacc.cpp.h @@ -116,7 +116,7 @@ typedef union YYSTYPE #line 67 "yacc.yy" long _int; - QString *_str; + TQString *_str; unsigned short _char; double _float; diff --git a/dcop/dcopidl/yacc.yy b/dcop/dcopidl/yacc.yy index ac744e902..82d5fc333 100644 --- a/dcop/dcopidl/yacc.yy +++ b/dcop/dcopidl/yacc.yy @@ -42,14 +42,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern int yylex(); -// extern QString idl_lexFile; +// extern TQString idl_lexFile; extern int idl_line_no; extern int function_mode; static int dcop_area = 0; static int dcop_signal_area = 0; -static QString in_namespace( "" ); +static TQString in_namespace( "" ); void dcopidlInitFlex( const char *_code ); @@ -66,7 +66,7 @@ void yyerror( const char *s ) %union { long _int; - QString *_str; + TQString *_str; unsigned short _char; double _float; } @@ -306,7 +306,7 @@ Identifier $$ = $1; } | T_IDENTIFIER T_SCOPE Identifier { - QString* tmp = new QString( "%1::%2" ); + TQString* tmp = new TQString( "%1::%2" ); *tmp = tmp->arg(*($1)).arg(*($3)); $$ = tmp; } @@ -315,13 +315,13 @@ Identifier super_class_name : Identifier { - QString* tmp = new QString( " <SUPER>%1</SUPER>\n" ); + TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" ); *tmp = tmp->arg( *($1) ); $$ = tmp; } | Identifier T_LESS type_list T_GREATER { - QString* tmp = new QString( " <SUPER>%1</SUPER>\n" ); + TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" ); *tmp = tmp->arg( *($1) + "<" + *($3) + ">" ); $$ = tmp; } @@ -346,7 +346,7 @@ super_classes | super_class T_COMMA super_classes { /* $$ = $1; */ - $$ = new QString( *($1) + *($3) ); + $$ = new TQString( *($1) + *($3) ); } ; @@ -357,7 +357,7 @@ class_header } | T_LEFT_CURLY_BRACKET { - $$ = new QString( "" ); + $$ = new TQString( "" ); } ; @@ -371,19 +371,19 @@ opt_semicolon body : T_RIGHT_CURLY_BRACKET { - $$ = new QString( "" ); + $$ = new TQString( "" ); } | typedef body { - $$ = new QString( *($1) + *($2) ); + $$ = new TQString( *($1) + *($2) ); } | T_INLINE function body { - $$ = new QString( *($2) + *($3) ); + $$ = new TQString( *($2) + *($3) ); } | function body { - $$ = new QString( *($1) + *($2) ); + $$ = new TQString( *($1) + *($2) ); } | dcop_signal_area_begin body { @@ -474,11 +474,11 @@ typedef : T_TYPEDEF Identifier T_LESS type_list T_GREATER Identifier T_SEMICOLON { if (dcop_area) { - QString* tmp = new QString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n"); + TQString* tmp = new TQString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n"); *tmp = tmp->arg( *($6) ).arg( *($2) ).arg( *($4) ); $$ = tmp; } else { - $$ = new QString(""); + $$ = new TQString(""); } } | T_TYPEDEF Identifier T_LESS type_list T_GREATER T_SCOPE T_IDENTIFIER Identifier T_SEMICOLON @@ -500,26 +500,26 @@ const_qualifier ; int_type - : T_SIGNED { $$ = new QString("signed int"); } - | T_SIGNED T_INT { $$ = new QString("signed int"); } - | T_UNSIGNED { $$ = new QString("unsigned int"); } - | T_UNSIGNED T_INT { $$ = new QString("unsigned int"); } - | T_SIGNED T_SHORT { $$ = new QString("signed short int"); } - | T_SIGNED T_SHORT T_INT { $$ = new QString("signed short int"); } - | T_SIGNED T_LONG { $$ = new QString("signed long int"); } - | T_SIGNED T_LONG T_INT { $$ = new QString("signed long int"); } - | T_UNSIGNED T_SHORT { $$ = new QString("unsigned short int"); } - | T_UNSIGNED T_SHORT T_INT { $$ = new QString("unsigned short int"); } - | T_UNSIGNED T_LONG { $$ = new QString("unsigned long int"); } - | T_UNSIGNED T_LONG T_INT { $$ = new QString("unsigned long int"); } - | T_INT { $$ = new QString("int"); } - | T_LONG { $$ = new QString("long int"); } - | T_LONG T_INT { $$ = new QString("long int"); } - | T_SHORT { $$ = new QString("short int"); } - | T_SHORT T_INT { $$ = new QString("short int"); } - | T_CHAR { $$ = new QString("char"); } - | T_SIGNED T_CHAR { $$ = new QString("signed char"); } - | T_UNSIGNED T_CHAR { $$ = new QString("unsigned char"); } + : T_SIGNED { $$ = new TQString("signed int"); } + | T_SIGNED T_INT { $$ = new TQString("signed int"); } + | T_UNSIGNED { $$ = new TQString("unsigned int"); } + | T_UNSIGNED T_INT { $$ = new TQString("unsigned int"); } + | T_SIGNED T_SHORT { $$ = new TQString("signed short int"); } + | T_SIGNED T_SHORT T_INT { $$ = new TQString("signed short int"); } + | T_SIGNED T_LONG { $$ = new TQString("signed long int"); } + | T_SIGNED T_LONG T_INT { $$ = new TQString("signed long int"); } + | T_UNSIGNED T_SHORT { $$ = new TQString("unsigned short int"); } + | T_UNSIGNED T_SHORT T_INT { $$ = new TQString("unsigned short int"); } + | T_UNSIGNED T_LONG { $$ = new TQString("unsigned long int"); } + | T_UNSIGNED T_LONG T_INT { $$ = new TQString("unsigned long int"); } + | T_INT { $$ = new TQString("int"); } + | T_LONG { $$ = new TQString("long int"); } + | T_LONG T_INT { $$ = new TQString("long int"); } + | T_SHORT { $$ = new TQString("short int"); } + | T_SHORT T_INT { $$ = new TQString("short int"); } + | T_CHAR { $$ = new TQString("char"); } + | T_SIGNED T_CHAR { $$ = new TQString("signed char"); } + | T_UNSIGNED T_CHAR { $$ = new TQString("unsigned char"); } ; asterisks @@ -530,12 +530,12 @@ asterisks params : /* empty */ { - $$ = new QString( "" ); + $$ = new TQString( "" ); } | param | params T_COMMA param { - $$ = new QString( *($1) + *($3) ); + $$ = new TQString( *($1) + *($3) ); } ; @@ -546,13 +546,13 @@ type_name | T_STRUCT Identifier { $$ = $2; } | T_CLASS Identifier { $$ = $2; } | Identifier T_LESS templ_type_list T_GREATER { - QString *tmp = new QString("%1<%2>"); + TQString *tmp = new TQString("%1<%2>"); *tmp = tmp->arg(*($1)); *tmp = tmp->arg(*($3)); $$ = tmp; } | Identifier T_LESS templ_type_list T_GREATER T_SCOPE Identifier{ - QString *tmp = new QString("%1<%2>::%3"); + TQString *tmp = new TQString("%1<%2>::%3"); *tmp = tmp->arg(*($1)); *tmp = tmp->arg(*($3)); *tmp = tmp->arg(*($6)); @@ -564,7 +564,7 @@ type_name templ_type_list : templ_type T_COMMA templ_type_list { - $$ = new QString(*($1) + "," + *($3)); + $$ = new TQString(*($1) + "," + *($3)); } | templ_type { @@ -595,24 +595,24 @@ type } | T_CONST type_name T_AMPERSAND { if (dcop_area) { - QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); + TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); *tmp = tmp->arg( *($2) ); $$ = tmp; } } | T_CONST type_name %prec T_UNIMPORTANT { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *($2) ); $$ = tmp; } | type_name T_CONST %prec T_UNIMPORTANT { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *($1) ); $$ = tmp; } | type_name T_CONST T_AMPERSAND { if (dcop_area) { - QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); + TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); *tmp = tmp->arg( *($1) ); $$ = tmp; } @@ -623,7 +623,7 @@ type } | type_name %prec T_UNIMPORTANT { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *($1) ); $$ = tmp; } @@ -637,7 +637,7 @@ type type_list : type T_COMMA type_list { - $$ = new QString(*($1) + "," + *($3)); + $$ = new TQString(*($1) + "," + *($3)); } | type { @@ -649,25 +649,25 @@ param : type Identifier default { if (dcop_area) { - QString* tmp = new QString("\n <ARG>%1<NAME>%2</NAME></ARG>"); + TQString* tmp = new TQString("\n <ARG>%1<NAME>%2</NAME></ARG>"); *tmp = tmp->arg( *($1) ); *tmp = tmp->arg( *($2) ); $$ = tmp; - } else $$ = new QString(); + } else $$ = new TQString(); } | type default { if (dcop_area) { - QString* tmp = new QString("\n <ARG>%1</ARG>"); + TQString* tmp = new TQString("\n <ARG>%1</ARG>"); *tmp = tmp->arg( *($1) ); $$ = tmp; - } else $$ = new QString(); + } else $$ = new TQString(); } | T_TRIPLE_DOT { if (dcop_area) yyerror("variable arguments not supported in dcop area."); - $$ = new QString(""); + $$ = new TQString(""); } ; @@ -715,8 +715,8 @@ function_header : type Identifier T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS const_qualifier { if (dcop_area || dcop_signal_area) { - QString* tmp = 0; - tmp = new QString( + TQString* tmp = 0; + tmp = new TQString( " <%4>\n" " %2\n" " <NAME>%1</NAME>" @@ -726,19 +726,19 @@ function_header *tmp = tmp->arg( *($1) ); *tmp = tmp->arg( *($4) ); - QString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC"; - QString attr = ($6) ? " qual=\"const\"" : ""; - *tmp = tmp->arg( QString("%1%2").arg(tagname).arg(attr) ); - *tmp = tmp->arg( QString("%1").arg(tagname) ); + TQString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC"; + TQString attr = ($6) ? " qual=\"const\"" : ""; + *tmp = tmp->arg( TQString("%1%2").arg(tagname).arg(attr) ); + *tmp = tmp->arg( TQString("%1").arg(tagname) ); $$ = tmp; } else - $$ = new QString(""); + $$ = new TQString(""); } | type T_FUNOPERATOR operator T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS const_qualifier { if (dcop_area) yyerror("operators aren't allowed in dcop areas!"); - $$ = new QString(""); + $$ = new TQString(""); } ; @@ -778,19 +778,19 @@ function { /* The constructor */ assert(!dcop_area); - $$ = new QString(""); + $$ = new TQString(""); } | Identifier T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS T_COLON init_list function_body { /* The constructor */ assert(!dcop_area); - $$ = new QString(""); + $$ = new TQString(""); } | virtual_qualifier T_TILDE Identifier T_LEFT_PARANTHESIS T_RIGHT_PARANTHESIS function_body { /* The destructor */ assert(!dcop_area); - $$ = new QString(""); + $$ = new TQString(""); } | T_STATIC function_header function_body { @@ -800,7 +800,7 @@ function else yyerror("DCOP functions cannot be static"); } else { - $$ = new QString(); + $$ = new TQString(); } } ; diff --git a/dcop/dcopidl2cpp/dcopidl_test.h b/dcop/dcopidl2cpp/dcopidl_test.h index 66f18f92f..1d6d95a36 100644 --- a/dcop/dcopidl2cpp/dcopidl_test.h +++ b/dcop/dcopidl2cpp/dcopidl_test.h @@ -10,7 +10,7 @@ class TDEUI_EXPORT DefaultTest : public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: DefaultTest(); @@ -70,7 +70,7 @@ public: class NonHashingTest : public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: NonHashingTest(); @@ -80,7 +80,7 @@ k_dcop: class HashingTest : public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: HashingTest(); diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus index 38b38a013..e3119b3dc 100644 --- a/dcop/dcopidlng/kalyptus +++ b/dcop/dcopidlng/kalyptus @@ -73,9 +73,9 @@ public: virtual bool tqt_emit( int, QUObject* ); virtual bool tqt_property( int, int, QVariant* ); static QMetaObject* staticMetaObject(); - QObject* qObject(); - static QString tr( const char *, const char * = 0 ); - static QString trUtf8( const char *, const char * = 0 ); + TQObject* qObject(); + static TQString tr( const char *, const char * = 0 ); + static TQString trUtf8( const char *, const char * = 0 ); private: CODE @@ -98,9 +98,8 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); _STYLE_PLATINUM => '', _STYLE_SGI => '', _STYLE_WINDOWS => '', - QT_STATIC_CONST => 'static const', - Q_EXPORT => '', - Q_REFCOUNT => '', + TQ_EXPORT => '', + TQ_REFCOUNT => '', QM_EXPORT_CANVAS => '', QM_EXPORT_DNS => '', QM_EXPORT_ICONVIEW => '', @@ -109,19 +108,18 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); QM_EXPORT_WORKSPACE => '', TQT_NO_REMOTE => 'TQT_NO_REMOTE', QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT', - Q_WS_X11 => 'Q_WS_X11', + TQ_WS_X11 => 'TQ_WS_X11', TQ_DISABLE_COPY => 'TQ_DISABLE_COPY', - Q_WS_QWS => 'undef', - Q_WS_MAC => 'undef', - Q_OBJECT => <<'CODE', + TQ_WS_QWS => 'undef', + TQ_WS_MAC => 'undef', TQ_OBJECT => <<'CODE', public: virtual QMetaObject *metaObject() const; virtual const char *className() const; virtual bool tqt_invoke( int, QUObject* ); virtual bool tqt_emit( int, QUObject* ); - static QString tr( const char *, const char * = 0 ); - static QString trUtf8( const char *, const char * = 0 ); + static TQString tr( const char *, const char * = 0 ); + static TQString trUtf8( const char *, const char * = 0 ); private: CODE }; @@ -373,7 +371,7 @@ sub readSourceLine =head2 readCxxLine Reads a C++ source line, skipping comments, blank lines, - preprocessor tokens and the Q_OBJECT/TQ_OBJECT macros + preprocessor tokens and the TQ_OBJECT macros =cut @@ -401,16 +399,11 @@ LOOP: } } - if ( $p =~ /^\s*Q_OBJECT/ ) { - push @inputqueue, @codeqobject; - next; - } if ( $p =~ /^\s*TQ_OBJECT/ ) { push @inputqueue, @codeqobject; next; } # Hack, waiting for real handling of preprocessor defines - $p =~ s/QT_STATIC_CONST/static const/; $p =~ s/KSVG_GET/KJS::Value get();/; $p =~ s/KSVG_BASECLASS_GET/KJS::Value get();/; $p =~ s/KSVG_BRIDGE/KJS::ObjectImp *bridge();/; @@ -423,7 +416,7 @@ LOOP: } next if ( $p =~ /^\s*$/s ); # blank lines -# || $p =~ /^\s*Q_OBJECT/ # QObject macro +# || $p =~ /^\s*TQ_OBJECT/ # TQObject macro # ); # @@ -431,7 +424,7 @@ LOOP: || $p =~ /^\s*TQ_PROPERTY/ # and TQ_PROPERTY || $p =~ /^\s*TQ_OVERRIDE/ # and TQ_OVERRIDE || $p =~ /^\s*TQ_SETS/ - || $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/ + || $p =~ /^\s*TQ_DUMMY_COMPARISON_OPERATOR/ || $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff || $p =~ /^\s*K_SYCOCAFACTORY/ # || $p =~ /^\s*KSVG_/ # and KSVG stuff ;) @@ -456,8 +449,8 @@ LOOP: else { # Skip platform-specific stuff, or #if 0 stuff # or #else of something we parsed (e.g. for QKeySequence) - if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or - $p =~ m/^#\s*if\s+defined\(Q_WS_/ or + if ( $p =~ m/^#\s*ifdef\s*TQ_WS_/ or + $p =~ m/^#\s*if\s+defined\(TQ_WS_/ or $p =~ m/^#\s*if\s+defined\(Q_OS_/ or $p =~ m/^#\s*if\s+defined\(Q_CC_/ or $p =~ m/^#\s*if\s+defined\(TQT_THREAD_SUPPORT/ or @@ -713,7 +706,7 @@ sub identifyDecl \s*(class|struct|union|namespace) # 2 struct type \s*([A-Z_]*EXPORT[A-Z_]*)? # 3 export (?:\s*TQ_PACKED)? - (?:\s*Q_REFCOUNT)? + (?:\s*TQ_REFCOUNT)? \s+([\w_]+ # 4 name (?:<[\w_ :,]+?>)? # maybe explicit template # (eat chars between <> non-hungry) @@ -776,7 +769,10 @@ sub identifyDecl \( (.*?) \) # parameters \s*((?:const)?)\s* (?:throw\s*\(.*?\))? - \s*((?:=\s*0(?:L?))?)\s* # Pureness. is "0L" allowed? + \s*((?:=\s*(?: + 0(?:L?)| # Pureness. is "0L" allowed? + default # Default method + ))?) \s*[;{]+/xs ) { # rest my $tpn = $1; # type + name @@ -788,7 +784,7 @@ sub identifyDecl } my $const = $3 eq "" ? 0 : 1; - my $pure = $4 eq "" ? 0 : 1; + my $pure = $4 eq "" ? 0 : ($4 =~ "default" ? 0 : 1); $tpn =~ s/\s+/ /g; $params =~ s/\s+/ /g; @@ -1475,7 +1471,7 @@ sub newMethod This property contains a list of nodes, one for each parameter. Each parameter node has the following properties: - * ArgType the type of the argument, e.g. const QString& + * ArgType the type of the argument, e.g. const TQString& * ArgName the name of the argument - optionnal * DefaultValue the default value of the argument - optionnal diff --git a/dcop/dcopidlng/kdocUtil.pm b/dcop/dcopidlng/kdocUtil.pm index 629147ac3..e045a6790 100644 --- a/dcop/dcopidlng/kdocUtil.pm +++ b/dcop/dcopidlng/kdocUtil.pm @@ -139,7 +139,7 @@ sub userName =head2 splitUnnested Helper to split a list using a delimiter, but looking for nesting with (), {}, [] and <>. - Example: splitting int a, QPair<c,b> d, e="," + Example: splitting int a, TQPair<c,b> d, e="," on ',' will give 3 items in the list. Parameter: delimiter, string diff --git a/dcop/dcopobject.cpp b/dcop/dcopobject.cpp index f02d07325..fd39fb347 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 = TQT_TQOBJECT(currentObj->parent()); + currentObj = currentObj->parent(); } if ( ident[0] == '/' ) ident = ident.mid(1); @@ -155,7 +155,7 @@ TQCString DCOPObject::objectName( TQObject* obj ) { identity.prepend( currentObj->name() ); identity.prepend("/"); - currentObj = TQT_TQOBJECT(currentObj->parent()); + currentObj = currentObj->parent(); } if ( identity[0] == '/' ) identity = identity.mid(1); diff --git a/dcop/dcopref.h b/dcop/dcopref.h index 6864bc4ad..c85654e0e 100644 --- a/dcop/dcopref.h +++ b/dcop/dcopref.h @@ -238,7 +238,7 @@ inline TQDataStream & operator << (TQDataStream & str, const DCOPArg& arg ) * dcopTypeName function, for example * * \code - * inline const char* dcopTypeName( const TQString& ) { return TQSTRING_OBJECT_NAME_STRING; } + * inline const char* dcopTypeName( const TQString& ) { return "TQString"; } * \endcode * * If you use custom data types that do support TQDataStream but have diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp index ec6086f09..99c3cba67 100644 --- a/dcop/dcopserver.cpp +++ b/dcop/dcopserver.cpp @@ -306,8 +306,8 @@ tqWarning("[dcopserver] waitForOutputReady fd = %d datasize = %d start = %d", so if (!outputBufferNotifier) { outputBufferNotifier = new TQSocketNotifier(socket(), Write); - connect(outputBufferNotifier, TQT_SIGNAL(activated(int)), - the_server, TQT_SLOT(slotOutputReady(int))); + connect(outputBufferNotifier, TQ_SIGNAL(activated(int)), + the_server, TQ_SLOT(slotOutputReady(int))); } outputBufferNotifier->setEnabled(true); return; @@ -1055,16 +1055,16 @@ DCOPServer::DCOPServer(bool _suicide) for ( int i = 0; i < numTransports; i++) { con = new DCOPListener( listenObjs[i] ); listener.append( con ); - connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( newClient(int) ) ); + connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( newClient(int) ) ); } char c = 0; write(ready[1], &c, 1); // dcopserver is started close(ready[1]); m_timer = new TQTimer(this); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) ); m_deadConnectionTimer = new TQTimer(this); - connect( m_deadConnectionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCleanDeadConnections()) ); + connect( m_deadConnectionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCleanDeadConnections()) ); #ifdef Q_OS_WIN char szEventName[256]; @@ -1183,7 +1183,7 @@ void DCOPServer::newClient( int /*socket*/ ) void* DCOPServer::watchConnection( IceConn iceConn ) { DCOPConnection* con = new DCOPConnection( iceConn ); - connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( processData(int) ) ); + connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( processData(int) ) ); clients.insert(iceConn, con ); fd_clients.insert( IceConnectionNumber(iceConn), con); @@ -1293,8 +1293,8 @@ void DCOPServer::slotTerminate() #endif TQByteArray data; dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false); - disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSuicide()) ); + disconnect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSuicide()) ); system(findDcopserverShutdown()+" --nokill"); } @@ -1321,8 +1321,8 @@ void DCOPServer::slotShutdown() TQByteArray data; dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false); m_timer->start( 10000 ); // if within 10 seconds nothing happens, we'll terminate - disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotExit()) ); + disconnect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotExit()) ); if (appIds.isEmpty()) slotExit(); // Exit now } @@ -1618,7 +1618,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false) if (::access(fName.data(), R_OK) == 0) { TQFile f(fName); f.open(IO_ReadOnly); - int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file + int size = TQMIN( (long)1024, f.size() ); // protection against a huge file TQCString contents( size+1 ); bool ok = f.readBlock( contents.data(), size ) == size; contents[size] = '\0'; @@ -1779,7 +1779,7 @@ extern "C" DCOP_EXPORT int kdemain( int argc, char* argv[] ) SetConsoleCtrlHandler(DCOPServer::dcopServerConsoleProc,TRUE); #else TQSocketNotifier DEATH(pipeOfDeath[0], TQSocketNotifier::Read, 0, 0); - server->connect(&DEATH, TQT_SIGNAL(activated(int)), TQT_SLOT(slotShutdown())); + server->connect(&DEATH, TQ_SIGNAL(activated(int)), TQ_SLOT(slotShutdown())); #endif int ret = a.exec(); diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h index f0f5d1137..e17ee4ef1 100644 --- a/dcop/dcopserver.h +++ b/dcop/dcopserver.h @@ -34,8 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqintdict.h> #include <tqapplication.h> -#define INT32 QINT32 -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xmd.h> #endif @@ -116,7 +115,7 @@ public: */ class DCOPServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: DCOPServer(bool _suicide); ~DCOPServer(); diff --git a/dcop/dcopserver_shutdown.c b/dcop/dcopserver_shutdown.c index af75c6d5a..8b1ee2884 100644 --- a/dcop/dcopserver_shutdown.c +++ b/dcop/dcopserver_shutdown.c @@ -54,9 +54,9 @@ static char *getDisplay() /* don't test for a value from tqglobal.h but instead distinguish Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS - on the commandline (which in tqglobal.h however triggers Q_WS_QWS, + on the commandline (which in tqglobal.h however triggers TQ_WS_QWS, but we don't want to include that here) (Simon) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 */ #if !defined(QWS) display = getenv("DISPLAY"); diff --git a/dcop/dcopserver_shutdown_win.cpp b/dcop/dcopserver_shutdown_win.cpp index 384bd6f36..af38c66f8 100644 --- a/dcop/dcopserver_shutdown_win.cpp +++ b/dcop/dcopserver_shutdown_win.cpp @@ -64,9 +64,9 @@ static char *getDisplay() /* don't test for a value from tqglobal.h but instead distinguish Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS - on the commandline (which in tqglobal.h however triggers Q_WS_QWS, + on the commandline (which in tqglobal.h however triggers TQ_WS_QWS, but we don't want to include that here) (Simon) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 */ #if !defined(QWS) display = getenv("DISPLAY"); diff --git a/dcop/dcoptypes.h b/dcop/dcoptypes.h index 548483e97..d70f787f7 100644 --- a/dcop/dcoptypes.h +++ b/dcop/dcoptypes.h @@ -37,38 +37,38 @@ inline const char* dcopTypeName( long ) { return "long int"; } inline const char* dcopTypeName( ulong ) { return "ulong"; } inline const char* dcopTypeName( double ) { return "double"; } inline const char* dcopTypeName( float ) { return "float"; } -inline const char* dcopTypeName( const char* ) { return TQCSTRING_OBJECT_NAME_STRING; } +inline const char* dcopTypeName( const char* ) { return "TQCString"; } // dcop specialities class DCOPRef; inline const char* dcopTypeName( const DCOPRef& ) { return "DCOPRef"; } // Qt variant types -class TQString; inline const char* dcopTypeName( const TQString& ) { return TQSTRING_OBJECT_NAME_STRING; } -class TQCString; inline const char* dcopTypeName( const TQCString& ) { return TQCSTRING_OBJECT_NAME_STRING; } -class TQFont; inline const char* dcopTypeName( const TQFont& ) { return TQFONT_OBJECT_NAME_STRING; } -class TQPixmap; inline const char* dcopTypeName( const TQPixmap& ) { return TQPIXMAP_OBJECT_NAME_STRING; } -class TQBrush; inline const char* dcopTypeName( const TQBrush& ) { return TQBRUSH_OBJECT_NAME_STRING; } -class TQRect; inline const char* dcopTypeName( const TQRect& ) { return TQRECT_OBJECT_NAME_STRING; } -class TQPoint; inline const char* dcopTypeName( const TQPoint& ) { return TQPOINT_OBJECT_NAME_STRING; } -class TQImage; inline const char* dcopTypeName( const TQImage& ) { return TQIMAGE_OBJECT_NAME_STRING; } -class TQSize; inline const char* dcopTypeName( const TQSize& ) { return TQSIZE_OBJECT_NAME_STRING; } -class TQColor; inline const char* dcopTypeName( const TQColor& ) { return TQCOLOR_OBJECT_NAME_STRING; } -class TQPalette; inline const char* dcopTypeName( const TQPalette& ) { return TQPALETTE_OBJECT_NAME_STRING; } -class TQColorGroup; inline const char* dcopTypeName( const TQColorGroup& ) { return TQCOLORGROUP_OBJECT_NAME_STRING; } -class TQIconSet; inline const char* dcopTypeName( const TQIconSet& ) { return TQICONSET_OBJECT_NAME_STRING; } -class TQDataStream; inline const char* dcopTypeName( const TQDataStream& ) { return TQDATASTREAM_OBJECT_NAME_STRING; } -class TQPointArray; inline const char* dcopTypeName( const TQPointArray& ) { return TQPOINTARRAY_OBJECT_NAME_STRING; } -class TQRegion; inline const char* dcopTypeName( const TQRegion& ) { return TQREGION_OBJECT_NAME_STRING; } -class TQBitmap; inline const char* dcopTypeName( const TQBitmap& ) { return TQBITMAP_OBJECT_NAME_STRING; } -class TQCursor; inline const char* dcopTypeName( const TQCursor& ) { return TQCURSOR_OBJECT_NAME_STRING; } -class TQStringList; inline const char* dcopTypeName( const TQStringList& ) { return TQSTRINGLIST_OBJECT_NAME_STRING; } -class TQSizePolicy; inline const char* dcopTypeName( const TQSizePolicy& ) { return TQSIZEPOLICY_OBJECT_NAME_STRING; } -class TQDate; inline const char* dcopTypeName( const TQDate& ) { return TQDATE_OBJECT_NAME_STRING; } -class TQTime; inline const char* dcopTypeName( const TQTime& ) { return TQTIME_OBJECT_NAME_STRING; } -class TQDateTime; inline const char* dcopTypeName( const TQDateTime& ) { return TQDATETIME_OBJECT_NAME_STRING; } -class TQBitArray; inline const char* dcopTypeName( const TQBitArray& ) { return TQBITARRAY_OBJECT_NAME_STRING; } -class TQKeySequence; inline const char* dcopTypeName( const TQKeySequence& ) { return TQKEYSEQUENCE_OBJECT_NAME_STRING; } -class TQVariant; inline const char* dcopTypeName( const TQVariant& ) { return TQVARIANT_OBJECT_NAME_STRING; } +class TQString; inline const char* dcopTypeName( const TQString& ) { return "TQString"; } +class TQCString; inline const char* dcopTypeName( const TQCString& ) { return "TQCString"; } +class TQFont; inline const char* dcopTypeName( const TQFont& ) { return "TQFont"; } +class TQPixmap; inline const char* dcopTypeName( const TQPixmap& ) { return "TQPixmap"; } +class TQBrush; inline const char* dcopTypeName( const TQBrush& ) { return "TQBrush"; } +class TQRect; inline const char* dcopTypeName( const TQRect& ) { return "TQRect"; } +class TQPoint; inline const char* dcopTypeName( const TQPoint& ) { return "TQPoint"; } +class TQImage; inline const char* dcopTypeName( const TQImage& ) { return "TQImage"; } +class TQSize; inline const char* dcopTypeName( const TQSize& ) { return "TQSize"; } +class TQColor; inline const char* dcopTypeName( const TQColor& ) { return "TQColor"; } +class TQPalette; inline const char* dcopTypeName( const TQPalette& ) { return "TQPalette"; } +class TQColorGroup; inline const char* dcopTypeName( const TQColorGroup& ) { return "TQColorGroup"; } +class TQIconSet; inline const char* dcopTypeName( const TQIconSet& ) { return "TQIconSet"; } +class TQDataStream; inline const char* dcopTypeName( const TQDataStream& ) { return "TQDataStream"; } +class TQPointArray; inline const char* dcopTypeName( const TQPointArray& ) { return "TQPointArray"; } +class TQRegion; inline const char* dcopTypeName( const TQRegion& ) { return "TQRegion"; } +class TQBitmap; inline const char* dcopTypeName( const TQBitmap& ) { return "TQBitmap"; } +class TQCursor; inline const char* dcopTypeName( const TQCursor& ) { return "TQCursor"; } +class TQStringList; inline const char* dcopTypeName( const TQStringList& ) { return "TQStringList"; } +class TQSizePolicy; inline const char* dcopTypeName( const TQSizePolicy& ) { return "TQSizePolicy"; } +class TQDate; inline const char* dcopTypeName( const TQDate& ) { return "TQDate"; } +class TQTime; inline const char* dcopTypeName( const TQTime& ) { return "TQTime"; } +class TQDateTime; inline const char* dcopTypeName( const TQDateTime& ) { return "TQDateTime"; } +class TQBitArray; inline const char* dcopTypeName( const TQBitArray& ) { return "TQBitArray"; } +class TQKeySequence; inline const char* dcopTypeName( const TQKeySequence& ) { return "TQKeySequence"; } +class TQVariant; inline const char* dcopTypeName( const TQVariant& ) { return "TQVariant"; } template<class Key, class T> class TQMap; typedef TQMap<TQString, TQVariant> TQStringVariantMap; diff --git a/dcop/kdatastream.h b/dcop/kdatastream.h index 4a135b9d9..345d46d87 100644 --- a/dcop/kdatastream.h +++ b/dcop/kdatastream.h @@ -3,7 +3,6 @@ #include <tqdatastream.h> -#ifdef USE_QT3 inline TQDataStream & operator << (TQDataStream & str, bool b) { str << TQ_INT8(b); @@ -17,42 +16,5 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b) b = bool(l); return str; } -#endif // USE_QT3 - -#if TQT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) -inline TQDataStream & operator << (TQDataStream & str, long long int ll) -{ - TQ_UINT32 l1,l2; - l1 = ll & 0xffffffffLL; - l2 = ll >> 32; - str << l1 << l2; - return str; -} - -inline TQDataStream & operator >> (TQDataStream & str, long long int&ll) -{ - TQ_UINT32 l1,l2; - str >> l1 >> l2; - ll = ((unsigned long long int)(l2) << 32) + (long long int) l1; - return str; -} - -inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll) -{ - TQ_UINT32 l1,l2; - l1 = ll & 0xffffffffLL; - l2 = ll >> 32; - str << l1 << l2; - return str; -} - -inline TQDataStream & operator >> (TQDataStream & str, unsigned long long int &ll) -{ - TQ_UINT32 l1,l2; - str >> l1 >> l2; - ll = ((unsigned long long int)(l2) << 32) + (unsigned long long int) l1; - return str; -} -#endif #endif diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp index 1e70171d2..583a0255b 100644 --- a/dcop/testdcop.cpp +++ b/dcop/testdcop.cpp @@ -57,7 +57,7 @@ bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data, printf("Rect x = %d, y = %d, w = %d, h = %d\n", arg1.x(), arg1.y(), arg1.width(), arg1.height()); - replyType = TQRECT_OBJECT_NAME_STRING; + replyType = "TQRect"; TQDataStream reply( replyData, IO_WriteOnly ); TQRect r(10,20,100,200); reply << r; @@ -74,7 +74,7 @@ bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data, tqDebug("countDown() countDownAction = %p", countDownAction); if (countDownAction2) { - replyType = TQSTRING_OBJECT_NAME_STRING; + replyType = "TQString"; TQDataStream reply( replyData, IO_WriteOnly ); reply << TQString("Hey"); return true; @@ -84,13 +84,13 @@ tqDebug("countDown() countDownAction = %p", countDownAction); { countDownCount = 10; countDownAction = client->beginTransaction(); - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout())); } else { countDownCount2 = 10; countDownAction2 = client->beginTransaction(); - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2())); } return true; } @@ -104,7 +104,7 @@ void MyDCOPObject::slotTimeout() countDownCount--; if (countDownCount == 0) { - TQCString replyType = TQSTRING_OBJECT_NAME_STRING; + TQCString replyType = "TQString"; TQByteArray replyData; TQDataStream reply( replyData, IO_WriteOnly ); reply << TQString("Hello World"); @@ -113,7 +113,7 @@ void MyDCOPObject::slotTimeout() } else { - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout())); } } @@ -123,7 +123,7 @@ void MyDCOPObject::slotTimeout2() countDownCount2--; if (countDownCount2 == 0) { - TQCString replyType = TQSTRING_OBJECT_NAME_STRING; + TQCString replyType = "TQString"; TQByteArray replyData; TQDataStream reply( replyData, IO_WriteOnly ); reply << TQString("Hello World"); @@ -132,21 +132,21 @@ void MyDCOPObject::slotTimeout2() } else { - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2())); } } QCStringList MyDCOPObject::functions() { QCStringList result = DCOPObject::functions(); - result << TQRECT_OBJECT_NAME_STRING " canLaunchRockets(" TQRECT_OBJECT_NAME_STRING ")"; + result << "TQRect canLaunchRockets(TQRect)"; return result; } TestObject::TestObject(const TQCString& app) : m_app(app) { - TQTimer::singleShot(2500, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(2500, this, TQ_SLOT(slotTimeout())); } void TestObject::slotTimeout() @@ -191,10 +191,10 @@ int main(int argc, char **argv) TQCString appId = argv[1]; TestObject obj(appId); tqWarning("#1 Calling countDown"); - int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); + int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); 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&))); + result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); tqDebug("#2 countDown() call id = %d", result); app.exec(); @@ -234,11 +234,11 @@ int main(int argc, char **argv) int n = client->registeredApplications().count(); tqDebug("number of attached applications = %d", n ); - TQObject::connect( client, TQT_SIGNAL( applicationRegistered( const TQCString&)), - obj1, TQT_SLOT( registered( const TQCString& ))); + TQObject::connect( client, TQ_SIGNAL( applicationRegistered( const TQCString&)), + obj1, TQ_SLOT( registered( const TQCString& ))); - TQObject::connect( client, TQT_SIGNAL( applicationRemoved( const TQCString&)), - obj1, TQT_SLOT( unregistered( const TQCString& ))); + TQObject::connect( client, TQ_SIGNAL( applicationRemoved( const TQCString&)), + obj1, TQ_SLOT( unregistered( const TQCString& ))); // Enable the above signals client->setNotifications( true ); diff --git a/dcop/testdcop.h b/dcop/testdcop.h index 3cb81372f..c3288bce9 100644 --- a/dcop/testdcop.h +++ b/dcop/testdcop.h @@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TestObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: TestObject(const TQCString &app); @@ -58,7 +58,7 @@ private: class MyDCOPObject : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: MyDCOPObject(const TQCString &name) : DCOPObject(name) {} bool process(const TQCString &fun, const TQByteArray &data, diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp index a129d7d6f..74dee9edd 100644 --- a/dcop/tests/driver.cpp +++ b/dcop/tests/driver.cpp @@ -39,7 +39,7 @@ void Driver::test() } ++count; - TQTimer::singleShot( 100, this, TQT_SLOT( test() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( test() ) ); } #include "driver.moc" @@ -58,7 +58,7 @@ int main(int argc, char** argv) app.dcopClient()->attach( ); app.dcopClient()->registerAs( "TestAppDriver" ); Driver * object = new Driver( appname ); - TQTimer::singleShot( 10, object, TQT_SLOT( test() ) ); + TQTimer::singleShot( 10, object, TQ_SLOT( test() ) ); return app.exec(); } diff --git a/dcop/tests/driver.h b/dcop/tests/driver.h index 3565d88ab..654707c4f 100644 --- a/dcop/tests/driver.h +++ b/dcop/tests/driver.h @@ -7,7 +7,7 @@ class Driver : public TQObject, public Test_stub { - Q_OBJECT + TQ_OBJECT public: Driver(const char*); diff --git a/dcop/tests/testcases b/dcop/tests/testcases index e2357eb1c..e3bd2e3d0 100644 --- a/dcop/tests/testcases +++ b/dcop/tests/testcases @@ -19,7 +19,7 @@ # 2. First you put shell like argument: # "string with spaces" 4 string_without_spaces # Then you should put c++ style arguments: -# QString::fromLatin1("string with spaces"),4,"string_with_spaces" +# TQString::fromLatin1("string with spaces"),4,"string_with_spaces" # # Note that the first argument has type TQString and the last type const char* # (adapt accordingly) @@ -29,7 +29,7 @@ TQString url () { -return QString::fromLatin1( "http://www.kde.org/"); +return TQString::fromLatin1( "http://www.kde.org/"); } - @@ -63,7 +63,7 @@ identity { return x; } -"test";QString::fromLatin1("test") +"test";TQString::fromLatin1("test") // 2.3 unsigned long int unsigned long int |