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

5 files changed, 14 insertions, 14 deletions

diff --git a/kcontrol/filetypes/control.cpp b/kcontrol/filetypes/control.cpp
index 9736e9c9b..5a0fd097b 100644
--- a/kcontrol/filetypes/control.cpp
+++ b/kcontrol/filetypes/control.cpp
@@ -2,7 +2,7 @@
 
 extern "C"
 {
-	  KDE_EXPORT KCModule *create_filetypes(TQWidget *parent, const char *)
+	  KDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *)
           {
         return new FileTypesView(parent, "filetypes");
 	  }
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index 6d8ee9860..07b023532 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -25,7 +25,7 @@
 #include <ksycoca.h>
 
 FileTypesView::FileTypesView(TQWidget *p, const char *name)
-  : KCModule(p, name)
+  : TDECModule(p, name)
 {
   m_konqConfig = KSharedConfig::openConfig("konquerorrc", false, false);
 
diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h
index 2db123398..db1116b29 100644
--- a/kcontrol/filetypes/filetypesview.h
+++ b/kcontrol/filetypes/filetypesview.h
@@ -21,7 +21,7 @@ class FileTypeDetails;
 class FileGroupDetails;
 class TQWidgetStack;
 
-class FileTypesView : public KCModule
+class FileTypesView : public TDECModule
 {
   Q_OBJECT
 public:
diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp
index 618c8d825..df59d4b31 100644
--- a/kcontrol/filetypes/typeslistitem.cpp
+++ b/kcontrol/filetypes/typeslistitem.cpp
@@ -273,9 +273,9 @@ void TypesListItem::sync()
 
   if (isMimeTypeDirty())
   {
-    // We must use KConfig otherwise config.deleteEntry doesn't
+    // We must use TDEConfig otherwise config.deleteEntry doesn't
     // properly cancel out settings already present in system files.
-    KConfig config( m_mimetype->desktopEntryPath(), false, false, "mime" );
+    TDEConfig config( m_mimetype->desktopEntryPath(), false, false, "mime" );
     config.setDesktopGroup();
 
     config.writeEntry("Type", "MimeType");
@@ -293,7 +293,7 @@ void TypesListItem::sync()
     m_bNewItem = false;
   }
 
-  KConfig profile("profilerc", false, false);
+  TDEConfig profile("profilerc", false, false);
 
   // Deleting current contents in profilerc relating to
   // this service type
@@ -357,15 +357,15 @@ void TypesListItem::sync()
         if ( mimeTypeList.contains( name() ) ) {
           // The mimetype is listed explicitly in the .desktop files, so
           // just remove it and we're done
-          KConfig *desktop;
+          TDEConfig *desktop;
           if ( !isApplication )
           {
-            desktop = new KConfig(pService->desktopEntryPath(), false, false, "services");
+            desktop = new TDEConfig(pService->desktopEntryPath(), false, false, "services");
           }
           else
           {
             TQString path = pService->locateLocal();
-            KConfig orig(pService->desktopEntryPath(), true, false, "apps");
+            TDEConfig orig(pService->desktopEntryPath(), true, false, "apps");
             desktop = orig.copyTo(path);
           }
           desktop->setDesktopGroup();
@@ -452,7 +452,7 @@ KMimeType::Ptr TypesListItem::findImplicitAssociation(const TQString &desktop)
     return 0;
 }
 
-void TypesListItem::saveServices( KConfig & profile, TQStringList services, const TQString & genericServiceType )
+void TypesListItem::saveServices( TDEConfig & profile, TQStringList services, const TQString & genericServiceType )
 {
   TQStringList::Iterator it(services.begin());
   for (int i = services.count(); it != services.end(); ++it, i--) {
@@ -482,15 +482,15 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons
 
     if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList))
     {
-      KConfig *desktop;
+      TDEConfig *desktop;
       if ( pService->type() == TQString("Service") )
       {
-        desktop = new KConfig(pService->desktopEntryPath(), false, false, "services");
+        desktop = new TDEConfig(pService->desktopEntryPath(), false, false, "services");
       }
       else
       {
         TQString path = pService->locateLocal();
-        KConfig orig(pService->desktopEntryPath(), true, false, "apps");
+        TDEConfig orig(pService->desktopEntryPath(), true, false, "apps");
         desktop = orig.copyTo(path);
       }
 
diff --git a/kcontrol/filetypes/typeslistitem.h b/kcontrol/filetypes/typeslistitem.h
index 1946d9ab7..671604961 100644
--- a/kcontrol/filetypes/typeslistitem.h
+++ b/kcontrol/filetypes/typeslistitem.h
@@ -96,7 +96,7 @@ public:
 
 private:
   void getServiceOffers( TQStringList & appServices, TQStringList & embedServices ) const;
-  void saveServices( KConfig & profile, TQStringList services, const TQString & servicetype2 );
+  void saveServices( TDEConfig & profile, TQStringList services, const TQString & servicetype2 );
   void initMeta( const TQString & major );
   void init(KMimeType::Ptr mimetype);
   static int readAutoEmbed( KMimeType::Ptr mimetype );