5 files changed, 7 insertions, 7 deletions
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index 1f33996e7..a999fed0d 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -330,7 +330,7 @@ static bool phone_entry_empty( int index, gn_memory_type memtype )
 }
 #endif
 
-static int gn_error2kio_error( gn_error err )
+static int gn_error2tdeio_error( gn_error err )
 {
   if (err != GN_ERR_NONE)
 	GNOKII_CHECK_ERROR(err);
@@ -604,7 +604,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr )
   if (!err)
 	m_addrList[index] = addr;
 
-  return gn_error2kio_error(err);
+  return gn_error2tdeio_error(err);
 }
 
 int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool )
@@ -696,7 +696,7 @@ int KMobileGnokii::readCalendarEntry( int index, KCal::Event &event )
   gn_error error = gn_sm_functions(GN_OP_GetCalendarNote, &data, &state);
   GNOKII_CHECK_ERROR(error);
   if (error != GN_ERR_NONE)
-	return gn_error2kio_error(error);
+	return gn_error2tdeio_error(error);
 
   print_calnote( entry );
 
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index ffd568ea9..9dbad07a1 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -306,7 +306,7 @@ public:
 
     /**
      * Used for any command that is specific to this slave (protocol)
-     * Examples are : HTTP POST, mount and unmount (kio_file)
+     * Examples are : HTTP POST, mount and unmount (tdeio_file)
      *
      * @param data packed data; the meaning is completely dependent on the
      *        slave, but usually starts with an int for the command number.
diff --git a/kmobile/kmobileiface.h b/kmobile/kmobileiface.h
index bac1a9ae6..12b33da91 100644
--- a/kmobile/kmobileiface.h
+++ b/kmobile/kmobileiface.h
@@ -49,7 +49,7 @@ k_dcop:
      * DCOP functions for the devices:/ tdeioslave
      */
 k_dcop:
-    virtual TQStringList kio_devices_deviceInfo(TQString deviceName) = 0;
+    virtual TQStringList tdeio_devices_deviceInfo(TQString deviceName) = 0;
 };
 
 #endif // _KMOBILEIFACE_H_
diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp
index f90c9adf2..5356c879e 100644
--- a/kmobile/kmobileview.cpp
+++ b/kmobile/kmobileview.cpp
@@ -404,7 +404,7 @@ bool KMobileView::storeNote( TQString deviceName, int index, TQString note )
  * active mobile devices.
  * (function is only used by the devices tdeioslave - don't use elsewhere !)
  */
-TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName)
+TQStringList KMobileView::tdeio_devices_deviceInfo(TQString deviceName)
 {
    TQStringList mobiles = deviceNames();
    if (mobiles.count() == 0)
diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h
index 4672349fd..166b8eb92 100644
--- a/kmobile/kmobileview.h
+++ b/kmobile/kmobileview.h
@@ -64,7 +64,7 @@ public:
     bool storeNote( TQString deviceName, int index, TQString note );
 
     /* devices tdeioslave support: */
-    TQStringList kio_devices_deviceInfo(TQString deviceName);
+    TQStringList tdeio_devices_deviceInfo(TQString deviceName);
 
 public:
     void saveAll();