3 files changed, 26 insertions, 25 deletions
diff --git a/kmobile/devices/skeleton/libkmobile_skeleton.desktop b/kmobile/devices/skeleton/libkmobile_skeleton.desktop
index 72943d15..2b22ca6e 100644
--- a/kmobile/devices/skeleton/libkmobile_skeleton.desktop
+++ b/kmobile/devices/skeleton/libkmobile_skeleton.desktop
@@ -102,6 +102,6 @@ Comment[uk]=Прототип мобільного пристрою
 Comment[zh_CN]=移动万能设备
 Comment[zh_TW]=行動通訊空殼裝置
 Type=Service
-ServiceTypes=kdedevice/mobiledevice
+ServiceTypes=kdetqdevice/mobiletqdevice
 X-KDE-Library=libkmobile_skeleton
 Icon=mobile_unknown
diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp
index e6b1d9c5..c027baae 100644
--- a/kmobile/devices/skeleton/skeleton.cpp
+++ b/kmobile/devices/skeleton/skeleton.cpp
@@ -35,24 +35,24 @@
 K_EXPORT_COMPONENT_FACTORY( libkmobile_skeleton, KMobileSkeleton() )
 
 /* createObject needs to be reimplemented by every KMobileDevice driver */
-TQObject *KMobileSkeleton::createObject( TQObject *parent, const char *name,
+TQObject *KMobileSkeleton::createObject( TQObject *tqparent, const char *name,
         const char *, const TQStringList &args )
 {
-  return new KMobileSkeleton( parent, name, args );
+  return new KMobileSkeleton( tqparent, name, args );
 }
 
 
 /**
- *  The KDE skeleton mobile device driver.
+ *  The KDE skeleton mobile tqdevice driver.
  */
 
 KMobileSkeleton::KMobileSkeleton(TQObject *obj, const char *name, const TQStringList &args )
 	: KMobileDevice(obj, name, args)
 {
-  // set initial device info
+  // set initial tqdevice info
   setClassType( Phone );
-  m_deviceName = i18n("LX-50-Moohoo Addressbook (Skeleton)");
-  m_deviceRevision = "0.1";
+  m_tqdeviceName = i18n("LX-50-Moohoo Addressbook (Skeleton)");
+  m_tqdeviceRevision = "0.1";
   setCapabilities( hasAddressBook | hasNotes );
 }
 
@@ -60,26 +60,26 @@ KMobileSkeleton::~KMobileSkeleton()
 {
 }
 
-// connect the device and ask user to turn device on (if necessary)
-bool KMobileSkeleton::connectDevice(TQWidget *parent)
+// connect the tqdevice and ask user to turn tqdevice on (if necessary)
+bool KMobileSkeleton::connectDevice(TQWidget *tqparent)
 {
-  if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parent,
-	i18n("Please turn on your %1 on now and press continue to proceed.").arg(m_deviceName),
-	m_deviceClassName ) )
+  if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparent,
+	i18n("Please turn on your %1 on now and press continue to proceed.").arg(m_tqdeviceName),
+	m_tqdeviceClassName ) )
 	return false;
   // connect it now...
   m_connected = true;
   return m_connected;
 }
 
-// disconnect the device and return true, if sucessful
+// disconnect the tqdevice and return true, if sucessful
 bool KMobileSkeleton::disconnectDevice(TQWidget *)
 {
   m_connected = true;
   return true;
 }
 
-// returns true, if this device is read-only (default: false)
+// returns true, if this tqdevice is read-only (default: false)
 bool KMobileSkeleton::isReadOnly() const
 {
   return true;
@@ -87,7 +87,7 @@ bool KMobileSkeleton::isReadOnly() const
 
 // return a unique ID, e.g. the IMEI number of phones, or a serial number
 // this String is used to have a unique identification for syncronisation.
-TQString KMobileSkeleton::deviceUniqueID()
+TQString KMobileSkeleton::tqdeviceUniqueID()
 { 
   return TQString::fromLocal8Bit("SkElEtOn-123456789");
 }
@@ -132,7 +132,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr )
 
 int KMobileSkeleton::storeAddress( int, const KABC::Addressee &, bool )
 {
-  /* this is a read-only device */
+  /* this is a read-only tqdevice */
   return KIO::ERR_WRITE_ACCESS_DENIED;
 }
 
@@ -157,7 +157,7 @@ int KMobileSkeleton::readNote( int index, TQString &note )
 	"Device Driver  : %4\n"
 	"Device Revision: %5\n")
 	.arg(index).arg(index)
-	.arg(deviceClassName()).arg(deviceName()).arg(revision()); 
+	.arg(tqdeviceClassName()).arg(tqdeviceName()).arg(revision()); 
   return 0;
 }
 
diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h
index de57947a..8d5c3db4 100644
--- a/kmobile/devices/skeleton/skeleton.h
+++ b/kmobile/devices/skeleton/skeleton.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef LIBKMOBILE_SKELETON_H
@@ -29,26 +29,27 @@
 class KMobileSkeleton : public KMobileDevice
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
     KMobileSkeleton( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
     ~KMobileSkeleton();
 
     // createObject needs to be reimplemented by every KMobileDevice driver
-    TQObject *createObject( TQObject *parent=0, const char *name=0,
-	const char *classname="TQObject", const TQStringList &args=TQStringList() );
+    TQObject *createObject( TQObject *tqparent=0, const char *name=0,
+	const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() );
 
     // connect, disconnect and current status
-    bool connectDevice(TQWidget *parent);
-    bool disconnectDevice(TQWidget *parent);
+    bool connectDevice(TQWidget *tqparent);
+    bool disconnectDevice(TQWidget *tqparent);
 
-    // returns true, if this device is read-only (default: false)
+    // returns true, if this tqdevice is read-only (default: false)
     bool isReadOnly() const;
 
     // you may provide your own icon() implementation to display
     // an appropriate Pixmap (e.g. a Palm Pilot or a Zaurus image).
     TQString iconFileName() const;
 
-    TQString deviceUniqueID();
+    TQString tqdeviceUniqueID();
 
     /*
      * Addressbook / Phonebook support