diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
| commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
| tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kicker/proxy/extensionproxy.cpp | |
| parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
| download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip | |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/proxy/extensionproxy.cpp')
| -rw-r--r-- | kicker/proxy/extensionproxy.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 3d931c95b..d4b4d67d6 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -113,7 +113,7 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name) exit(0); } - if (!kapp->dcopClient()->registerAs("extension_proxy", true)) { + if (kapp->dcopClient()->registerAs("extension_proxy", true) == 0) { kdError() << "Failed to register at DCOP server." << endl; exit(0); } @@ -258,7 +258,7 @@ void ExtensionProxy::dock(const TQCString& callbackID) bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData) { - if ( fun == "sizeHint(int,TQSize)" ) + if ( fun == "tqsizeHint(int,TQSize)" ) { TQDataStream dataStream( data, IO_ReadOnly ); int pos; @@ -272,7 +272,7 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, if(!_extension) reply << maxSize; else - reply << _extension->sizeHint((KPanelExtension::Position)pos, maxSize); + reply << _extension->tqsizeHint((KPanelExtension::Position)pos, maxSize); return true; } @@ -287,14 +287,14 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, } return true; } - else if ( fun == "setAlignment(int)" ) + else if ( fun == "tqsetAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int alignment; - dataStream >> alignment; + int tqalignment; + dataStream >> tqalignment; if(_extension) { - _extension->setAlignment( (KPanelExtension::Alignment)alignment ); + _extension->tqsetAlignment( (KPanelExtension::Alignment)tqalignment ); } return true; } |