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

5 files changed, 11 insertions, 11 deletions

diff --git a/sip/kabc/addresslineedit.sip b/sip/kabc/addresslineedit.sip
index d8ed446..5d68ba5 100644
--- a/sip/kabc/addresslineedit.sip
+++ b/sip/kabc/addresslineedit.sip
@@ -40,7 +40,7 @@ public:
     virtual void         setFont (const TQFont&);
 
 %If ( KDE_3_2_0 -  )
-    static KConfig*      config ();
+    static TDEConfig*      config ();
 %End
 
 
diff --git a/sip/kabc/field.sip b/sip/kabc/field.sip
index 443fa2c..a7c1a85 100644
--- a/sip/kabc/field.sip
+++ b/sip/kabc/field.sip
@@ -65,9 +65,9 @@ public:
     static KABC::Field::List defaultFields ();
     static KABC::Field*  createCustomField (const TQString&, int, const TQString&, const TQString&);
     static void          deleteFields ();
-    static void          saveFields (KConfig*, const TQString&, const KABC::Field::List&);
+    static void          saveFields (TDEConfig*, const TQString&, const KABC::Field::List&);
     static void          saveFields (const TQString&, const KABC::Field::List&);
-    static KABC::Field::List restoreFields (KConfig*, const TQString&);
+    static KABC::Field::List restoreFields (TDEConfig*, const TQString&);
     static KABC::Field::List restoreFields (const TQString&);
 
 protected:
diff --git a/sip/kabc/ldapclient.sip b/sip/kabc/ldapclient.sip
index c999c85..baf3f6d 100644
--- a/sip/kabc/ldapclient.sip
+++ b/sip/kabc/ldapclient.sip
@@ -106,8 +106,8 @@ public slots:
     void                 cancelQuery ();
 
 protected slots:
-    void                 slotData (KIO::Job*, const TQByteArray&);
-    void                 slotInfoMessage (KIO::Job*, const TQString&);
+    void                 slotData (TDEIO::Job*, const TQByteArray&);
+    void                 slotInfoMessage (TDEIO::Job*, const TQString&);
     void                 slotDone ();
 
 protected:
diff --git a/sip/kabc/resource.sip b/sip/kabc/resource.sip
index 336096b..1218fa0 100644
--- a/sip/kabc/resource.sip
+++ b/sip/kabc/resource.sip
@@ -58,13 +58,13 @@ public:
     
 //ig     class ConstIterator;
 
-                         Resource (const KConfig*);
+                         Resource (const TDEConfig*);
 //ig     virtual KABC::Resource::ConstIterator begin () const;
 //ig     virtual KABC::Resource::Iterator begin ();
 //ig     virtual KABC::Resource::ConstIterator end () const;
 //ig     virtual KABC::Resource::Iterator end ();
     KABC::AddressBook*   addressBook ();
-    virtual void         writeConfig (KConfig*);
+    virtual void         writeConfig (TDEConfig*);
     virtual KABC::Ticket* requestSaveTicket ()  = 0;
     virtual void         releaseSaveTicket (KABC::Ticket*)  = 0;
     virtual bool         load ()  = 0;
diff --git a/sip/kabc/resourcefile.sip b/sip/kabc/resourcefile.sip
index 736545e..09943de 100644
--- a/sip/kabc/resourcefile.sip
+++ b/sip/kabc/resourcefile.sip
@@ -38,9 +38,9 @@ class ResourceFile : KABC::Resource
 public:
 
 %If ( KDE_3_3_0 -  )
-                         ResourceFile (const KConfig*);
+                         ResourceFile (const TDEConfig*);
                          ResourceFile (const TQString&, const TQString& = "vcard");
-    virtual void         writeConfig (KConfig*);
+    virtual void         writeConfig (TDEConfig*);
     virtual bool         doOpen ();
     virtual void         doClose ();
 
@@ -91,7 +91,7 @@ public:
 public:
 
 %If (  - KDE_3_3_0 )
-                         ResourceFile (KABC::AddressBook*, const KConfig*);
+                         ResourceFile (KABC::AddressBook*, const TDEConfig*);
                          ResourceFile (KABC::AddressBook*, const TQString&, KABC::FormatPlugin* = 0);
     bool                 open ();
     void                 close ();
@@ -129,7 +129,7 @@ class ResourceFile : KABC::Resource
 public:
 
 %If ( KDE_3_1_0 -  )
-                         ResourceFile (KABC::AddressBook*, const KConfig*);
+                         ResourceFile (KABC::AddressBook*, const TDEConfig*);
                          ResourceFile (KABC::AddressBook*, const TQString&, KABC::FormatPlugin* = 0);
     bool                 open ();
     void                 close ();