1 files changed, 20 insertions, 20 deletions

diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index da73da7c3..ae5260f6e 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -25,7 +25,7 @@
 #include <kimageio.h>
 #include <tdelistview.h>
 #include <kstaticdeleter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include "hidingconfig.h"
@@ -63,15 +63,15 @@ KickerConfig::KickerConfig(TQWidget *parent, const char *name)
 
     init();
 
-    kapp->dcopClient()->setNotifications(true);
+    tdeApp->dcopClient()->setNotifications(true);
     connectDCOPSignal("kicker", "kicker", "configSwitchToPanel(TQString)",
                       "jumpToPanel(TQString)", false);
-    kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray());
+    tdeApp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray());
 
-    connect(this, TQT_SIGNAL(hidingPanelChanged(int)),
-            this, TQT_SLOT(setCurrentPanelIndex(int)));
-    connect(this, TQT_SIGNAL(positionPanelChanged(int)),
-            this, TQT_SLOT(setCurrentPanelIndex(int)));
+    connect(this, TQ_SIGNAL(hidingPanelChanged(int)),
+            this, TQ_SLOT(setCurrentPanelIndex(int)));
+    connect(this, TQ_SIGNAL(positionPanelChanged(int)),
+            this, TQ_SLOT(setCurrentPanelIndex(int)));
 }
 
 KickerConfig::~KickerConfig()
@@ -90,7 +90,7 @@ KickerConfig::~KickerConfig()
 // this method may get called multiple times during the life of the control panel!
 void KickerConfig::init()
 {
-    disconnect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&)));
+    disconnect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&)));
     configFileWatch->stopScan();
     for (ExtensionInfoList::iterator it = m_extensionInfo.begin();
          it != m_extensionInfo.end();
@@ -128,20 +128,20 @@ void KickerConfig::init()
 
     setupExtensionInfo(*config, true, true);
 
-    connect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&)));
+    connect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&)));
     configFileWatch->startScan();
 }
 
 void KickerConfig::restartKicker()
 {
     // Tell kicker to restart
-    if (!kapp->dcopClient()->isAttached())
+    if (!tdeApp->dcopClient()->isAttached())
     {
-        kapp->dcopClient()->attach();
+        tdeApp->dcopClient()->attach();
     }
     TQCString appname;
     appname = "kicker";
-    kapp->dcopClient()->send(appname, appname, "restart", TQString(""));
+    tdeApp->dcopClient()->send(appname, appname, "restart", TQString(""));
 }
 
 void KickerConfig::notifyKicker()
@@ -151,9 +151,9 @@ void KickerConfig::notifyKicker()
     emit aboutToNotifyKicker();
 
     // Tell kicker about the new config file.
-    if (!kapp->dcopClient()->isAttached())
+    if (!tdeApp->dcopClient()->isAttached())
     {
-        kapp->dcopClient()->attach();
+        tdeApp->dcopClient()->attach();
     }
 
     TQByteArray data;
@@ -168,7 +168,7 @@ void KickerConfig::notifyKicker()
         appname.sprintf("kicker-screen-%d", m_screenNumber);
     }
 
-    kapp->dcopClient()->send(appname, appname, "configure()", data);
+    tdeApp->dcopClient()->send(appname, appname, "configure()", data);
 }
 
 void KickerConfig::setupExtensionInfo(TDEConfig& config, bool checkExists, bool reloadIfExists)
@@ -371,7 +371,7 @@ TDEAboutData *KickerConfig::aboutData()
 
 extern "C"
 {
-    KDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name)
+    TDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name)
     {
         TDECModuleContainer *container = new TDECModuleContainer(parent, "kcmkicker");
         container->addModule("kicker_config_arrangement");
@@ -381,26 +381,26 @@ extern "C"
         return container;
     }
 
-    KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
     {
         TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new PositionConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
     {
         TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new HidingConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
     {
         return new MenuConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
     {
         KImageIO::registerFormats();
         TDEGlobal::dirs()->addResourceType("tiles", TDEStandardDirs::kde_default("data") +