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

6 files changed, 38 insertions, 38 deletions

diff --git a/sip/kutils/kcmoduleinfo.sip b/sip/kutils/kcmoduleinfo.sip
index a983cd9..4664aa4 100644
--- a/sip/kutils/kcmoduleinfo.sip
+++ b/sip/kutils/kcmoduleinfo.sip
@@ -26,7 +26,7 @@
 
 %If ( KDE_3_3_0 -  )
 
-class KCModuleInfo
+class TDECModuleInfo
 {
 %TypeHeaderCode
 #include <kcmoduleinfo.h>
@@ -34,16 +34,16 @@ class KCModuleInfo
 
 
 public:
-                         KCModuleInfo (const TQString&);
-                         KCModuleInfo (KService::Ptr);
-                         KCModuleInfo (const KCModuleInfo&);
+                         TDECModuleInfo (const TQString&);
+                         TDECModuleInfo (KService::Ptr);
+                         TDECModuleInfo (const TDECModuleInfo&);
 
 %If ( KDE_3_4_0 -  )
-                         KCModuleInfo ();
+                         TDECModuleInfo ();
 %End
 
-    bool                 operator == (const KCModuleInfo&) const;
-    bool                 operator != (const KCModuleInfo&) const;
+    bool                 operator == (const TDECModuleInfo&) const;
+    bool                 operator != (const TDECModuleInfo&) const;
     TQString              fileName () const;
     const TQStringList&   keywords () const;
 
@@ -85,7 +85,7 @@ protected:
     void                 setDocPath (const TQString&);
     void                 loadAll ();
 
-};  // class KCModuleInfo
+};  // class TDECModuleInfo
 
 %End
 
diff --git a/sip/kutils/kcmoduleloader.sip b/sip/kutils/kcmoduleloader.sip
index d001591..6a21295 100644
--- a/sip/kutils/kcmoduleloader.sip
+++ b/sip/kutils/kcmoduleloader.sip
@@ -26,7 +26,7 @@
 
 %If ( KDE_3_3_0 -  )
 
