Remove additional unneeded tq method conversions

1 files changed, 29 insertions, 29 deletions

diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 94b73b77e..b0b1a6540 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -37,20 +37,20 @@
 
 class KConfig;
 
-#define KMOBILE_MIMETYPE_DEVICE			"kdetqdevice/mobiletqdevice"
-#define KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(name) TQString("kdetqdevice/kmobile_%1").tqarg(name)
+#define KMOBILE_MIMETYPE_DEVICE			"kdedevice/mobiledevice"
+#define KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(name) TQString("kdedevice/kmobile_%1").arg(name)
 #define KMOBILE_MIMETYPE_INODE			"inode/"
 #define KMOBILE_ICON_UNKNOWN			"mobile_unknown"
 
 /**
- * @short Represents the base class for dynamically loaded mobile tqdevice drivers.
+ * @short Represents the base class for dynamically loaded mobile device drivers.
  *
- * KMobileDevice is the base class for all hardware tqdevice drivers.
+ * KMobileDevice is the base class for all hardware device drivers.
  * Every derived class has to add additional functionality.
  *
  * For a KMobileSomeDevice driver you have to write the following code:
  * <pre>
- * K_EXPORT_COMPONENT_FACTORY( libkmobile_sometqdevice, KMobileSomeDevice() );
+ * K_EXPORT_COMPONENT_FACTORY( libkmobile_somedevice, KMobileSomeDevice() );
  * TQObject *KMobileSomeDevice::createObject( TQObject *parent, const char *name,
  *      const char *, const TQStringList &args )
  * {
@@ -95,34 +95,34 @@ public:
     virtual bool disconnectDevice( TQWidget *parent = 0 ) = 0;
 
     /**
-     * Returns true, if the tqdevice is currently connected and the link is online.
+     * Returns true, if the device is currently connected and the link is online.
      */
     virtual bool connected();
 
     /**
-     * Returns the classname, to which the tqdevice belongs. Examples are e.g.
+     * Returns the classname, to which the device belongs. Examples are e.g.
      *  "Nokia mobile phone", "MP3 Player", "Handspring Organizer"
      */
-    virtual TQString tqdeviceClassName() const;
+    virtual TQString deviceClassName() const;
 
     /**
-     * Returns the real tqdevices name, e.g. "Nokia 6310" or "Rio MP3 Player"
+     * Returns the real devices name, e.g. "Nokia 6310" or "Rio MP3 Player"
      */
-    virtual TQString tqdeviceName() const;
+    virtual TQString deviceName() const;
 
     /**
-     * Returns the hardware revision of the tqdevices, e.g. "Revision 1.2"
+     * Returns the hardware revision of the devices, e.g. "Revision 1.2"
      */
     virtual TQString revision() const;
 
     /**
-     * Returns an unique ID for the tqdevice, e.g. IMEI number on phones, or serial number.
+     * Returns an unique ID for the device, e.g. IMEI number on phones, or serial number.
      * The returned String is used to have a unique identification for syncronisation.
      */
-    virtual TQString tqdeviceUniqueID() = 0;
+    virtual TQString deviceUniqueID() = 0;
 
     /**
-     * Returns true, if the tqdevice is connected via a slow connection.
+     * Returns true, if the device is connected via a slow connection.
      * Good examples for slow connections are serial or infrared ports.
      */
     virtual bool isSlowDevice() const;
@@ -133,7 +133,7 @@ public:
     virtual bool isReadOnly() const;
 
     /**
-     * Pop-up a tqdevice-specific configuration dialog.
+     * Pop-up a device-specific configuration dialog.
      *
      * @param parent The parent widget. It will be used as parent for the configuration dialog.
      */
@@ -158,14 +158,14 @@ public:
     static TQString defaultIconFileName( ClassType ct = Unclassified );
     static TQString defaultClassName( ClassType ct = Unclassified );
 
-    // The capabilities of this tqdevice (bitmapped value)
+    // The capabilities of this device (bitmapped value)
     enum Capabilities {
 	hasNothing     = 0,	// not supported
 	hasAddressBook = 1,	// mobile phones, organizers, ...
 	hasCalendar    = 2,	// organizers, mobile phones, ...
 	hasNotes       = 4,	// organizers, mobile phones, ...
 	hasFileStorage = 8,	// organizers, handhelds, mp3-player, ...
-	hasAnyCapability = 0xffff // used to select tqdevices independent of the capatibilities
+	hasAnyCapability = 0xffff // used to select devices independent of the capatibilities
     };
     int capabilities() const;
     const TQString nameForCap(int cap) const;
@@ -206,7 +206,7 @@ public:
      */
 
     /**
-     * helper functions for the kmobile tqdevice drivers
+     * helper functions for the kmobile device drivers
      */
     void createDirEntry(KIO::UDSEntry& entry, const TQString& name,
 		const TQString& url, const TQString& mime) const;
@@ -471,7 +471,7 @@ signals:
     void connectionChanged( bool conn_established );
 
 protected:
-    // only available to sub-classed tqdevice drivers:
+    // only available to sub-classed device drivers:
     void setClassType( enum ClassType ct );
     void setCapabilities( int caps );
     KConfig *config() const { return m_config; };
@@ -479,21 +479,21 @@ protected:
 
 
     /**
-     * Lock/Unlock serial ports and other tqdevices
-     * @param tqdevice Name of a tqdevice port (e.g. /dev/ttyS1, ttyS1, /dev/ircomm0)
-     * Returns true, if tqdevice could be locked or unlocked
+     * Lock/Unlock serial ports and other devices
+     * @param device Name of a device port (e.g. /dev/ttyS1, ttyS1, /dev/ircomm0)
+     * Returns true, if device could be locked or unlocked
      */
-    bool lockDevice(const TQString &tqdevice, TQString &err_reason);
-    bool unlockDevice(const TQString &tqdevice);
+    bool lockDevice(const TQString &device, TQString &err_reason);
+    bool unlockDevice(const TQString &device);
 
 protected:
-    TQMutex  m_mutex;		// mutex to syncronize DCOP accesses to this tqdevice
+    TQMutex  m_mutex;		// mutex to syncronize DCOP accesses to this device
     TQString m_configFileName;
-    KConfig *m_config;		// this is where this tqdevice should store it's configuration
+    KConfig *m_config;		// this is where this device should store it's configuration
     enum ClassType m_classType;
-    TQString m_tqdeviceClassName;	// e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer"
-    TQString m_tqdeviceName;	// e.g. "Nokia 6310", "Opie"
-    TQString m_tqdeviceRevision;	// e.g. "Revision 1.2" or "n/a"
+    TQString m_deviceClassName;	// e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer"
+    TQString m_deviceName;	// e.g. "Nokia 6310", "Opie"
+    TQString m_deviceRevision;	// e.g. "Revision 1.2" or "n/a"
     TQString m_connectionName;	// e.g. "IRDA", "USB", "Cable", "gnokii", "gammu", ...
     int m_caps;			// see enum Capabilities
     bool m_connected;