Rename KComp to avoid conflicts with KDE4

2 files changed, 27 insertions, 27 deletions

diff --git a/sip/tdecore/kcompletion.sip b/sip/tdecore/kcompletion.sip
index 62013a6..223e230 100644
--- a/sip/tdecore/kcompletion.sip
+++ b/sip/tdecore/kcompletion.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KCompletion : TQObject
+class TDECompletion : TQObject
 {
 %TypeHeaderCode
 #include <kcompletion.h>
@@ -40,7 +40,7 @@ public:
         Weighted
     };
 
-                         KCompletion ();
+                         TDECompletion ();
     virtual TQString      makeCompletion (const TQString&);
     TQStringList          substringCompletion (const TQString&) const;
     TQString              previousMatch ();
@@ -54,14 +54,14 @@ public:
 
     virtual void         setCompletionMode (TDEGlobalSettings::Completion);
     TDEGlobalSettings::Completion completionMode () const;
-    virtual void         setOrder (KCompletion::CompOrder);
+    virtual void         setOrder (TDECompletion::CompOrder);
     CompOrder            order () const;
     virtual void         setIgnoreCase (bool);
     bool                 ignoreCase () const;
     TQStringList          allMatches ();
     TQStringList          allMatches (const TQString&);
-//ig     KCompletionMatches   allWeightedMatches ();
-//ig     KCompletionMatches   allWeightedMatches (const TQString&);
+//ig     TDECompletionMatches   allWeightedMatches ();
+//ig     TDECompletionMatches   allWeightedMatches (const TQString&);
     virtual void         setEnableSounds (bool);
     bool                 isSoundsEnabled () const;
     bool                 hasMultipleMatches () const;
@@ -87,18 +87,18 @@ signals:
 protected:
     virtual void         postProcessMatch (TQString*);
     virtual void         postProcessMatches (TQStringList*);
-//ig     virtual void         postProcessMatches (KCompletionMatches*) const;
+//ig     virtual void         postProcessMatches (TDECompletionMatches*) const;
 
 protected:
 //igx     virtual void         virtual_hook (int, void*);
 
-};  // class KCompletion
+};  // class TDECompletion
 
 
-//ig class KCompletionMatches : KCompletionMatchesList;
+//ig class TDECompletionMatches : TDECompletionMatchesList;
 
 
-class KCompletionBase
+class TDECompletionBase
 {
 %TypeHeaderCode
 #include <kcompletion.h>
@@ -115,10 +115,10 @@ public:
         SubstringCompletion
     };
 
-    typedef TQMap<KCompletionBase::KeyBindingType,TDEShortcut> KeyBindingMap;
-                         KCompletionBase ();
-    KCompletion*         completionObject (bool = 1);
-    virtual void         setCompletionObject (KCompletion*, bool = 1);
+    typedef TQMap<TDECompletionBase::KeyBindingType,TDEShortcut> KeyBindingMap;
+                         TDECompletionBase ();
+    TDECompletion*         completionObject (bool = 1);
+    virtual void         setCompletionObject (TDECompletion*, bool = 1);
     virtual void         setHandleSignals (bool);
     bool                 isCompletionObjectAutoDeleted () const;
     void                 setAutoDeleteCompletionObject (bool);
@@ -127,27 +127,27 @@ public:
     bool                 emitSignals () const;
     virtual void         setCompletionMode (TDEGlobalSettings::Completion);
     TDEGlobalSettings::Completion completionMode () const;
-    bool                 setKeyBinding (KCompletionBase::KeyBindingType, const TDEShortcut&);
-    const TDEShortcut&     getKeyBinding (KCompletionBase::KeyBindingType) const;
+    bool                 setKeyBinding (TDECompletionBase::KeyBindingType, const TDEShortcut&);
+    const TDEShortcut&     getKeyBinding (TDECompletionBase::KeyBindingType) const;
     void                 useGlobalKeyBindings ();
     virtual void         setCompletedText (const TQString&)  = 0;
     virtual void         setCompletedItems (const TQStringList&)  = 0;
-    KCompletion*         compObj () const;
+    TDECompletion*         compObj () const;
 
 protected:
-    KCompletionBase::KeyBindingMap getKeyBindings () const;
-    void                 setDelegate (KCompletionBase*);
-    KCompletionBase*     delegate () const;
+    TDECompletionBase::KeyBindingMap getKeyBindings () const;
+    void                 setDelegate (TDECompletionBase*);
+    TDECompletionBase*     delegate () const;
 
 protected:
 //igx     virtual void         virtual_hook (int, void*);
 
-};  // class KCompletionBase
+};  // class TDECompletionBase
 
-//ig typedef KSortableValueList<TQString> KCompletionMatchesList;
+//ig typedef KSortableValueList<TQString> TDECompletionMatchesList;
 
 
-%MappedType KCompletionBase::KeyBindingMap
+%MappedType TDECompletionBase::KeyBindingMap
 //converts a Python dict of int:TDEShortcut
 {
 %TypeHeaderCode
@@ -167,8 +167,8 @@ protected:
 
     // Get it.
 
-    const TQMap<KCompletionBase::KeyBindingType,TDEShortcut> map = *sipCpp;
-    TQMap<KCompletionBase::KeyBindingType,TDEShortcut>::ConstIterator it;
+    const TQMap<TDECompletionBase::KeyBindingType,TDEShortcut> map = *sipCpp;
+    TQMap<TDECompletionBase::KeyBindingType,TDEShortcut>::ConstIterator it;
 
     PyObject *key;
     PyObject *value;
@@ -197,7 +197,7 @@ protected:
     if (sipIsErr == NULL)
         return PyDict_Check(sipPy);
 
-    TQMap<KCompletionBase::KeyBindingType,TDEShortcut> *kbmap = new TQMap<KCompletionBase::KeyBindingType,TDEShortcut>;
+    TQMap<TDECompletionBase::KeyBindingType,TDEShortcut> *kbmap = new TQMap<TDECompletionBase::KeyBindingType,TDEShortcut>;
 
     PyObject *key, *value;
     SIP_SSIZE_T pos = 0;
@@ -215,7 +215,7 @@ protected:
             return 0;
         }
 
-        kbmap->insert ((KCompletionBase::KeyBindingType)PyInt_AS_LONG (key), *cValue);
+        kbmap->insert ((TDECompletionBase::KeyBindingType)PyInt_AS_LONG (key), *cValue);
     }
 
     *sipCppPtr = kbmap;
diff --git a/sip/tdecore/tdeaccel.sip b/sip/tdecore/tdeaccel.sip
index 7522118..4ad90cf 100644
--- a/sip/tdecore/tdeaccel.sip
+++ b/sip/tdecore/tdeaccel.sip
@@ -125,7 +125,7 @@ public:
 #if TDE_VERSION >= 0x030100
         {sipName_TDEClipboardSynchronizer,  &sipClass_TDEClipboardSynchronizer},
 #endif
-        {sipName_KCompletion,             &sipClass_KCompletion},
+        {sipName_TDECompletion,             &sipClass_TDECompletion},
         {sipName_TDEConfig,                 &sipClass_TDEConfig},
         {sipName_TDEConfigBase,             &sipClass_TDEConfigBase},
         {sipName_TDEConfigGroup,            &sipClass_TDEConfigGroup},