-class KCModuleLoader
+class TDECModuleLoader
 {
 %TypeHeaderCode
 #include <kcmoduleloader.h>
@@ -34,8 +34,8 @@ class KCModuleLoader
 
 
 public:
-    static KCModule*     loadModule (const KCModuleInfo&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
-    static KCModule*     loadModule (const TQString&, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
+    static TDECModule*     loadModule (const TDECModuleInfo&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
+    static TDECModule*     loadModule (const TQString&, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
 
 %If ( KDE_3_4_0 -  )
 
@@ -47,21 +47,21 @@ public:
         Both
     };
 
-    static KCModule*     loadModule (const KCModuleInfo&, KCModuleLoader::ErrorReporting, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
-    static KCModule*     loadModule (const TQString&, KCModuleLoader::ErrorReporting, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
+    static TDECModule*     loadModule (const TDECModuleInfo&, TDECModuleLoader::ErrorReporting, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
+    static TDECModule*     loadModule (const TQString&, TDECModuleLoader::ErrorReporting, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
 %End
 
-    static void          unloadModule (const KCModuleInfo&);
+    static void          unloadModule (const TDECModuleInfo&);
     static void          showLastLoaderError (TQWidget*);
 
 %If ( KDE_3_4_0 -  )
     static bool          testModule (const TQString&);
-    static bool          testModule (const KCModuleInfo&);
-    static KCModule*     reportError (KCModuleLoader::ErrorReporting, const TQString&, TQString, TQWidget*);
+    static bool          testModule (const TDECModuleInfo&);
+    static TDECModule*     reportError (TDECModuleLoader::ErrorReporting, const TQString&, TQString, TQWidget*);
 %End
 
 
-};  // class KCModuleLoader
+};  // class TDECModuleLoader
 
 %End
 
diff --git a/sip/kutils/kcmoduleproxy.sip b/sip/kutils/kcmoduleproxy.sip
index ea68785..6224c01 100644
--- a/sip/kutils/kcmoduleproxy.sip
+++ b/sip/kutils/kcmoduleproxy.sip
@@ -26,7 +26,7 @@
 
 %If ( KDE_3_3_0 -  )
 
-class KCModuleProxy : TQWidget
+class TDECModuleProxy : TQWidget
 {
 %TypeHeaderCode
 #include <kcmoduleproxy.h>
@@ -34,11 +34,11 @@ class KCModuleProxy : TQWidget
 
 
 public:
-                         KCModuleProxy (const KCModuleInfo&, bool = 0, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
+                         TDECModuleProxy (const TDECModuleInfo&, bool = 0, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
 
 %If ( KDE_3_4_0 -  )
-                         KCModuleProxy (const TQString&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
-                         KCModuleProxy (const KService::Ptr&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
+                         TDECModuleProxy (const TQString&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
+                         TDECModuleProxy (const KService::Ptr&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ());
 %End
 
     void                 load ();
@@ -55,8 +55,8 @@ public:
     bool                 rootMode () const;
 %End
 
-    KCModule*            realModule () const;
-    const KCModuleInfo&  moduleInfo () const;
+    TDECModule*            realModule () const;
+    const TDECModuleInfo&  moduleInfo () const;
 
 %If ( KDE_3_4_0 -  )
     TQCString             dcopName () const;
@@ -76,7 +76,7 @@ signals:
     void                 changed (bool);
 
 %If ( KDE_3_4_0 -  )
-    void                 changed (KCModuleProxy*);
+    void                 changed (TDECModuleProxy*);
     void                 childClosed ();
     void                 quickHelpChanged ();
 %End
@@ -86,7 +86,7 @@ protected:
     void                 showEvent (TQShowEvent*);
 
 %If ( KDE_3_4_0 -  )
-    void                 init (const KCModuleInfo&);
+    void                 init (const TDECModuleInfo&);
     void                 emitQuickHelpChanged ();
 %End
 
@@ -98,7 +98,7 @@ public:
 %End
 
 
-};  // class KCModuleProxy
+};  // class TDECModuleProxy
 
 %End
 
diff --git a/sip/kutils/kcmultidialog.sip b/sip/kutils/kcmultidialog.sip
index 9ab17e4..3a1f511 100644
--- a/sip/kutils/kcmultidialog.sip
+++ b/sip/kutils/kcmultidialog.sip
@@ -38,7 +38,7 @@ public:
                          KCMultiDialog (int, const TQString&, TQWidget* = 0, const char* = 0, bool = 0);
                          KCMultiDialog (int, const KGuiItem&, const KGuiItem& = KGuiItem (), int = User2 , const TQString& = i18n ("Configure" ), TQWidget* = 0, const char* = 0, bool = 0);
     void                 addModule (const TQString&, bool = 1)  /ReleaseGIL/;
-    void                 addModule (const KCModuleInfo&, TQStringList = TQStringList (), bool = 0);
+    void                 addModule (const TDECModuleInfo&, TQStringList = TQStringList (), bool = 0);
     void                 removeAllModules ();
     void                 show ();
 
@@ -63,7 +63,7 @@ private:
 // must be sorted by name.
 
 static sipStringTypeClassMap map[] = {
-{sipName_KCModuleProxy,           &sipClass_KCModuleProxy},
+{sipName_TDECModuleProxy,           &sipClass_TDECModuleProxy},
 {sipName_KCMultiDialog,           &sipClass_KCMultiDialog},
 {sipName_KFind,                   &sipClass_KFind},
 {sipName_KFindDialog,             &sipClass_KFindDialog},
diff --git a/sip/kutils/kplugininfo.sip b/sip/kutils/kplugininfo.sip
index 20dee1f..c2ef478 100644
--- a/sip/kutils/kplugininfo.sip
+++ b/sip/kutils/kplugininfo.sip
@@ -37,9 +37,9 @@ public:
     typedef TQValueList<KPluginInfo*> List;
                          KPluginInfo (const TQString&, const char* = 0);
                          KPluginInfo (const KService::Ptr);
-    static KPluginInfo::List fromServices (const KService::List&, KConfig* = 0, const TQString& = TQString ::null );
-    static KPluginInfo::List fromFiles (const TQStringList&, KConfig* = 0, const TQString& = TQString ::null );
-    static KPluginInfo::List fromKPartsInstanceName (const TQString&, KConfig* = 0, const TQString& = TQString ::null );
+    static KPluginInfo::List fromServices (const KService::List&, TDEConfig* = 0, const TQString& = TQString ::null );
+    static KPluginInfo::List fromFiles (const TQStringList&, TDEConfig* = 0, const TQString& = TQString ::null );
+    static KPluginInfo::List fromKPartsInstanceName (const TQString&, TDEConfig* = 0, const TQString& = TQString ::null );
     bool                 isHidden () const;
     virtual void         setPluginEnabled (bool);
     virtual bool         isPluginEnabled () const;
@@ -60,11 +60,11 @@ public:
     const TQStringList&   dependencies () const;
     KService::Ptr        service () const;
 //ig     const TQValueList<KService::Ptr>& kcmServices () const;
-    void                 setConfig (KConfig*, const TQString&);
-    KConfig*             config () const;
+    void                 setConfig (TDEConfig*, const TQString&);
+    TDEConfig*             config () const;
     const TQString&       configgroup () const;
-    virtual void         save (KConfigGroup* = 0);
-    virtual void         load (KConfigGroup* = 0);
+    virtual void         save (TDEConfigGroup* = 0);
+    virtual void         load (TDEConfigGroup* = 0);
     virtual void         defaults ();
 
 private:
diff --git a/sip/kutils/kpluginselector.sip b/sip/kutils/kpluginselector.sip
index ec66e3f..c53f1c4 100644
--- a/sip/kutils/kpluginselector.sip
+++ b/sip/kutils/kpluginselector.sip
@@ -35,9 +35,9 @@ class KPluginSelector : TQWidget
 
 public:
                          KPluginSelector (TQWidget*, const char* = 0);
-    void                 addPlugins (const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::null , KConfig* = 0);
-    void                 addPlugins (const TDEInstance*, const TQString& = TQString ::null , const TQString& = TQString ::null , KConfig* = 0);
-//ig     void                 addPlugins (const TQValueList<KPluginInfo*>&, const TQString& = TQString ::null , const TQString& = TQString ::null , KConfig* = 0);
+    void                 addPlugins (const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::null , TDEConfig* = 0);
+    void                 addPlugins (const TDEInstance*, const TQString& = TQString ::null , const TQString& = TQString ::null , TDEConfig* = 0);
+//ig     void                 addPlugins (const TQValueList<KPluginInfo*>&, const TQString& = TQString ::null , const TQString& = TQString ::null , TDEConfig* = 0);
     void                 setShowEmptyConfigPage (bool);
     void                 load ();
     void                 save ();