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

16 files changed, 64 insertions, 64 deletions

diff --git a/sip/tdeui/kaboutapplication.sip b/sip/tdeui/kaboutapplication.sip
index 343665c..fc20a16 100644
--- a/sip/tdeui/kaboutapplication.sip
+++ b/sip/tdeui/kaboutapplication.sip
@@ -60,7 +60,7 @@ protected:
         {sipName_KAuthIcon,               &sipClass_KAuthIcon},
         {sipName_KBugReport,              &sipClass_KBugReport},
         {sipName_KButtonBox,              &sipClass_KButtonBox},
-        {sipName_KCModule,                &sipClass_KCModule},
+        {sipName_TDECModule,                &sipClass_TDECModule},
         {sipName_KCharSelect,             &sipClass_KCharSelect},
         {sipName_KCharSelectTable,        &sipClass_KCharSelectTable},
         {sipName_KColorButton,            &sipClass_KColorButton},
diff --git a/sip/tdeui/kaction.sip b/sip/tdeui/kaction.sip
index cae6587..14e8390 100644
--- a/sip/tdeui/kaction.sip
+++ b/sip/tdeui/kaction.sip
@@ -376,8 +376,8 @@ public:
 
 public slots:
     void                 setMaxItems (uint);
-    void                 loadEntries (KConfig*, TQString = TQString ::null );
-    void                 saveEntries (KConfig*, TQString = TQString ::null );
+    void                 loadEntries (TDEConfig*, TQString = TQString ::null );
+    void                 saveEntries (TDEConfig*, TQString = TQString ::null );
 
 public slots:
     void                 addURL (const KURL&);
@@ -640,8 +640,8 @@ public:
     virtual TQValueList<KAction*> actions () const;
 %End
 
-    bool                 readShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0);
-    bool                 writeShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0) const;
+    bool                 readShortcutSettings (const TQString& = TQString ::null , TDEConfigBase* = 0);
+    bool                 writeShortcutSettings (const TQString& = TQString ::null , TDEConfigBase* = 0) const;
     void                 setInstance (TDEInstance*);
     TDEInstance*           instance () const;
     void                 setXMLFile (const TQString&);
diff --git a/sip/tdeui/kactionclasses.sip b/sip/tdeui/kactionclasses.sip
index 5ae95a1..7858dbf 100644
--- a/sip/tdeui/kactionclasses.sip
+++ b/sip/tdeui/kactionclasses.sip
@@ -234,8 +234,8 @@ public:
 
 public slots:
     void                 setMaxItems (uint);
-    void                 loadEntries (KConfig*, TQString = TQString ::null );
-    void                 saveEntries (KConfig*, TQString = TQString ::null );
+    void                 loadEntries (TDEConfig*, TQString = TQString ::null );
+    void                 saveEntries (TDEConfig*, TQString = TQString ::null );
     void                 addURL (const KURL&);
 
 %If ( KDE_3_5_0 -  )
diff --git a/sip/tdeui/kactioncollection.sip b/sip/tdeui/kactioncollection.sip
index 0f4d6ab..a7c5e0e 100644
--- a/sip/tdeui/kactioncollection.sip
+++ b/sip/tdeui/kactioncollection.sip
@@ -51,8 +51,8 @@ public:
     virtual TQStringList  groups () const;
     virtual KActionPtrList actions (const TQString&) const;
     virtual KActionPtrList actions () const;
-    bool                 readShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0);
-    bool                 writeShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0) const;
+    bool                 readShortcutSettings (const TQString& = TQString ::null , TDEConfigBase* = 0);
+    bool                 writeShortcutSettings (const TQString& = TQString ::null , TDEConfigBase* = 0) const;
     void                 setInstance (TDEInstance*);
     TDEInstance*           instance () const;
     void                 setXMLFile (const TQString&);
