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

4 files changed, 8 insertions, 8 deletions

diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index d5af677..db22241 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -195,7 +195,7 @@ TQString                 LikeBack::s_remotePath            = TQString();
 TQ_UINT16                LikeBack::s_hostPort              = 16;
 int                     LikeBack::s_disabledCount         = 0;
 LikeBack*               LikeBack::s_instance              = 0;
-KConfig*                LikeBack::s_config                = 0;
+TDEConfig*                LikeBack::s_config                = 0;
 TDEAboutData*             LikeBack::s_about                 = 0;
 
 LikeBack* LikeBack::instance()
@@ -415,7 +415,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
                theVersion.find("cvs",   /*index=*/0, /*caseSensitive=*/false) != -1;
 }
 
-void LikeBack::init(KConfig* config, TDEAboutData* about, Button buttons)
+void LikeBack::init(TDEConfig* config, TDEAboutData* about, Button buttons)
 {
         s_config = config;
         s_about = about;
@@ -473,7 +473,7 @@ void LikeBack::endFetchingEmailFrom()
 //      m_configureEmail->setEnabled(true);
 
         // ### KDE4: why oh why is KEmailSettings in kio?
-        KConfig emailConf( TQString::fromLatin1("emaildefaults") );
+        TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );
 
         // find out the default profile
         emailConf.setGroup(TQString::fromLatin1("Defaults"));
diff --git a/src/libgui/likeback.h b/src/libgui/likeback.h
index fa1e260..7c54e4e 100644
--- a/src/libgui/likeback.h
+++ b/src/libgui/likeback.h
@@ -27,7 +27,7 @@ class TQTextEdit;
 class TQToolButton;
 class TQPushButton;
 class TDEProcess;
-class KConfig;
+class TDEConfig;
 class TDEAboutData;
 
 /**
@@ -64,7 +64,7 @@ class LikeBack : public TQWidget
         static bool isDevelopmentVersion(const TQString &version = TQString()); /// << @Returns true if version is an alpha/beta/rc/svn/cvs version. Use kapp->aboutData()->version is @p version is empty
         static void init(Button buttons = AllButtons); /// << Initialize the LikeBack system: enable it if the application version is a development one.
         static void init(bool isDevelopmentVersion, Button buttons = AllButtons);  /// << Initialize the LikeBack system: enable it if @p isDevelopmentVersion is true.
-        static void init(KConfig* config, TDEAboutData* about, Button buttons = AllButtons);
+        static void init(TDEConfig* config, TDEAboutData* about, Button buttons = AllButtons);
         static TQString activeWindowPath();
         static TDEAboutData* about();
   public slots:
@@ -96,7 +96,7 @@ class LikeBack : public TQWidget
         static WindowListing  s_windowListing;
         static LikeBack      *s_instance;
         static int            s_disabledCount;
-        static KConfig       *s_config;
+        static TDEConfig       *s_config;
         static TDEAboutData    *s_about;
 };
 
diff --git a/src/libgui/project.cpp b/src/libgui/project.cpp
index c7a043f..d318438 100644
--- a/src/libgui/project.cpp
+++ b/src/libgui/project.cpp
@@ -27,7 +27,7 @@ bool Project::load(TQString &error)
   PURL::Url tmp = _url;
   _url = _url.toFileType(PURL::Project);
   if ( _url.exists() && XmlDataFile::load(error) ) return true;
-  KConfig *config = new KSimpleConfig(tmp.filepath(), false);
+  TDEConfig *config = new KSimpleConfig(tmp.filepath(), false);
 
   config->setGroup("Files");
   TQStringList list = config->readListEntry("inputFiles");
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index a9ac10e..c9c64da 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -976,7 +976,7 @@ void MainWindow::showProgress(bool show)
 
 void MainWindow::setTotalProgress(uint nb)
 {
-  //KIO::Job *job = new KIO::SimpleJob(KURL(), 0, 0, false);
+  //TDEIO::Job *job = new TDEIO::SimpleJob(KURL(), 0, 0, false);
   //int id = Observer::self()->newJob(job, true);
   //Observer::self()->slotTotalSize(job, total);
   //Observer::self()->slotInfoMessage(job, "test");