summaryrefslogtreecommitdiffstats
path: root/kicker/proxy
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/proxy')
-rw-r--r--kicker/proxy/appletproxy.cpp28
-rw-r--r--kicker/proxy/appletproxy.h2
-rw-r--r--kicker/proxy/extensiondebugger.cpp8
-rw-r--r--kicker/proxy/extensiondebugger.h2
-rw-r--r--kicker/proxy/extensionproxy.cpp22
-rw-r--r--kicker/proxy/extensionproxy.h2
6 files changed, 32 insertions, 32 deletions
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index ac2f969d8..1084b5667 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeglobal.h>
#include <klibloader.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <tdemessagebox.h>
@@ -68,7 +68,7 @@ static TDECmdLineOptions options[] =
TDECmdLineLastOption
};
-extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char ** argv )
{
TDEAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.")
, "v0.1.0"
@@ -126,7 +126,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
, _applet(0)
{
// try to attach to DCOP server
- if (!kapp->dcopClient()->attach()) {
+ if (!tdeApp->dcopClient()->attach()) {
kdError() << "Failed to attach to DCOP server." << endl;
KMessageBox::error(0,
i18n("The applet proxy could not be started due to DCOP communication problems."),
@@ -134,7 +134,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
exit(0);
}
- if (kapp->dcopClient()->registerAs("applet_proxy", true) == 0) {
+ if (tdeApp->dcopClient()->registerAs("applet_proxy", true) == 0) {
kdError() << "Failed to register at DCOP server." << endl;
KMessageBox::error(0,
i18n("The applet proxy could not be started due to DCOP registration problems."),
@@ -147,7 +147,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
AppletProxy::~AppletProxy()
{
- kapp->dcopClient()->detach();
+ tdeApp->dcopClient()->detach();
delete _info;
delete _applet;
}
@@ -197,9 +197,9 @@ void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& config
}
// connect updateLayout signal
- connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout()));
+ connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout()));
// connect requestFocus signal
- connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(slotRequestFocus()));
+ connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(slotRequestFocus()));
}
KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info)
@@ -255,11 +255,11 @@ void AppletProxy::dock(const TQCString& callbackID)
_callbackID = callbackID;
// try to attach to DCOP server
- DCOPClient* dcop = kapp->dcopClient();
+ DCOPClient* dcop = tdeApp->dcopClient();
dcop->setNotifications(true);
- connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)),
- TQT_SLOT(slotApplicationRemoved(const TQCString&)));
+ connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)),
+ TQ_SLOT(slotApplicationRemoved(const TQCString&)));
WId win;
@@ -463,7 +463,7 @@ void AppletProxy::slotUpdateLayout()
else
appname.sprintf("kicker-screen-%d", screen_number);
- kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
+ tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
}
void AppletProxy::slotRequestFocus()
@@ -480,7 +480,7 @@ void AppletProxy::slotRequestFocus()
else
appname.sprintf("kicker-screen-%d", screen_number);
- kapp->dcopClient()->send(appname, _callbackID, "requestFocus()", data);
+ tdeApp->dcopClient()->send(appname, _callbackID, "requestFocus()", data);
}
void AppletProxy::slotApplicationRemoved(const TQCString& appId)
@@ -496,7 +496,7 @@ void AppletProxy::slotApplicationRemoved(const TQCString& appId)
if(appId == appname) {
kdDebug(1210) << "Connection to kicker lost, shutting down" << endl;
- kapp->quit();
+ tdeApp->quit();
}
}
@@ -510,7 +510,7 @@ void AppletProxy::showStandalone()
_applet->resize( _applet->widthForHeight( 48 ), 48 );
_applet->setMinimumSize( _applet->size() );
_applet->setCaption( _info->name() );
- kapp->setMainWidget( _applet );
+ tdeApp->setMainWidget( _applet );
_applet->show();
}
diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h
index 4c504022f..59fb375b7 100644
--- a/kicker/proxy/appletproxy.h
+++ b/kicker/proxy/appletproxy.h
@@ -36,7 +36,7 @@ class KickerPluginManager;
class AppletProxy : public TQObject, DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
AppletProxy(TQObject* parent, const char* name = 0);
diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp
index c210e7b9e..4591f9c34 100644
--- a/kicker/proxy/extensiondebugger.cpp
+++ b/kicker/proxy/extensiondebugger.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeglobal.h>
#include <klibloader.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <kpanelextension.h>
@@ -129,7 +129,7 @@ int main( int argc, char ** argv )
ExtensionContainer *container = new ExtensionContainer( extension );
container->show();
- TQObject::connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) );
+ TQObject::connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) );
int result = a.exec();
@@ -143,8 +143,8 @@ ExtensionContainer::ExtensionContainer( KPanelExtension *extension, TQWidget *pa
( new TQVBoxLayout( this ) )->setAutoAdd( true );
TQPushButton *configButton = new TQPushButton( i18n( "Configure..." ), this );
- connect( configButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( showPreferences() ) );
+ connect( configButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( showPreferences() ) );
m_extension->reparent( this, TQPoint( 0, 0 ) );
}
diff --git a/kicker/proxy/extensiondebugger.h b/kicker/proxy/extensiondebugger.h
index 0f4719b9f..fd1cba1af 100644
--- a/kicker/proxy/extensiondebugger.h
+++ b/kicker/proxy/extensiondebugger.h
@@ -29,7 +29,7 @@ class KPanelExtension;
class ExtensionContainer : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExtensionContainer(KPanelExtension *extension, TQWidget* parent = 0, const char* name = 0);
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 13c40e67b..10ab9ff5d 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeglobal.h>
#include <klibloader.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <kpanelextension.h>
@@ -54,7 +54,7 @@ static TDECmdLineOptions options[] =
TDECmdLineLastOption
};
-extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char ** argv )
{
TDEAboutData aboutData( "extensionproxy", I18N_NOOP("Panel Extension Proxy")
, "v0.1.0"
@@ -108,12 +108,12 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name)
, _extension(0)
{
// try to attach to DCOP server
- if (!kapp->dcopClient()->attach()) {
+ if (!tdeApp->dcopClient()->attach()) {
kdError() << "Failed to attach to DCOP server." << endl;
exit(0);
}
- if (kapp->dcopClient()->registerAs("extension_proxy", true) == 0) {
+ if (tdeApp->dcopClient()->registerAs("extension_proxy", true) == 0) {
kdError() << "Failed to register at DCOP server." << endl;
exit(0);
}
@@ -121,7 +121,7 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name)
ExtensionProxy::~ExtensionProxy()
{
- kapp->dcopClient()->detach();
+ tdeApp->dcopClient()->detach();
}
void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString& configFile)
@@ -161,7 +161,7 @@ void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString
}
// connect updateLayout signal
- connect(_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout()));
+ connect(_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout()));
}
KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info)
@@ -195,11 +195,11 @@ void ExtensionProxy::dock(const TQCString& callbackID)
_callbackID = callbackID;
// try to attach to DCOP server
- DCOPClient* dcop = kapp->dcopClient();
+ DCOPClient* dcop = tdeApp->dcopClient();
dcop->setNotifications(true);
- connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)),
- TQT_SLOT(slotApplicationRemoved(const TQCString&)));
+ connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)),
+ TQ_SLOT(slotApplicationRemoved(const TQCString&)));
WId win;
@@ -380,7 +380,7 @@ void ExtensionProxy::slotUpdateLayout()
else
appname.sprintf("kicker-screen-%d", screen_number);
- kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
+ tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
}
void ExtensionProxy::slotApplicationRemoved(const TQCString& appId)
@@ -396,6 +396,6 @@ void ExtensionProxy::slotApplicationRemoved(const TQCString& appId)
if(appId == appname) {
kdDebug(1210) << "Connection to kicker lost, shutting down" << endl;
- kapp->quit();
+ tdeApp->quit();
}
}
diff --git a/kicker/proxy/extensionproxy.h b/kicker/proxy/extensionproxy.h
index 88bc0a325..d32b8f70b 100644
--- a/kicker/proxy/extensionproxy.h
+++ b/kicker/proxy/extensionproxy.h
@@ -35,7 +35,7 @@ class KPanelExtension;
class ExtensionProxy : public TQObject, DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExtensionProxy(TQObject* parent, const char* name = 0);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 03:20:40 +0000