diff --git a/sip/tdeui/kcmodule.sip b/sip/tdeui/kcmodule.sip
index 8878de2..0ff0b24 100644
--- a/sip/tdeui/kcmodule.sip
+++ b/sip/tdeui/kcmodule.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KCModule : TQWidget
+class TDECModule : TQWidget
 {
 %TypeHeaderCode
 #include <kcmodule.h>
@@ -44,8 +44,8 @@ public:
         SysDefault
     };
 
-                         KCModule (TQWidget* /TransferThis/ = 0, const char* = 0, const TQStringList& = TQStringList ());
-                         KCModule (TDEInstance*, TQWidget* /TransferThis/ = 0, const TQStringList& = TQStringList ());
+                         TDECModule (TQWidget* /TransferThis/ = 0, const char* = 0, const TQStringList& = TQStringList ());
+                         TDECModule (TDEInstance*, TQWidget* /TransferThis/ = 0, const TQStringList& = TQStringList ());
     virtual void         load ();
     virtual void         save ();
     virtual void         defaults ();
@@ -63,14 +63,14 @@ public:
     TDEInstance*           instance () const;
 
 %If ( KDE_3_4_0 -  )
-    const TQPtrList<KConfigDialogManager>& configs () const;
+    const TQPtrList<TDEConfigDialogManager>& configs () const;
 %End
 
 
 protected:
 
 %If ( KDE_3_3_0 -  )
-    KConfigDialogManager* addConfig (KConfigSkeleton*, TQWidget*);
+    TDEConfigDialogManager* addConfig (TDEConfigSkeleton*, TQWidget*);
     void                 setQuickHelp (const TQString&);
 %End
 
@@ -105,13 +105,13 @@ protected:
 protected:
 //igx     virtual void         virtual_hook (int, void*);
 
-};  // class KCModule
+};  // class TDECModule
 
 
 
 %If (KDE_3_3_0 - )
