Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 18 insertions, 18 deletions

diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp
index d895a3666..3778f1c16 100644
--- a/kmobile/kmobileitem.cpp
+++ b/kmobile/kmobileitem.cpp
@@ -37,9 +37,9 @@ KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr ser
    Q_CHECK_PTR(service);
    if (service) {
 	setText(service->name());
-	m_deviceDesktopFile = service->desktopEntryName();
-	m_deviceConfigFile = TQString("kmobile_%1_rc").arg(text());
-	m_deviceConfigFile = m_deviceConfigFile.replace(' ', "");
+	m_tqdeviceDesktopFile = service->desktopEntryName();
+	m_tqdeviceConfigFile = TQString("kmobile_%1_rc").tqarg(text());
+	m_tqdeviceConfigFile = m_tqdeviceConfigFile.replace(' ', "");
 	m_iconName = service->icon();
    };
 
@@ -75,8 +75,8 @@ void KMobileItem::configSave() const
 {
    config->setGroup( config_SectionName() );
    config->writeEntry( "Name", text() );
-   config->writeEntry( "Config", m_deviceConfigFile );
-   config->writeEntry( "DesktopFile", m_deviceDesktopFile );
+   config->writeEntry( "Config", m_tqdeviceConfigFile );
+   config->writeEntry( "DesktopFile", m_tqdeviceDesktopFile );
    config->writeEntry( "IconName", m_iconName );
    config->sync();
 }
@@ -85,12 +85,12 @@ bool KMobileItem::configLoad(int idx)
 {
    config->setGroup( config_SectionName(idx) );
    setText( config->readEntry("Name") );
-   m_deviceConfigFile	= config->readEntry( "Config" );
-   m_deviceDesktopFile	= config->readEntry( "DesktopFile" );
+   m_tqdeviceConfigFile	= config->readEntry( "Config" );
+   m_tqdeviceDesktopFile	= config->readEntry( "DesktopFile" );
    m_iconName		= config->readEntry( "IconName" );
 
-   if (text().isEmpty() || m_deviceConfigFile.isEmpty() ||
-	m_deviceDesktopFile.isEmpty() || m_iconName.isEmpty() )
+   if (text().isEmpty() || m_tqdeviceConfigFile.isEmpty() ||
+	m_tqdeviceDesktopFile.isEmpty() || m_iconName.isEmpty() )
 	return false;
 
    return true;
@@ -104,7 +104,7 @@ TQPixmap KMobileItem::getIcon() const
 TQString KMobileItem::config_SectionName(int idx) const
 {
    if (idx == -1) idx = index();
-   return TQString("MobileDevice_%1").arg(idx);
+   return TQString("MobileDevice_%1").tqarg(idx);
 }
 
 /* this MimeType is used by konqueror */
@@ -125,7 +125,7 @@ void KMobileItem::writeKonquMimeFile() const
 
    TQString comment;
    if (m_dev)
-	comment = m_dev->deviceClassName();
+	comment = m_dev->tqdeviceClassName();
    if (comment.isEmpty())
 	comment = KMobileDevice::defaultClassName(KMobileDevice::Unclassified);
 
@@ -142,7 +142,7 @@ void KMobileItem::writeKonquMimeFile() const
 
 
 /*
- * get a list of all services providing a libkmobile device driver
+ * get a list of all services providing a libkmobile tqdevice driver
  */
 KTrader::OfferList KMobileItem::getMobileDevicesList()
 {
@@ -158,16 +158,16 @@ KService::Ptr KMobileItem::getServicePtr() const
   KService::Ptr ptr;
   for ( it = list.begin(); it != list.end(); ++it ) {
     KService::Ptr ptr = *it;
-    if (ptr->desktopEntryName() == m_deviceDesktopFile)
+    if (ptr->desktopEntryName() == m_tqdeviceDesktopFile)
  	return ptr;
   }
   PRINT_DEBUG << TQString("Service for library '%1' not found in KService list\n")
-			.arg(m_deviceDesktopFile);
+			.tqarg(m_tqdeviceDesktopFile);
   return 0L;
 }
 
 /*
- * loads & initializes the device and returns a pointer to it.
+ * loads & initializes the tqdevice and returns a pointer to it.
  */
 bool KMobileItem::driverAvailable()
 {
@@ -178,15 +178,15 @@ bool KMobileItem::driverAvailable()
    if (!ptr)
 	return false;
 
-   PRINT_DEBUG << TQString("Loading library %1\n").arg(ptr->library());
+   PRINT_DEBUG << TQString("Loading library %1\n").tqarg(ptr->library());
    KLibFactory *factory = KLibLoader::self()->factory( ptr->library().utf8() );
    if (!factory)
 	return false;
 
    m_dev = static_cast<KMobileDevice *>(factory->create(this, ptr->name().utf8(),
-				"KMobileDevice", TQStringList(m_deviceConfigFile)));
+				"KMobileDevice", TQStringList(m_tqdeviceConfigFile)));
    PRINT_DEBUG << TQString("Got KMobileDevice object at 0x%1, configfile=%2\n")
-			.arg((unsigned long)m_dev, 0, 16).arg(m_deviceConfigFile);
+			.tqarg((unsigned long)m_dev, 0, 16).tqarg(m_tqdeviceConfigFile);
 
    return (m_dev != 0);
 }