Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

2 files changed, 11 insertions, 11 deletions

diff --git a/krsync/krsync.cpp b/krsync/krsync.cpp
index a9bf295a2..d184a0507 100644
--- a/krsync/krsync.cpp
+++ b/krsync/krsync.cpp
@@ -428,7 +428,7 @@ KDE_EXPORT bool KRsync::syncBidirectional(TQString synccommand, TQString syncfla
 /**
 writes one chunk of data to stdin of child process
 */
-KDE_EXPORT void KRsync::writeChild(const char *buf, KIO::fileoffset_t len) {
+KDE_EXPORT void KRsync::writeChild(const char *buf, TDEIO::fileoffset_t len) {
     if (outBufPos >= 0 && outBuf) {
 #if 0
         TQString debug;
@@ -445,7 +445,7 @@ KDE_EXPORT void KRsync::writeChild(const char *buf, KIO::fileoffset_t len) {
 /**
 manages initial communication setup including password queries
 */
-KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) {
+KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_t len) {
     TQString buf;
     buf.setLatin1(buffer,len);
     int pos;
@@ -560,7 +560,7 @@ KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, KIO::fileoffset_t
 /**
 manages initial communication setup including password queries
 */
-KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, TQString localfolder, TQString remotepath) {
+KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, TDEIO::fileoffset_t len, TQString localfolder, TQString remotepath) {
     TQString buf;
     buf.setLatin1(buffer,len);
     int pos;
@@ -775,7 +775,7 @@ KDE_EXPORT void KRsync::shutdownConnection(bool forced, bool wait){
 
 KDE_EXPORT void KRsync::saveSettings()
 {
-  KConfig cfg ("rsyncrc", false, false);
+  TDEConfig cfg ("rsyncrc", false, false);
   cfg.setGroup ("General");
   cfg.writeEntry("LocalFolders", cfgfolderlist, CONFIGURATION_FILE_SEPARATOR);
   cfg.writeEntry("AutoSyncOnLogout", cfgautosync_onlogout_list, CONFIGURATION_FILE_SEPARATOR);
@@ -787,7 +787,7 @@ KDE_EXPORT void KRsync::loadSettings()
   if (m_bSettingsLoaded)
     return;
 
-  KConfig cfg ("rsyncrc", false, false);
+  TDEConfig cfg ("rsyncrc", false, false);
   cfg.setGroup ("General");
 
   cfgfolderlist = cfg.readListEntry("LocalFolders", CONFIGURATION_FILE_SEPARATOR);
diff --git a/krsync/krsync.h b/krsync/krsync.h
index 6bca00827..50ff7a7d9 100644
--- a/krsync/krsync.h
+++ b/krsync/krsync.h
@@ -103,17 +103,17 @@ public:
   int addLocalFolderByName(TQString folderurl, TQString remoteurl, TQString syncmethod, TQString excludelist, TQString sync_on_login, TQString sync_on_logout, TQString sync_timed_interval);
   TQString findSyncMethodByName(TQString folderurl);
   /** manages initial communication setup including password queries */
-  int establishConnectionRsync(char *buffer, KIO::fileoffset_t len);
+  int establishConnectionRsync(char *buffer, TDEIO::fileoffset_t len);
   /** manages initial communication setup including password queries */
-  int establishConnectionUnison(char *buffer, KIO::fileoffset_t len, TQString localfolder, TQString remotepath);
+  int establishConnectionUnison(char *buffer, TDEIO::fileoffset_t len, TQString localfolder, TQString remotepath);
   /** creates the unidirectional sync subprocess */
   bool syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath);
   /** creates the bidirectional sync subprocess */
   bool syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath);
   /** writes one chunk of data to stdin of child process */
-  void writeChild(const char *buf, KIO::fileoffset_t len);
+  void writeChild(const char *buf, TDEIO::fileoffset_t len);
   /** AuthInfo object used for logging in */
-  KIO::AuthInfo connectionAuth;
+  TDEIO::AuthInfo connectionAuth;
   /**
    Clean up connection
   */
@@ -158,9 +158,9 @@ private:
   /** buffer for data to be written */
   const char *outBuf;
   /** current write position in buffer */
-  KIO::fileoffset_t outBufPos;
+  TDEIO::fileoffset_t outBufPos;
   /** length of buffer */
-  KIO::fileoffset_t outBufLen;
+  TDEIO::fileoffset_t outBufLen;
   /** use su if true else use ssh */
   //bool local;
   /**  // FIXME: just a workaround for konq deficiencies */