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

5 files changed, 11 insertions, 11 deletions

diff --git a/kiconedit/kicon.cpp b/kiconedit/kicon.cpp
index a69bf412..b16a78b5 100644
--- a/kiconedit/kicon.cpp
+++ b/kiconedit/kicon.cpp
@@ -84,7 +84,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
     }
     else
     {
-        if(!KIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
+        if(!TDEIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
         {
             TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
             KMessageBox::error((TQWidget*)parent(), msg);
@@ -96,7 +96,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
 
     if(!url.isLocalFile())
     {
-        KIO::NetAccess::removeTempFile( filename );
+        TDEIO::NetAccess::removeTempFile( filename );
     }
 
     if(!loadedOk) 
diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp
index 38461262..8f93dc37 100644
--- a/kiconedit/kiconedit.cpp
+++ b/kiconedit/kiconedit.cpp
@@ -192,7 +192,7 @@ bool KIconEdit::queryClose()
 }
 
 // this is for exit by request of the session manager
-void KIconEdit::saveProperties(KConfig *config )
+void KIconEdit::saveProperties(TDEConfig *config )
 {
     kdDebug(4640) << "KIconEdit::saveProperties" << endl;
 
@@ -200,7 +200,7 @@ void KIconEdit::saveProperties(KConfig *config )
 }
 
 // this is for instances opened by the session manager
-void KIconEdit::readProperties(KConfig *config)
+void KIconEdit::readProperties(TDEConfig *config)
 {
     kdDebug(4640) << "KIconEdit::readProperties" << endl;
 
@@ -214,7 +214,7 @@ void KIconEdit::readProperties(KConfig *config)
 */
 void KIconEdit::writeConfig()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     m_actRecent->saveEntries( kapp->config() );
 
     KIconEditProperties::self()->save();
diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h
index 30f8df08..746090db 100644
--- a/kiconedit/kiconedit.h
+++ b/kiconedit/kiconedit.h
@@ -72,8 +72,8 @@ signals:
   void newname(const TQString &);
 
 public slots:
-  virtual void saveProperties(KConfig*);
-  virtual void readProperties(KConfig*);
+  virtual void saveProperties(TDEConfig*);
+  virtual void readProperties(TDEConfig*);
   void updateProperties();
 
 protected slots:
diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp
index c48e11cc..1c25fe2f 100644
--- a/kiconedit/knew.cpp
+++ b/kiconedit/knew.cpp
@@ -71,7 +71,7 @@ void createStandardTemplates(KIconTemplateContainer *list)
 
 void KIconTemplateContainer::save()
 {
-  KConfig *k = kapp->config();
+  TDEConfig *k = kapp->config();
   k->setGroup("Templates");
   
   TQStringList names;
@@ -91,7 +91,7 @@ void KIconTemplateContainer::save()
 KIconTemplateContainer::KIconTemplateContainer() : TQValueList<KIconTemplate>()
 {  
   TQStrList names;
-  KConfig *k = kapp->config();
+  TDEConfig *k = kapp->config();
   k->setGroup("Templates");
   k->readListEntry("Names", names);
   for(int i = 0; i < (int)names.count(); i++)
diff --git a/kiconedit/properties.cpp b/kiconedit/properties.cpp
index 53c5f5c4..f9ad44b4 100644
--- a/kiconedit/properties.cpp
+++ b/kiconedit/properties.cpp
@@ -35,7 +35,7 @@ KIconEditProperties* KIconEditProperties::self()
 
 KIconEditProperties::KIconEditProperties() : TQObject()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
 
     config->setGroup( "Appearance" );
 
@@ -92,7 +92,7 @@ KIconEditProperties::~KIconEditProperties()
 
 void KIconEditProperties::save()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
 
     config->setGroup( "Appearance" );