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

6 files changed, 34 insertions, 34 deletions

diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index 747f69811..bee2c062b 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -175,14 +175,14 @@ void KfindDlg::slotResult(int errorCode)
 {
   if (errorCode == 0)
     setStatusMsg(i18n("Ready."));
-  else if (errorCode == KIO::ERR_USER_CANCELED)
+  else if (errorCode == TDEIO::ERR_USER_CANCELED)
     setStatusMsg(i18n("Aborted."));
-  else if (errorCode == KIO::ERR_MALFORMED_URL)
+  else if (errorCode == TDEIO::ERR_MALFORMED_URL)
   {
      setStatusMsg(i18n("Error."));
      KMessageBox::sorry( this, i18n("Please specify an absolute path in the \"Look in\" box."));
   }
-  else if (errorCode == KIO::ERR_DOES_NOT_EXIST)
+  else if (errorCode == TDEIO::ERR_DOES_NOT_EXIST)
   {
      setStatusMsg(i18n("Error."));
      KMessageBox::sorry( this, i18n("Could not find the specified folder."));
diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp
index 913a915a7..482400d50 100644
--- a/kfind/kfindpart.cpp
+++ b/kfind/kfindpart.cpp
@@ -155,7 +155,7 @@ void KFindPart::slotResult(int errorCode)
   if (errorCode == 0)
     emit finished();
     //setStatusMsg(i18n("Ready."));
-  else if (errorCode == KIO::ERR_USER_CANCELED)
+  else if (errorCode == TDEIO::ERR_USER_CANCELED)
     emit canceled();
     //setStatusMsg(i18n("Aborted."));
   else
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 75e89a9a0..f5ec0a55b 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -380,7 +380,7 @@ KfindTabWidget::~KfindTabWidget()
 
 void KfindTabWidget::setURL( const KURL & url )
 {
-  KConfig *conf = TDEGlobal::config();
+  TDEConfig *conf = TDEGlobal::config();
   conf->setGroup("History");
   m_url = url;
   TQStringList sl = conf->readPathListEntry("Directories");
@@ -459,7 +459,7 @@ void KfindTabWidget::saveHistory()
 void KfindTabWidget::loadHistory()
 {
   // Load pattern history
-  KConfig *conf = TDEGlobal::config();
+  TDEConfig *conf = TDEGlobal::config();
   conf->setGroup("History");
   TQStringList sl = conf->readListEntry("Patterns");
   if(!sl.isEmpty())
@@ -575,8 +575,8 @@ bool KfindTabWidget::isDateValid()
 
 void KfindTabWidget::setQuery(KQuery *query)
 {
-  KIO::filesize_t size;
-  KIO::filesize_t sizeunit;
+  TDEIO::filesize_t size;
+  TDEIO::filesize_t sizeunit;
   bool itemAlreadyContained(false);
   // only start if we have valid dates
   if (!isDateValid()) return;
@@ -849,7 +849,7 @@ static void save_pattern(TQComboBox *obj,
     }
   }
 
-  KConfig *conf = TDEGlobal::config();
+  TDEConfig *conf = TDEGlobal::config();
   conf->setGroup(group);
   conf->writePathEntry(entry, sl);
 }
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index 740c7ae39..d0f7fb513 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -64,7 +64,7 @@ KfFileLVI::KfFileLVI(KfindWindow* lv, const KFileItem &item, const TQString& mat
   TQString size = TDEGlobal::locale()->formatNumber(item.size(), 0);
 
   TQDateTime dt;
-  dt.setTime_t(item.time(KIO::UDS_MODIFICATION_TIME));
+  dt.setTime_t(item.time(TDEIO::UDS_MODIFICATION_TIME));
   TQString date = TDEGlobal::locale()->formatDateTime(dt);
 
   int perm_index;
@@ -98,7 +98,7 @@ TQString KfFileLVI::key(int column, bool) const
     return TQString().sprintf("%010d", fileInfo->size());
   case 3:
     // Returns time in secs from 1/1/1970. Used for sorting
-    return TQString().sprintf("%010ld", fileitem.time(KIO::UDS_MODIFICATION_TIME));
+    return TQString().sprintf("%010ld", fileitem.time(TDEIO::UDS_MODIFICATION_TIME));
   }
 
   return text(column);
@@ -296,7 +296,7 @@ void KfindWindow::deleteFiles()
     KfFileLVI *item = (KfFileLVI *) selected.at(i);
     KFileItem file = item->fileitem;
 
-    KIO::NetAccess::del(file.url(), this);
+    TDEIO::NetAccess::del(file.url(), this);
   }
   selected.setAutoDelete(true);
 }
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index e6f8664fe..b889e3ba9 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -83,17 +83,17 @@ void KQuery::start()
   }
 
   if (m_recursive)
-    job = KIO::listRecursive( m_url, false );
+    job = TDEIO::listRecursive( m_url, false );
   else
-    job = KIO::listDir( m_url, false );
+    job = TDEIO::listDir( m_url, false );
 
