3 files changed, 7 insertions, 12 deletions
diff --git a/tdecmshell/CMakeLists.txt b/tdecmshell/CMakeLists.txt
index 2b07bbdcc..78cea5022 100644
--- a/tdecmshell/CMakeLists.txt
+++ b/tdecmshell/CMakeLists.txt
@@ -37,5 +37,4 @@ set( ${target}_SRCS
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK tdeutils-shared
-  DEPENDENCIES dcopidl
 )
diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp
index 20ef629d9..b62c9df23 100644
--- a/tdecmshell/main.cpp
+++ b/tdecmshell/main.cpp
@@ -103,8 +103,8 @@ static KService::Ptr locateModule(const TQCString& module)
     }
 
     // avoid finding random non-TDE applications
-    if ( module.left( 4 ) != "kde-" && service->library().isEmpty() )
-        return locateModule( "kde-" + module );
+    if ( module.left( 4 ) != "tde-" && service->library().isEmpty() )
+        return locateModule( "tde-" + module );
 
     if(!TDECModuleLoader::testModule( module ))
     {
@@ -170,8 +170,8 @@ void KCMShell::waitForExit()
 {
     kdDebug(780) << k_funcinfo << endl;
 
-    connect(dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)),
-            TQT_SLOT( appExit(const TQCString&) ));
+    connect(dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+            TQ_SLOT( appExit(const TQCString&) ));
     exec();
 }
 
@@ -191,7 +191,7 @@ static void setIcon(TQWidget *w, const TQString &iconName)
     TQPixmap icon = DesktopIcon(iconName);
     TQPixmap miniIcon = SmallIcon(iconName);
     w->setIcon( icon ); //standard X11
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     KWin::setIcons(w->winId(), icon, miniIcon );
 #endif
 }
@@ -345,4 +345,3 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
 
     return 0;
 }
-// vim: sw=4 et sts=4
diff --git a/tdecmshell/main.h b/tdecmshell/main.h
index e97145a82..6f1ee1bda 100644
--- a/tdecmshell/main.h
+++ b/tdecmshell/main.h
@@ -32,7 +32,7 @@
  */
 class KCMShell : public TDEApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -81,7 +81,7 @@ private:
  */
 class KCMShellMultiDialog : public KCMultiDialog, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
@@ -98,7 +98,4 @@ k_dcop:
     virtual void activate( TQCString asn_id );
 
 };
-
-
-// vim: sw=4 et sts=4
 #endif //__tdecmshell_h__