3 files changed, 13 insertions, 15 deletions
diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp
index 5f9264c8c..bb0c06c5c 100644
--- a/ksystraycmd/ksystraycmd.cpp
+++ b/ksystraycmd/ksystraycmd.cpp
@@ -9,7 +9,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <twinmodule.h>
 #include <tdeconfig.h>
 #include <ksystemtray.h>
@@ -26,7 +26,7 @@ KSysTrayCmd::KSysTrayCmd()
     win(0), client(0), twinmodule(0), top(0), left(0)
 {
   setAlignment( AlignCenter );
-  twinmodule = new KWinModule( TQT_TQOBJECT(this) );
+  twinmodule = new KWinModule( this );
   refresh();
 }
 
@@ -114,8 +114,8 @@ void KSysTrayCmd::setTargetWindow( WId w )
 
 void KSysTrayCmd::setTargetWindow( const KWin::WindowInfo &info )
 {
-  disconnect( twinmodule, TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(windowAdded(WId)) );
-  connect( twinmodule, TQT_SIGNAL(windowChanged(WId)), TQT_SLOT(windowChanged(WId)) );
+  disconnect( twinmodule, TQ_SIGNAL(windowAdded(WId)), this, TQ_SLOT(windowAdded(WId)) );
+  connect( twinmodule, TQ_SIGNAL(windowChanged(WId)), TQ_SLOT(windowChanged(WId)) );
   win = info.win();
   KWin::setSystemTrayWindowFor( winId(), win );
   refresh();
@@ -143,14 +143,14 @@ void KSysTrayCmd::refresh()
 
   TQToolTip::remove( this );
   if ( win ) {
-    TDEConfig *appCfg = kapp->config();
+    TDEConfig *appCfg = tdeApp->config();
     TDEConfigGroupSaver configSaver(appCfg, "System Tray");
     int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
 
     // ksystraycmd's icon or app's icon
     if (ownIcon)
     {
-      setPixmap( KSystemTray::loadIcon( kapp->iconName() ) );
+      setPixmap( KSystemTray::loadIcon( tdeApp->iconName() ) );
     }
     else
     {
@@ -167,7 +167,7 @@ void KSysTrayCmd::refresh()
     else
       TQToolTip::add( this, window );
 
-    setPixmap( KSystemTray::loadIcon( kapp->iconName() ) );
+    setPixmap( KSystemTray::loadIcon( tdeApp->iconName() ) );
   }
 }
 
@@ -179,9 +179,9 @@ bool KSysTrayCmd::startClient()
 {
   client = new KShellProcess();
   *client << command;
-  connect( twinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)) );
-  connect( client, TQT_SIGNAL( processExited(TDEProcess *) ),
-	   this, TQT_SLOT( clientExited() ) );
+  connect( twinmodule, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId)) );
+  connect( client, TQ_SIGNAL( processExited(TDEProcess *) ),
+	   this, TQ_SLOT( clientExited() ) );
 
   return client->start();
 }
@@ -292,7 +292,7 @@ void KSysTrayCmd::windowChanged( WId w )
 
 void KSysTrayCmd::mousePressEvent( TQMouseEvent *e )
 {
-  if ( e->button() == Qt::RightButton )
+  if ( e->button() == TQt::RightButton )
     execContextMenu( e->globalPos() );
   else if ( lazyStart && ( !hasRunningClient() ) )
   {
diff --git a/ksystraycmd/ksystraycmd.h b/ksystraycmd/ksystraycmd.h
index abad3ec57..20ebd0b25 100644
--- a/ksystraycmd/ksystraycmd.h
+++ b/ksystraycmd/ksystraycmd.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 #ifndef KSYSTRAYCMD_H
 #define KSYSTRAYCMD_H
 
@@ -16,7 +14,7 @@ class KWinModule;
  */
 class KSysTrayCmd : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KSysTrayCmd();
   ~KSysTrayCmd();
diff --git a/ksystraycmd/main.cpp b/ksystraycmd/main.cpp
index e322f2cf9..caf586591 100644
--- a/ksystraycmd/main.cpp
+++ b/ksystraycmd/main.cpp
@@ -5,7 +5,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 #include "ksystraycmd.h"