6 files changed, 9 insertions, 9 deletions
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index ceadf241..68b085c1 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -27,7 +27,7 @@
 
 #include <klibloader.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <tdeio/global.h>
 #include <kdebug.h>
diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h
index cc55911c..461c6d3f 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.h
+++ b/kmobile/devices/gnokii/gnokii_mobile.h
@@ -29,7 +29,7 @@
 
 class KMobileGnokii : public KMobileDevice
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     KMobileGnokii( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
@@ -37,7 +37,7 @@ public:
 
     // createObject needs to be reimplemented by every KMobileDevice driver
     TQObject *createObject( TQObject *parent=0, const char *name=0, 
-	const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() );
+	const char *classname="TQObject", const TQStringList &args=TQStringList() );
 
     // connect, disconnect and current status
     bool connectDevice(TQWidget *parent);
diff --git a/kmobile/devices/gnokii/gnokiiconfig.cpp b/kmobile/devices/gnokii/gnokiiconfig.cpp
index 07bc46f4..4be8fb36 100644
--- a/kmobile/devices/gnokii/gnokiiconfig.cpp
+++ b/kmobile/devices/gnokii/gnokiiconfig.cpp
@@ -72,7 +72,7 @@ void GnokiiConfig::setValues(const TQString &model, const TQString &connection,
 
    slotCheckValues();
 
-   connect( cb_Connection, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckValues(const TQString &)) );
+   connect( cb_Connection, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckValues(const TQString &)) );
 }
 
 void GnokiiConfig::getValues(TQString &model, TQString &connection, TQString &port, TQString &baud) const
diff --git a/kmobile/devices/gnokii/gnokiiconfig.h b/kmobile/devices/gnokii/gnokiiconfig.h
index 530bb4e4..be76188b 100644
--- a/kmobile/devices/gnokii/gnokiiconfig.h
+++ b/kmobile/devices/gnokii/gnokiiconfig.h
@@ -25,10 +25,10 @@
 
 class GnokiiConfig : public GnokiiConfigUI
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
-    GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
     ~GnokiiConfig();
 
     void setValues(const TQString &model, const TQString &connection, const TQString &port, const TQString &baud);
diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp
index 1b70016f..f0744aef 100644
--- a/kmobile/devices/skeleton/skeleton.cpp
+++ b/kmobile/devices/skeleton/skeleton.cpp
@@ -21,7 +21,7 @@
 #include <tqstringlist.h>
 
 #include <klibloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 
 #include <tdeio/global.h>
diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h
index abd1e8bc..b96af359 100644
--- a/kmobile/devices/skeleton/skeleton.h
+++ b/kmobile/devices/skeleton/skeleton.h
@@ -28,7 +28,7 @@
 
 class KMobileSkeleton : public KMobileDevice
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     KMobileSkeleton( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
@@ -36,7 +36,7 @@ public:
 
     // createObject needs to be reimplemented by every KMobileDevice driver
     TQObject *createObject( TQObject *parent=0, const char *name=0,
-	const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() );
+	const char *classname="TQObject", const TQStringList &args=TQStringList() );
 
     // connect, disconnect and current status
     bool connectDevice(TQWidget *parent);