Rename KLock and KTrader to avoid conflicts with KDE4

5 files changed, 22 insertions, 22 deletions

diff --git a/sip/kio/ktrader.sip b/sip/kio/ktrader.sip
index b3421b0..4a019cf 100644
--- a/sip/kio/ktrader.sip
+++ b/sip/kio/ktrader.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KTrader : TQObject
+class TDETrader : TQObject
 {
 %TypeHeaderCode
 #include <ktrader.h>
@@ -38,21 +38,21 @@ public:
 //ig     typedef TQValueListIterator<KService::Ptr> OfferListIterator;
 %End
 
-    virtual KTrader::OfferList query (const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::null ) const;
-    KTrader::OfferList   query (const TQString&, const TQString&, const TQString&, const TQString&) const;
-    static KTrader*      self ();
+    virtual TDETrader::OfferList query (const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::null ) const;
+    TDETrader::OfferList   query (const TQString&, const TQString&, const TQString&, const TQString&) const;
+    static TDETrader*      self ();
 
 protected:
-                         KTrader ();
+                         TDETrader ();
 
 protected:
 //igx     virtual void         virtual_hook (int, void*);
 
-};  // class KTrader
+};  // class TDETrader
 
 
 
-%MappedType KTrader::OfferList
+%MappedType TDETrader::OfferList
 //converts a Python list of KService
 {
 %TypeHeaderCode
diff --git a/sip/kio/tdesycoca.sip b/sip/kio/tdesycoca.sip
index c83166d..2bfe1dc 100644
--- a/sip/kio/tdesycoca.sip
+++ b/sip/kio/tdesycoca.sip
@@ -137,7 +137,7 @@ protected:
         {sipName_KShellCompletion,        &sipClass_KShellCompletion},
         {sipName_KShred,                  &sipClass_KShred},
         {sipName_KSycoca,                 &sipClass_KSycoca},
-        {sipName_KTrader,                 &sipClass_KTrader},
+        {sipName_TDETrader,                 &sipClass_TDETrader},
         {sipName_KURIFilterPlugin,        &sipClass_KURIFilterPlugin},
         {sipName_KURLCompletion,          &sipClass_KURLCompletion},
         {sipName_ListJob,                 &sipClass_KIO_ListJob},
diff --git a/sip/tdecore/klockfile.sip b/sip/tdecore/klockfile.sip
index 6082dab..fe3bc95 100644
--- a/sip/tdecore/klockfile.sip
+++ b/sip/tdecore/klockfile.sip
@@ -26,7 +26,7 @@
 
 %If ( KDE_3_3_0 -  )
 
-class KLockFile : TDEShared
+class TDELockFile : TDEShared
 {
 %TypeHeaderCode
 #include <klockfile.h>
@@ -34,8 +34,8 @@ class KLockFile : TDEShared
 
 
 public:
-    typedef TDESharedPtr<KLockFile> Ptr;
-                         KLockFile (const TQString&);
+    typedef TDESharedPtr<TDELockFile> Ptr;
+                         TDELockFile (const TQString&);
 
     enum LockResult
     {
@@ -52,22 +52,22 @@ public:
         LockForce
     };
 
-    KLockFile::LockResult lock (int = 0);
+    TDELockFile::LockResult lock (int = 0);
     bool                 isLocked () const;
     void                 unlock ();
     int                  staleTime () const;
     void                 setStaleTime (int);
     bool                 getLockInfo (int& /Out/, TQString& /Out/, TQString& /Out/);
 
-};  // class KLockFile
+};  // class TDELockFile
 
 %End
 
 
 
 %If (KDE_3_3_0 - )
-%MappedType KLockFile::Ptr
-//converts KLockFile
+%MappedType TDELockFile::Ptr
+//converts TDELockFile
 {
 %TypeHeaderCode
 #include <ksharedptr.h>
@@ -80,9 +80,9 @@ public:
     if (!sipCpp)
         return NULL;
 
-    TDESharedPtr<KLockFile> *cPtr = new TDESharedPtr<KLockFile> (*(TDESharedPtr<KLockFile> *)sipCpp);
-    KLockFile *cpp = cPtr->data ();
-    PyObject *obj = sipConvertFromInstance (cpp, sipClass_KLockFile, sipTransferObj);
+    TDESharedPtr<TDELockFile> *cPtr = new TDESharedPtr<TDELockFile> (*(TDESharedPtr<TDELockFile> *)sipCpp);
+    TDELockFile *cpp = cPtr->data ();
+    PyObject *obj = sipConvertFromInstance (cpp, sipClass_TDELockFile, sipTransferObj);
 
     return obj;
 %End
@@ -94,7 +94,7 @@ public:
         return PyInstance_Check(sipPy);
 
     int iserr = 0;
-    KLockFile *cpp = (KLockFile *)sipForceConvertToType(sipPy, sipType_KLockFile, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
+    TDELockFile *cpp = (TDELockFile *)sipForceConvertToType(sipPy, sipType_TDELockFile, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
 
     if (iserr)
     {
@@ -102,7 +102,7 @@ public:
         return 0;
     }
 
-    *sipCppPtr = new TDESharedPtr<KLockFile> (cpp);
+    *sipCppPtr = new TDESharedPtr<TDELockFile> (cpp);
 
     return 1;
 %End
diff --git a/sip/tdecore/tdeconfig.sip b/sip/tdecore/tdeconfig.sip
index 354bfa0..f93133f 100644
--- a/sip/tdecore/tdeconfig.sip
+++ b/sip/tdecore/tdeconfig.sip
@@ -53,7 +53,7 @@ public:
     TDEConfig*             copyTo (const TQString&, TDEConfig* = 0) const;
 
 %If ( KDE_3_3_0 -  )
-    KLockFile::Ptr       lockFile (bool = 0);
+    TDELockFile::Ptr       lockFile (bool = 0);
 %End
 
 %End
diff --git a/sip/tdecore/tdeconfigbackend.sip b/sip/tdecore/tdeconfigbackend.sip
index 1afa8e2..21391a8 100644
--- a/sip/tdecore/tdeconfigbackend.sip
+++ b/sip/tdecore/tdeconfigbackend.sip
@@ -46,7 +46,7 @@ public:
     bool                 checkConfigFilesWritable (bool);
 
 %If ( KDE_3_3_0 -  )
-    KLockFile::Ptr       lockFile (bool = 0);
+    TDELockFile::Ptr       lockFile (bool = 0);
 %End
 
 %End