-  connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)),
-	  TQT_SLOT(slotListEntries(KIO::Job *, const KIO::UDSEntryList &)));
-  connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
-  connect(job, TQT_SIGNAL(canceled(KIO::Job *)), TQT_SLOT(slotCanceled(KIO::Job *)));
+  connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
+	  TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
+  connect(job, TQT_SIGNAL(canceled(TDEIO::Job *)), TQT_SLOT(slotCanceled(TDEIO::Job *)));
 }
 
-void KQuery::slotResult( KIO::Job * _job )
+void KQuery::slotResult( TDEIO::Job * _job )
 {
   if (job != _job) return;
   job = 0;
@@ -102,21 +102,21 @@ void KQuery::slotResult( KIO::Job * _job )
   checkEntries();
 }
 
-void KQuery::slotCanceled( KIO::Job * _job )
+void KQuery::slotCanceled( TDEIO::Job * _job )
 {
   if (job != _job) return;
   job = 0;
 
   m_fileItems.clear();
-  m_result=KIO::ERR_USER_CANCELED;
+  m_result=TDEIO::ERR_USER_CANCELED;
   checkEntries();
 }
 
-void KQuery::slotListEntries(KIO::Job*, const KIO::UDSEntryList& list)
+void KQuery::slotListEntries(TDEIO::Job*, const TDEIO::UDSEntryList& list)
 {
   KFileItem * file = 0;
-  KIO::UDSEntryListConstIterator end = list.end();
-  for (KIO::UDSEntryListConstIterator it = list.begin(); it != end; ++it)
+  TDEIO::UDSEntryListConstIterator end = list.end();
+  for (TDEIO::UDSEntryListConstIterator it = list.begin(); it != end; ++it)
   {
     file = new KFileItem(*it, m_url, true, true);
     m_fileItems.enqueue(file);
@@ -200,9 +200,9 @@ void KQuery::processQuery( KFileItem* file)
 
     // make sure it's in the correct date range
     // what about 0 times?
-    if ( m_timeFrom && m_timeFrom > file->time(KIO::UDS_MODIFICATION_TIME) )
+    if ( m_timeFrom && m_timeFrom > file->time(TDEIO::UDS_MODIFICATION_TIME) )
       return;
-    if ( m_timeTo && m_timeTo < file->time(KIO::UDS_MODIFICATION_TIME) )
+    if ( m_timeTo && m_timeTo < file->time(TDEIO::UDS_MODIFICATION_TIME) )
       return;
 
     // username / group match
@@ -423,7 +423,7 @@ void KQuery::setFileType(int filetype)
   m_filetype = filetype;
 }
 
-void KQuery::setSizeRange(int mode, KIO::filesize_t value1, KIO::filesize_t value2)
+void KQuery::setSizeRange(int mode, TDEIO::filesize_t value1, TDEIO::filesize_t value2)
 {
   m_sizemode = mode;
   m_sizeboundary1 = value1;
diff --git a/kfind/kquery.h b/kfind/kquery.h
index 5ddc334fd..4b6a1c898 100644
--- a/kfind/kquery.h
+++ b/kfind/kquery.h
@@ -23,7 +23,7 @@ class KQuery : public TQObject
   KQuery(TQObject *parent = 0, const char * name = 0);
   ~KQuery();
 
-  void setSizeRange( int mode, KIO::filesize_t value1, KIO::filesize_t value2 );
+  void setSizeRange( int mode, TDEIO::filesize_t value1, TDEIO::filesize_t value2 );
   void setTimeRange( time_t from, time_t to );
   void setRegExp( const TQString &regexp, bool caseSensitive );
   void setRecursive( bool recursive );
@@ -50,9 +50,9 @@ class KQuery : public TQObject
   void slotListEntries(TQStringList);
  protected slots:
   /* List of files found using KIO */
-  void slotListEntries(KIO::Job *, const KIO::UDSEntryList &);
-  void slotResult(KIO::Job *);
-  void slotCanceled(KIO::Job *);
+  void slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &);
+  void slotResult(TDEIO::Job *);
+  void slotCanceled(TDEIO::Job *);
   void slotreceivedSdtout(TDEProcess*,char*,int);
   void slotreceivedSdterr(TDEProcess*,char*,int);
   void slotendProcessLocate(TDEProcess*);
@@ -66,8 +66,8 @@ class KQuery : public TQObject
 
   int m_filetype;
   int m_sizemode;
-  KIO::filesize_t m_sizeboundary1;
-  KIO::filesize_t m_sizeboundary2;
+  TDEIO::filesize_t m_sizeboundary1;
+  TDEIO::filesize_t m_sizeboundary2;
   KURL m_url;
   time_t m_timeFrom;
   time_t m_timeTo;
@@ -89,7 +89,7 @@ class KQuery : public TQObject
   TDEProcess *processLocate;
   TQPtrList<TQRegExp> m_regexps;// regexps for file name
 //  TQValueList<bool> m_regexpsContainsGlobs;  // what should this be good for ? Alex
-  KIO::ListJob *job;
+  TDEIO::ListJob *job;
   bool m_insideCheckEntries;
   TQPtrQueue<KFileItem> m_fileItems;
   TQRegExp* metaKeyRx;