1 files changed, 14 insertions, 14 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();
 }