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

3 files changed, 4 insertions, 4 deletions

diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 77758b1..047e368 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -52,7 +52,7 @@ KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name
     m_path = path;
     setCaption(i18n("Create Image Gallery"));
     setButtonOK( KGuiItem(i18n("Create"),"imagegallery") );
-    m_config = new KConfig("kimgallerypluginrc", false, false);
+    m_config = new TDEConfig("kimgallerypluginrc", false, false);
     setupLookPage(path);
     setupDirectoryPage(path);
     setupThumbnailPage(path);
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.h b/konq-plugins/kimgalleryplugin/imgallerydialog.h
index add798d..6c767fe 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.h
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.h
@@ -32,7 +32,7 @@ class TQLineEdit;
 class KURLRequester;
 class TQSpinBox;
 class KColorButton;
-class KConfig;
+class TDEConfig;
 
 typedef TQMap<TQString,TQString> CommentMap;
 
@@ -103,7 +103,7 @@ class KIGPDialog : public KDialogBase
   KURLRequester *m_commentFileReq;
   bool m_dialogOk;
 
-  KConfig *m_config;
+  TDEConfig *m_config;
 
  private:
   void setupLookPage(const TQString& path);
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index 68cccfe..ea343da 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -431,7 +431,7 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou
         //kdDebug(90170) << "srcURL: " << srcURL << endl;
         KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::fromLatin1("/images/") + imgName);
         //kdDebug(90170) << "destURL: " << destURL << endl;
-        KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget());
+        TDEIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget());
     }
 
     const TQString imgNameFormat = imgName + extension(imageFormat);