-%MappedType TQPtrList<KConfigDialogManager>
-//converts a Python list of KConfigDialogManager
+%MappedType TQPtrList<TDEConfigDialogManager>
+//converts a Python list of TDEConfigDialogManager
 {
 %TypeHeaderCode
 #include <tqptrlist.h>
@@ -130,14 +130,14 @@ protected:
 
     // Get it.
 
-    TQPtrList<KConfigDialogManager> *cpplist = (TQPtrList<KConfigDialogManager> *)sipCpp;
-    KConfigDialogManager *cpp;
+    TQPtrList<TDEConfigDialogManager> *cpplist = (TQPtrList<TDEConfigDialogManager> *)sipCpp;
+    TDEConfigDialogManager *cpp;
     PyObject *inst;
 
     // the loop depends on the type of iterator the  tmeplate makes available
     for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () )
     {
-        if (((inst = sipConvertFromInstance (cpp, sipClass_KConfigDialogManager, sipTransferObj)) == NULL)
+        if (((inst = sipConvertFromInstance (cpp, sipClass_TDEConfigDialogManager, sipTransferObj)) == NULL)
             || PyList_Append (pylist, inst) < 0)
         {
             Py_DECREF (pylist);
@@ -152,16 +152,16 @@ protected:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    TQPtrList<KConfigDialogManager> *cpplist = new TQPtrList<KConfigDialogManager>;
+    TQPtrList<TDEConfigDialogManager> *cpplist = new TQPtrList<TDEConfigDialogManager>;
 
     PyObject *elem;
-    KConfigDialogManager *cpp;
+    TDEConfigDialogManager *cpp;
     int iserr = 0;
 
     for (int i = 0; i < PyList_Size (sipPy); i++)
     {
         elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KConfigDialogManager *)sipForceConvertToType(elem, sipType_KConfigDialogManager, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
+        cpp = (TDEConfigDialogManager *)sipForceConvertToType(elem, sipType_TDEConfigDialogManager, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
 
         if (iserr)
         {
diff --git a/sip/tdeui/kconfigdialog.sip b/sip/tdeui/kconfigdialog.sip
index ad12eaa..30a7234 100644
--- a/sip/tdeui/kconfigdialog.sip
+++ b/sip/tdeui/kconfigdialog.sip
@@ -26,7 +26,7 @@
 
 %If ( KDE_3_2_0 -  )
 
-class KConfigDialog : KDialogBase
+class TDEConfigDialog : KDialogBase
 {
 %TypeHeaderCode
 #include <kconfigdialog.h>
@@ -39,14 +39,14 @@ signals:
     void                 settingsChanged (const char*);
 
 public:
-                         KConfigDialog (TQWidget* /TransferThis/, const char*, KConfigSkeleton*, KDialogBase::DialogType = KDialogBase ::IconList , int = KDialogBase ::Default |KDialogBase ::Ok |KDialogBase ::Apply |KDialogBase ::Cancel |KDialogBase ::Help , KDialogBase::ButtonCode = Ok , bool = 0);
+                         TDEConfigDialog (TQWidget* /TransferThis/, const char*, TDEConfigSkeleton*, KDialogBase::DialogType = KDialogBase ::IconList , int = KDialogBase ::Default |KDialogBase ::Ok |KDialogBase ::Apply |KDialogBase ::Cancel |KDialogBase ::Help , KDialogBase::ButtonCode = Ok , bool = 0);
     void                 addPage (TQWidget*, const TQString&, const TQString&, const TQString& = TQString ::null , bool = 1);
 
 %If ( KDE_3_3_0 -  )
-    void                 addPage (TQWidget*, KConfigSkeleton*, const TQString&, const TQString&, const TQString& = TQString ::null );
+    void                 addPage (TQWidget*, TDEConfigSkeleton*, const TQString&, const TQString&, const TQString& = TQString ::null );
 %End
 
-    static KConfigDialog* exists (const char*);
+    static TDEConfigDialog* exists (const char*);
     static bool          showDialog (const char*);
     virtual void         show ();
 
@@ -63,7 +63,7 @@ protected slots:
     void                 updateButtons ();
     void                 settingsChangedSlot ();
 
-};  // class KConfigDialog
+};  // class TDEConfigDialog
 
 %End
 
diff --git a/sip/tdeui/kdialogbase.sip b/sip/tdeui/kdialogbase.sip
index 7ffba42..61455a7 100644
--- a/sip/tdeui/kdialogbase.sip
+++ b/sip/tdeui/kdialogbase.sip
@@ -123,13 +123,13 @@ public:
     TQSize                configDialogSize (const TQString&) const;
 
 %If ( KDE_3_2_0 -  )
-    TQSize                configDialogSize (KConfig&, const TQString&) const;
+    TQSize                configDialogSize (TDEConfig&, const TQString&) const;
 %End
 
     void                 saveDialogSize (const TQString&, bool = 0);
 
 %If ( KDE_3_2_0 -  )
-    void                 saveDialogSize (KConfig&, const TQString&, bool = 0) const;
+    void                 saveDialogSize (TDEConfig&, const TQString&, bool = 0) const;
     void                 setButtonOK (const KGuiItem& = KStdGuiItem ::ok ());
 %End
 
diff --git a/sip/tdeui/kdockwidget.sip b/sip/tdeui/kdockwidget.sip
index 8150ad1..9d29bfa 100644
--- a/sip/tdeui/kdockwidget.sip
+++ b/sip/tdeui/kdockwidget.sip
@@ -34,8 +34,8 @@ class KDockWidgetAbstractHeader : TQFrame
 public:
                          KDockWidgetAbstractHeader (KDockWidget* /TransferThis/, const char* = 0);
     virtual void         setTopLevel (bool);
-    virtual void         saveConfig (KConfig*);
-    virtual void         loadConfig (KConfig*);
+    virtual void         saveConfig (TDEConfig*);
+    virtual void         loadConfig (TDEConfig*);
 
 protected:
 //igx     virtual void         virtual_hook (int, void*);
@@ -107,8 +107,8 @@ public:
 
 %End
 
-    virtual void         saveConfig (KConfig*);
-    virtual void         loadConfig (KConfig*);
+    virtual void         saveConfig (TDEConfig*);
+    virtual void         loadConfig (TDEConfig*);
 
 %If ( KDE_3_2_0 -  )
 //ig     void                 addButton (KDockButton_Private*);
@@ -346,8 +346,8 @@ public:
     void                 dumpDockWidgets ();
 %End
 
-    void                 writeConfig (KConfig* = 0, TQString = TQString ::null );
-    void                 readConfig (KConfig* = 0, TQString = TQString ::null );
+    void                 writeConfig (TDEConfig* = 0, TQString = TQString ::null );
+    void                 readConfig (TDEConfig* = 0, TQString = TQString ::null );
 
 %If ( KDE_3_1_0 -  )
     void                 setMainDockWidget2 (KDockWidget*);
@@ -405,8 +405,8 @@ public:
     KDockWidget*         createDockWidget (const TQString&, const TQPixmap&, TQWidget* /Transfer/ = 0, const TQString& = 0, const TQString& = " ");
     void                 writeDockConfig (TQDomElement&);
     void                 readDockConfig (TQDomElement&);
-    void                 writeDockConfig (KConfig* = 0, TQString = TQString ::null );
-    void                 readDockConfig (KConfig* = 0, TQString = TQString ::null );
+    void                 writeDockConfig (TDEConfig* = 0, TQString = TQString ::null );
+    void                 readDockConfig (TDEConfig* = 0, TQString = TQString ::null );
     void                 activateDock ();
     TQPopupMenu*          dockHideShowMenu ();
     void                 makeDockVisible (KDockWidget*);
@@ -443,8 +443,8 @@ public:
     KDockWidget*         createDockWidget (const TQString&, const TQPixmap&, TQWidget* /Transfer/ = 0, const TQString& = 0, const TQString& = " ");
     void                 writeDockConfig (TQDomElement&);
     void                 readDockConfig (TQDomElement&);
-    void                 writeDockConfig (KConfig* = 0, TQString = TQString ::null );
-    void                 readDockConfig (KConfig* = 0, TQString = TQString ::null );
+    void                 writeDockConfig (TDEConfig* = 0, TQString = TQString ::null );
+    void                 readDockConfig (TDEConfig* = 0, TQString = TQString ::null );
     void                 activateDock ();
     TQPopupMenu*          dockHideShowMenu ();
     void                 makeDockVisible (KDockWidget*);
diff --git a/sip/tdeui/kkeydialog.sip b/sip/tdeui/kkeydialog.sip
index 6e0297c..2a5d4ca 100644
--- a/sip/tdeui/kkeydialog.sip
+++ b/sip/tdeui/kkeydialog.sip
@@ -52,7 +52,7 @@ public:
     bool                 insert (KActionCollection*, const TQString&);
 %End
 
-    void                 syncToConfig (const TQString&, KConfigBase*, bool);
+    void                 syncToConfig (const TQString&, TDEConfigBase*, bool);
     void                 commitChanges ();
     void                 save ();
 
diff --git a/sip/tdeui/klistview.sip b/sip/tdeui/klistview.sip
index e48e33a..8e0ff5d 100644
--- a/sip/tdeui/klistview.sip
+++ b/sip/tdeui/klistview.sip
@@ -85,8 +85,8 @@ public:
 
     void                 setAlternateBackground (const TQColor&);
     const TQColor&        alternateBackground () const;
-    void                 saveLayout (KConfig*, const TQString&) const;
-    void                 restoreLayout (KConfig*, const TQString&);
+    void                 saveLayout (TDEConfig*, const TQString&) const;
+    void                 restoreLayout (TDEConfig*, const TQString&);
     virtual void         setSorting (int, bool = 1);
     int                  columnSorted () const;
     bool                 ascendingSort () const;
diff --git a/sip/tdeui/kmainwindow.sip b/sip/tdeui/kmainwindow.sip
index 9f48a75..89567ff 100644
--- a/sip/tdeui/kmainwindow.sip
+++ b/sip/tdeui/kmainwindow.sip
@@ -84,13 +84,13 @@ public:
     TQString              autoSaveGroup () const;
 
 %If ( KDE_3_3_0 -  )
-    void                 applyMainWindowSettings (KConfig*, const TQString&, bool);
+    void                 applyMainWindowSettings (TDEConfig*, const TQString&, bool);
 %End
 
 %End
 
-    void                 applyMainWindowSettings (KConfig*, const TQString& = TQString ::null );
-    void                 saveMainWindowSettings (KConfig*, const TQString& = TQString ::null );
+    void                 applyMainWindowSettings (TDEConfig*, const TQString& = TQString ::null );
+    void                 saveMainWindowSettings (TDEConfig*, const TQString& = TQString ::null );
 
 %If ( KDE_3_1_0 -  )
     void                 setStandardToolBarMenuEnabled (bool);
@@ -168,16 +168,16 @@ protected:
     virtual void         closeEvent (TQCloseEvent*);
     virtual bool         queryExit ();
     virtual bool         queryClose ();
-    virtual void         saveProperties (KConfig*);
-    virtual void         readProperties (KConfig*);
-    virtual void         saveGlobalProperties (KConfig*);
-    virtual void         readGlobalProperties (KConfig*);
-    void                 savePropertiesInternal (KConfig*, int);
-    bool                 readPropertiesInternal (KConfig*, int);
+    virtual void         saveProperties (TDEConfig*);
+    virtual void         readProperties (TDEConfig*);
+    virtual void         saveGlobalProperties (TDEConfig*);
+    virtual void         readGlobalProperties (TDEConfig*);
+    void                 savePropertiesInternal (TDEConfig*, int);
+    bool                 readPropertiesInternal (TDEConfig*, int);
     bool                 settingsDirty () const;
     TQString              settingsGroup () const;
-    void                 saveWindowSize (KConfig*) const;
-    void                 restoreWindowSize (KConfig*);
+    void                 saveWindowSize (TDEConfig*) const;
+    void                 restoreWindowSize (TDEConfig*);
     void                 parseGeometry (bool);
 
 protected slots:
diff --git a/sip/tdeui/kmessagebox.sip b/sip/tdeui/kmessagebox.sip
index 01a5105..68a1bcd 100644
--- a/sip/tdeui/kmessagebox.sip
+++ b/sip/tdeui/kmessagebox.sip
@@ -207,7 +207,7 @@ public:
     static bool          shouldBeShownContinue (const TQString&);
     static void          saveDontShowAgainYesNo (const TQString&, KMessageBox::ButtonCode);
     static void          saveDontShowAgainContinue (const TQString&);
-    static void          setDontShowAskAgainConfig (KConfig*);
+    static void          setDontShowAskAgainConfig (TDEConfig*);
 
 %If ( KDE_3_3_0 -  )
     static int           createKMessageBox (KDialogBase*, TQMessageBox::Icon, const TQString&, const TQStringList&, const TQString&, bool*, int, const TQString& = TQString ::null );
diff --git a/sip/tdeui/kpanelapplet.sip b/sip/tdeui/kpanelapplet.sip
index de0f1de..f3fc116 100644
--- a/sip/tdeui/kpanelapplet.sip
+++ b/sip/tdeui/kpanelapplet.sip
@@ -77,7 +77,7 @@ public:
                          KPanelApplet (const TQString&, KPanelApplet::Type = Normal , int = 0, TQWidget* /TransferThis/ = 0, const char* = 0, WFlags = 0);
     virtual int          widthForHeight (int) const;
     virtual int          heightForWidth (int) const;
-    KConfig*             config () const;
+    TDEConfig*             config () const;
 
 %If ( KDE_3_2_0 -  )
     KSharedConfig::Ptr   sharedConfig () const;
diff --git a/sip/tdeui/kpanelextension.sip b/sip/tdeui/kpanelextension.sip
index 26206ec..5d801c9 100644
--- a/sip/tdeui/kpanelextension.sip
+++ b/sip/tdeui/kpanelextension.sip
@@ -86,7 +86,7 @@ public:
 
                          KPanelExtension (const TQString&, KPanelExtension::Type = Normal , int = 0, TQWidget* /TransferThis/ = 0, const char* = 0);
     virtual TQSize        sizeHint (KPanelExtension::Position, TQSize) const;
-    KConfig*             config () const;
+    TDEConfig*             config () const;
     Type                 type () const;
     int                  actions () const;
     virtual void         action (KPanelExtension::Action);
diff --git a/sip/tdeui/kthemebase.sip b/sip/tdeui/kthemebase.sip
index 0a1db3f..9fc652c 100644
--- a/sip/tdeui/kthemebase.sip
+++ b/sip/tdeui/kthemebase.sip
@@ -239,7 +239,7 @@ protected:
     TQColor*              gradientHigh (KThemeBase::WidgetType) const;
     TQColor*              gradientLow (KThemeBase::WidgetType) const;
     void                 readConfig (TQt::GUIStyle = TQt::WindowsStyle);
-//ig     void                 readWidgetConfig (int, KConfig*, TQString*, TQString*, bool*);
+//ig     void                 readWidgetConfig (int, TDEConfig*, TQString*, TQString*, bool*);
     void                 copyWidgetConfig (int, int, TQString*, TQString*);
     TQColorGroup*         makeColorGroup (TQColor&, TQColor&, TQt::GUIStyle = TQt::WindowsStyle);
     KThemePixmap*        scale (int, int, KThemeBase::WidgetType);
@@ -247,8 +247,8 @@ protected:
     KThemePixmap*        gradient (int, int, KThemeBase::WidgetType);
     KThemePixmap*        blend (KThemeBase::WidgetType);
     void                 generateBorderPix (int);
-    void                 applyResourceGroup (KConfig*, int);
-    void                 applyMiscResourceGroup (KConfig*);
+    void                 applyResourceGroup (TDEConfig*, int);
+    void                 applyMiscResourceGroup (TDEConfig*);
     void                 readResourceGroup (int, TQString*, TQString*, bool*);
     void                 readMiscResourceGroup ();
     KThemePixmap*        loadPixmap (TQString&);
diff --git a/sip/tdeui/ktoolbar.sip b/sip/tdeui/ktoolbar.sip
index 6bd7d34..5df7a7b 100644
--- a/sip/tdeui/ktoolbar.sip
+++ b/sip/tdeui/ktoolbar.sip
@@ -180,13 +180,13 @@ public:
     void                 setFlat (bool);
     int                  count ();
     void                 saveState ();
-    void                 saveSettings (KConfig*, const TQString&);
+    void                 saveSettings (TDEConfig*, const TQString&);
 
 %If ( KDE_3_3_0 -  )
-    void                 applySettings (KConfig*, const TQString&, bool);
+    void                 applySettings (TDEConfig*, const TQString&, bool);
 %End
 
-    void                 applySettings (KConfig*, const TQString&);
+    void                 applySettings (TDEConfig*, const TQString&);
     void                 setXMLGUIClient (KXMLGUIClient*);
     void                 setText (const TQString&);
     TQString              text () const;
@@ -237,7 +237,7 @@ protected:
     void                 showEvent (TQShowEvent*);
     void                 resizeEvent (TQResizeEvent*);
     bool                 event (TQEvent*);
-    void                 applyAppearanceSettings (KConfig*, const TQString&, bool = 0);
+    void                 applyAppearanceSettings (TDEConfig*, const TQString&, bool = 0);
     TQString              settingsGroup () const;
 
 protected: