Rename a number of classes to enhance compatibility with KDE4

11 files changed, 198 insertions, 198 deletions

diff --git a/sip/tdecore/kaccel.sip b/sip/tdecore/kaccel.sip
index 36a1c81..dfce48f 100644
--- a/sip/tdecore/kaccel.sip
+++ b/sip/tdecore/kaccel.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KAccel : TQAccel
+class TDEAccel : TQAccel
 {
 %TypeHeaderCode
 #include <kaccel.h>
@@ -32,24 +32,24 @@ class KAccel : TQAccel
 
 
 public:
-                         KAccel (TQWidget* /TransferThis/, const char* = 0);
-                         KAccel (TQWidget*, TQObject* /TransferThis/, const char* = 0);
-    KAccelActions&       actions ();
+                         TDEAccel (TQWidget* /TransferThis/, const char* = 0);
+                         TDEAccel (TQWidget*, TQObject* /TransferThis/, const char* = 0);
+    TDEAccelActions&       actions ();
     bool                 isEnabled ();
     void                 setEnabled (bool);
     bool                 setAutoUpdate (bool);
 
 %If ( KDE_3_1_4 -  )
-    KAccelAction*        insert (const TQString&, const TQString&, const TQString&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
-    KAccelAction*        insert (const TQString&, const TQString&, const TQString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
-    KAccelAction*        insert (const char*, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
-    KAccelAction*        insert (KStdAccel::StdAccel, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
+    TDEAccelAction*        insert (const TQString&, const TQString&, const TQString&, const TDEShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
+    TDEAccelAction*        insert (const TQString&, const TQString&, const TQString&, const TDEShortcut&, const TDEShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
+    TDEAccelAction*        insert (const char*, const TDEShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
+    TDEAccelAction*        insert (TDEStdAccel::StdAccel, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
 %End
 
     bool                 remove (const TQString&);
     bool                 updateConnections ();
-    const KShortcut&     shortcut (const TQString&) const;
-    bool                 setShortcut (const TQString&, const KShortcut&);
+    const TDEShortcut&     shortcut (const TQString&) const;
+    bool                 setShortcut (const TQString&, const TDEShortcut&);
 
 %If ( KDE_3_1_4 -  )
     bool                 setSlot (const TQString&, SIP_RXOBJ_CON, SIP_SLOT_CON ());
@@ -68,17 +68,17 @@ signals:
 public:
     bool                 insertItem (const TQString&, const TQString&, const char*, int = 0, TQPopupMenu* = 0, bool = 1);
     bool                 insertItem (const TQString&, const TQString&, int, int, TQPopupMenu*, bool = 1);
-    bool                 insertStdItem (KStdAccel::StdAccel, const TQString& = TQString ::null );
+    bool                 insertStdItem (TDEStdAccel::StdAccel, const TQString& = TQString ::null );
 
 %If ( KDE_3_1_4 -  )
     bool                 connectItem (const TQString&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1);
-    bool                 connectItem (KStdAccel::StdAccel, SIP_RXOBJ_CON, SIP_SLOT_CON ());
+    bool                 connectItem (TDEStdAccel::StdAccel, SIP_RXOBJ_CON, SIP_SLOT_CON ());
 %End
 
     bool                 removeItem (const TQString&);
     bool                 setItemEnabled (const TQString&, bool);
     void                 changeMenuAccel (TQPopupMenu*, int, const TQString&);
-    void                 changeMenuAccel (TQPopupMenu*, int, KStdAccel::StdAccel);
+    void                 changeMenuAccel (TQPopupMenu*, int, TDEStdAccel::StdAccel);
     static int           stringToKey (const TQString&);
     int                  currentKey (const TQString&) const;
     TQString              findKey (int) const;
@@ -90,17 +90,17 @@ public:
 
 %If (  - KDE_3_2_0 )
 //ig     bool                 getAutoUpdate ();
-//ig     KAccelAction*        insert (const TQString&, const TQString&);
+//ig     TDEAccelAction*        insert (const TQString&, const TQString&);
 %End
 
 
 public:
 
 %If (  - KDE_3_1_4 )
-    KAccelAction*        insert (const TQString&, const TQString&, const TQString&, const KShortcut&, const TQObject*, const char*, bool = 1, bool = 1);
-    KAccelAction*        insert (const TQString&, const TQString&, const TQString&, const KShortcut&, const KShortcut&, const TQObject*, const char*, bool = 1, bool = 1);
-    KAccelAction*        insert (const char*, const KShortcut&, const TQObject*, const char*, bool = 1, bool = 1);
-    KAccelAction*        insert (KStdAccel::StdAccel, const TQObject*, const char*, bool = 1, bool = 1);
+    TDEAccelAction*        insert (const TQString&, const TQString&, const TQString&, const TDEShortcut&, const TQObject*, const char*, bool = 1, bool = 1);
+    TDEAccelAction*        insert (const TQString&, const TQString&, const TQString&, const TDEShortcut&, const TDEShortcut&, const TQObject*, const char*, bool = 1, bool = 1);
+    TDEAccelAction*        insert (const char*, const TDEShortcut&, const TQObject*, const char*, bool = 1, bool = 1);
+    TDEAccelAction*        insert (TDEStdAccel::StdAccel, const TQObject*, const char*, bool = 1, bool = 1);
     bool                 setSlot (const TQString&, const TQObject*, const char*);
 %End
 
@@ -109,7 +109,7 @@ public:
 
 %If (  - KDE_3_1_4 )
     bool                 connectItem (const TQString&, const TQObject*, const char*, bool = 1);
-    bool                 connectItem (KStdAccel::StdAccel, const TQObject*, const char*);
+    bool                 connectItem (TDEStdAccel::StdAccel, const TQObject*, const char*);
 
 //force
 %ConvertToSubClassCode
@@ -117,7 +117,7 @@ public:
     // must be sorted by name.
 
     static sipStringTypeClassMap map[] = {
-        {sipName_KAccel,                  &sipClass_KAccel},
+        {sipName_TDEAccel,                  &sipClass_TDEAccel},
         {sipName_TDEApplication,            &sipClass_TDEApplication},
         {sipName_KAsyncIO,                &sipClass_KAsyncIO},
         {sipName_KAudioPlayer,            &sipClass_KAudioPlayer},
@@ -153,7 +153,7 @@ public:
 %End
 
 
-};  // class KAccel
+};  // class TDEAccel
 
 
 
diff --git a/sip/tdecore/kaccelaction.sip b/sip/tdecore/kaccelaction.sip
index 6bdace1..22e14ed 100644
--- a/sip/tdecore/kaccelaction.sip
+++ b/sip/tdecore/kaccelaction.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KAccelAction
+class TDEAccelAction
 {
 %TypeHeaderCode
 #include <kaccelaction.h>
@@ -32,18 +32,18 @@ class KAccelAction
 
 
 public:
-                         KAccelAction ();
-                         KAccelAction (const KAccelAction&);
-                         KAccelAction (const TQString&, const TQString&, const TQString&, const KShortcut&, const KShortcut&, const TQObject*, const char*, bool, bool);
+                         TDEAccelAction ();
+                         TDEAccelAction (const TDEAccelAction&);
+                         TDEAccelAction (const TQString&, const TQString&, const TQString&, const TDEShortcut&, const TDEShortcut&, const TQObject*, const char*, bool, bool);
     void                 clear ();
-    bool                 init (const TQString&, const TQString&, const TQString&, const KShortcut&, const KShortcut&, const TQObject*, const char*, bool, bool);
+    bool                 init (const TQString&, const TQString&, const TQString&, const TDEShortcut&, const TDEShortcut&, const TQObject*, const char*, bool, bool);
     const TQString&       name () const;
     const TQString&       label () const;
     const TQString&       whatsThis () const;
-    const KShortcut&     shortcut () const;
-    const KShortcut&     shortcutDefault () const;
-    const KShortcut&     shortcutDefault3 () const;
-    const KShortcut&     shortcutDefault4 () const;
+    const TDEShortcut&     shortcut () const;
+    const TDEShortcut&     shortcutDefault () const;
+    const TDEShortcut&     shortcutDefault3 () const;
+    const TDEShortcut&     shortcutDefault4 () const;
     const TQObject*       objSlotPtr () const;
     const char*          methodSlotPtr () const;
     bool                 isConfigurable () const;
@@ -51,7 +51,7 @@ public:
     void                 setName (const TQString&);
     void                 setLabel (const TQString&);
     void                 setWhatsThis (const TQString&);
-    bool                 setShortcut (const KShortcut&);
+    bool                 setShortcut (const TDEShortcut&);
     void                 setSlot (const TQObject*, const char*);
     void                 setConfigurable (bool);
     void                 setEnabled (bool);
@@ -70,10 +70,10 @@ protected:
     void                 incConnections ();
     void                 decConnections ();
 
-};  // class KAccelAction
+};  // class TDEAccelAction
 
 
-class KAccelActions
+class TDEAccelActions
 {
 %TypeHeaderCode
 #include <kaccelaction.h>
@@ -81,29 +81,29 @@ class KAccelActions
 
 
 public:
-                         KAccelActions ();
-                         KAccelActions (const KAccelActions&);
+                         TDEAccelActions ();
+                         TDEAccelActions (const TDEAccelActions&);
     void                 clear ();
-    bool                 init (const KAccelActions&);
+    bool                 init (const TDEAccelActions&);
     bool                 init (TDEConfigBase&, const TQString&);
-    void                 updateShortcuts (KAccelActions&);
+    void                 updateShortcuts (TDEAccelActions&);
     int                  actionIndex (const TQString&) const;
-    KAccelAction*        actionPtr (uint);
-    KAccelAction*        actionPtr (const TQString&);
-    KAccelAction*        actionPtr (KKeySequence);
+    TDEAccelAction*        actionPtr (uint);
+    TDEAccelAction*        actionPtr (const TQString&);
+    TDEAccelAction*        actionPtr (KKeySequence);
 
 %If ( KDE_3_1_4 -  )
-    KAccelAction&        operator [] (uint);
+    TDEAccelAction&        operator [] (uint);
 %MethodCode
-//returns (KAccelAction&)
+//returns (TDEAccelAction&)
 //takes index | (uint)
     sipRes = &((*sipCpp) [a0]);
 %End
 
 %End
 
-    KAccelAction*        insert (const TQString&, const TQString&, const TQString&, const KShortcut&, const KShortcut&, const TQObject* = 0, const char* = 0, bool = 1, bool = 1);
-    KAccelAction*        insert (const TQString&, const TQString&);
+    TDEAccelAction*        insert (const TQString&, const TQString&, const TQString&, const TDEShortcut&, const TDEShortcut&, const TQObject* = 0, const char* = 0, bool = 1, bool = 1);
+    TDEAccelAction*        insert (const TQString&, const TQString&);
     bool                 remove (const TQString&);
     bool                 readActions (const TQString& = "Shortcuts", TDEConfigBase* = 0);
     bool                 writeActions (const TQString& = "Shortcuts", TDEConfigBase* = 0, bool = 0, bool = 0) const;
@@ -112,11 +112,11 @@ public:
 
 protected:
     void                 resize (uint);
-    void                 insertPtr (KAccelAction*);
+    void                 insertPtr (TDEAccelAction*);
 
 private:
-                         KAccelActions (KAccelBase*);
-    KAccelActions &operator=(const KAccelActions &);
+                         TDEAccelActions (TDEAccelBase*);
+    TDEAccelActions &operator=(const TDEAccelActions &);
 
-};  // class KAccelActions
+};  // class TDEAccelActions
 
diff --git a/sip/tdecore/kaccelbase.sip b/sip/tdecore/kaccelbase.sip
index eb9e5e8..20139e5 100644
--- a/sip/tdecore/kaccelbase.sip
+++ b/sip/tdecore/kaccelbase.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KAccelBase
+class TDEAccelBase
 {
 %TypeHeaderCode
 #include <kaccelbase.h>
@@ -45,39 +45,39 @@ public:
         KEYCODE_CHANGED
     };
 
-                         KAccelBase (int);
+                         TDEAccelBase (int);
     uint                 actionCount () const;
-    KAccelActions&       actions ();
+    TDEAccelActions&       actions ();
     bool                 isEnabled ();
-    KAccelAction*        actionPtr (const TQString&);
-    KAccelAction*        actionPtr (const KKey&);
-    KAccelAction*        actionPtr (const KKeyServer::Key&);
+    TDEAccelAction*        actionPtr (const TQString&);
+    TDEAccelAction*        actionPtr (const KKey&);
+    TDEAccelAction*        actionPtr (const KKeyServer::Key&);
     const TQString&       configGroup () const;
     void                 setConfigGroup (const TQString&);
     void                 setConfigGlobal (bool);
     virtual void         setEnabled (bool)  = 0;
     bool                 getAutoUpdate ();
     bool                 setAutoUpdate (bool);
-    KAccelAction*        insert (const TQString&, const TQString&);
-    KAccelAction*        insert (const TQString&, const TQString&, const TQString&, const KShortcut&, const KShortcut&, const TQObject*, const char*, bool = 1, bool = 1);
+    TDEAccelAction*        insert (const TQString&, const TQString&);
+    TDEAccelAction*        insert (const TQString&, const TQString&, const TQString&, const TDEShortcut&, const TDEShortcut&, const TQObject*, const char*, bool = 1, bool = 1);
     bool                 remove (const TQString&);
     bool                 setActionSlot (const TQString&, const TQObject*, const char*);
     bool                 updateConnections ();
-    bool                 setShortcut (const TQString&, const KShortcut&);
+    bool                 setShortcut (const TQString&, const TDEShortcut&);
     bool                 setActionEnabled (const TQString&, bool);
     void                 readSettings (TDEConfigBase* = 0);
     void                 writeSettings (TDEConfigBase* = 0) const;
     TQPopupMenu*          createPopupMenu (TQWidget*, const KKeySequence&);
 
 protected:
-    void                 slotRemoveAction (KAccelAction*);
+    void                 slotRemoveAction (TDEAccelAction*);
 //ig     void                 createKeyList (TQValueVector<structX>&);
-    bool                 insertConnection (KAccelAction*);
-    bool                 removeConnection (KAccelAction*);
-    virtual bool         emitSignal (KAccelBase::Signal)  = 0;
-    virtual bool         connectKey (KAccelAction&, const KKeyServer::Key&)  = 0;
+    bool                 insertConnection (TDEAccelAction*);
+    bool                 removeConnection (TDEAccelAction*);
+    virtual bool         emitSignal (TDEAccelBase::Signal)  = 0;
+    virtual bool         connectKey (TDEAccelAction&, const KKeyServer::Key&)  = 0;
     virtual bool         connectKey (const KKeyServer::Key&)  = 0;
-    virtual bool         disconnectKey (KAccelAction&, const KKeyServer::Key&)  = 0;
+    virtual bool         disconnectKey (TDEAccelAction&, const KKeyServer::Key&)  = 0;
     virtual bool         disconnectKey (const KKeyServer::Key&)  = 0;
 
 protected:
@@ -89,7 +89,7 @@ protected:
     
 //ig     class ActionInfo;
 
-//ig     typedef TQMap<KKeyServer::Key,KAccelBase::ActionInfo> KKeyToActionMap;
+//ig     typedef TQMap<KKeyServer::Key,TDEAccelBase::ActionInfo> KKeyToActionMap;
 
 protected:
 
@@ -98,5 +98,5 @@ protected:
 %End
 
 
-};  // class KAccelBase
+};  // class TDEAccelBase
 
diff --git a/sip/tdecore/kapplication.sip b/sip/tdecore/kapplication.sip
index eaeb023..3ce2c9d 100644
--- a/sip/tdecore/kapplication.sip
+++ b/sip/tdecore/kapplication.sip
@@ -242,7 +242,7 @@ public:
     TQString              geometryArgument () const;
     void                 installKDEPropertyMap ();
     bool                 authorize (const TQString&);
-    bool                 authorizeKAction (const char*);
+    bool                 authorizeTDEAction (const char*);
 
 %If ( KDE_3_1_0 -  )
     bool                 authorizeURLAction (const TQString&, const KURL&, const KURL&);
diff --git a/sip/tdecore/kcompletion.sip b/sip/tdecore/kcompletion.sip
index 8a67700..62013a6 100644
--- a/sip/tdecore/kcompletion.sip
+++ b/sip/tdecore/kcompletion.sip
@@ -115,7 +115,7 @@ public:
         SubstringCompletion
     };
 
-    typedef TQMap<KCompletionBase::KeyBindingType,KShortcut> KeyBindingMap;
+    typedef TQMap<KCompletionBase::KeyBindingType,TDEShortcut> KeyBindingMap;
                          KCompletionBase ();
     KCompletion*         completionObject (bool = 1);
     virtual void         setCompletionObject (KCompletion*, bool = 1);
@@ -127,8 +127,8 @@ public:
     bool                 emitSignals () const;
     virtual void         setCompletionMode (TDEGlobalSettings::Completion);
     TDEGlobalSettings::Completion completionMode () const;
-    bool                 setKeyBinding (KCompletionBase::KeyBindingType, const KShortcut&);
-    const KShortcut&     getKeyBinding (KCompletionBase::KeyBindingType) const;
+    bool                 setKeyBinding (KCompletionBase::KeyBindingType, const TDEShortcut&);
+    const TDEShortcut&     getKeyBinding (KCompletionBase::KeyBindingType) const;
     void                 useGlobalKeyBindings ();
     virtual void         setCompletedText (const TQString&)  = 0;
     virtual void         setCompletedItems (const TQStringList&)  = 0;
@@ -148,7 +148,7 @@ protected:
 
 
 %MappedType KCompletionBase::KeyBindingMap
-//converts a Python dict of int:KShortcut
+//converts a Python dict of int:TDEShortcut
 {
 %TypeHeaderCode
 #include <kcompletion.h>
@@ -167,8 +167,8 @@ protected:
 
     // Get it.
 
-    const TQMap<KCompletionBase::KeyBindingType,KShortcut> map = *sipCpp;
-    TQMap<KCompletionBase::KeyBindingType,KShortcut>::ConstIterator it;
+    const TQMap<KCompletionBase::KeyBindingType,TDEShortcut> map = *sipCpp;
+    TQMap<KCompletionBase::KeyBindingType,TDEShortcut>::ConstIterator it;
 
     PyObject *key;
     PyObject *value;
@@ -176,7 +176,7 @@ protected:
     for (it = map.begin (); it != map.end (); ++it)
     {
         key   = PyInt_FromLong ((int) it.key ());
-        value = sipConvertFromInstance ((void *)&(it.data ()), sipClass_KShortcut, sipTransferObj);
+        value = sipConvertFromInstance ((void *)&(it.data ()), sipClass_TDEShortcut, sipTransferObj);
         if ((value == NULL) || (PyDict_SetItem (dict, key, value) < 0))
         {
             Py_XDECREF (key);
@@ -197,16 +197,16 @@ protected:
     if (sipIsErr == NULL)
         return PyDict_Check(sipPy);
 
-    TQMap<KCompletionBase::KeyBindingType,KShortcut> *kbmap = new TQMap<KCompletionBase::KeyBindingType,KShortcut>;
+    TQMap<KCompletionBase::KeyBindingType,TDEShortcut> *kbmap = new TQMap<KCompletionBase::KeyBindingType,TDEShortcut>;
 
     PyObject *key, *value;
     SIP_SSIZE_T pos = 0;
-    KShortcut *cValue;
+    TDEShortcut *cValue;
     int iserr;
 
     while (PyDict_Next(sipPy, &pos, &key, &value))
     {
-        cValue = (KShortcut *)sipForceConvertToType(value, sipType_KShortcut, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+        cValue = (TDEShortcut *)sipForceConvertToType(value, sipType_TDEShortcut, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
 
         if (iserr || !PyInt_Check (key))
         {
diff --git a/sip/tdecore/kdestyle.sip b/sip/tdecore/kdestyle.sip
index 520818c..a528ed2 100644
--- a/sip/tdecore/kdestyle.sip
+++ b/sip/tdecore/kdestyle.sip
@@ -79,10 +79,10 @@ public:
     void                 drawArrow (TQPainter*, TQt::ArrowType, bool, int, int, int, int, const TQColorGroup&, bool = 1, const TQBrush* = 0);
     void                 drawSlider (TQPainter*, int, int, int, int, const TQColorGroup&, Orientation, bool, bool);
     void                 drawSliderMask (TQPainter*, int, int, int, int, Orientation, bool, bool);
-    void                 drawKToolBar (TQPainter*, int, int, int, int, const TQColorGroup&, KToolBarPos, TQBrush* = 0);
-    void                 drawKBarHandle (TQPainter*, int, int, int, int, const TQColorGroup&, KToolBarPos, TQBrush* = 0);
+    void                 drawTDEToolBar (TQPainter*, int, int, int, int, const TQColorGroup&, TDEToolBarPos, TQBrush* = 0);
+    void                 drawKBarHandle (TQPainter*, int, int, int, int, const TQColorGroup&, TDEToolBarPos, TQBrush* = 0);
     void                 drawKMenuBar (TQPainter*, int, int, int, int, const TQColorGroup&, bool, TQBrush* = 0);
-    void                 drawKToolBarButton (TQPainter*, int, int, int, int, const TQColorGroup&, bool = 0, bool = 1, bool = 1, bool = 0, KToolButtonType = Icon, const TQString& = TQString::null, const TQPixmap* = 0, TQFont* = 0, TQWidget* = 0);
+    void                 drawTDEToolBarButton (TQPainter*, int, int, int, int, const TQColorGroup&, bool = 0, bool = 1, bool = 1, bool = 0, TDEToolButtonType = Icon, const TQString& = TQString::null, const TQPixmap* = 0, TQFont* = 0, TQWidget* = 0);
 //ig     void                 drawKMenuItem (TQPainter*, int, int, int, int, const TQColorGroup&, bool, TQMenuItem*, TQBrush* = 0);
 //ig     void                 drawPopupMenuItem (TQPainter*, bool, int, int, TQMenuItem*, const TQPalette&, bool, bool, int, int, int, int);
 //ig     int                  popupMenuItemHeight (bool, TQMenuItem*, const TQFontMetrics&);
diff --git a/sip/tdecore/kglobalaccel.sip b/sip/tdecore/kglobalaccel.sip
index 887d37b..794552f 100644
--- a/sip/tdecore/kglobalaccel.sip
+++ b/sip/tdecore/kglobalaccel.sip
@@ -35,16 +35,16 @@ public:
                          TDEGlobalAccel (TQObject*, const char* = 0);
     bool                 isEnabled ();
     void                 setEnabled (bool);
-    KAccelAction*        insert (const TQString&, const TQString&, const TQString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
+    TDEAccelAction*        insert (const TQString&, const TQString&, const TQString&, const TDEShortcut&, const TDEShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
 
 %If ( KDE_3_1_0 -  )
     bool                 remove (const TQString&);
 %End
 
-    KAccelAction*        insert (const TQString&, const TQString&);
+    TDEAccelAction*        insert (const TQString&, const TQString&);
     bool                 updateConnections ();
-    const KShortcut&     shortcut (const TQString&) const;
-    bool                 setShortcut (const TQString&, const KShortcut&);
+    const TDEShortcut&     shortcut (const TQString&) const;
+    bool                 setShortcut (const TQString&, const TDEShortcut&);
     bool                 setSlot (const TQString&, SIP_RXOBJ_CON, SIP_SLOT_CON ());
 
 %If ( KDE_3_4_0 -  )
diff --git a/sip/tdecore/kmanagerselection.sip b/sip/tdecore/kmanagerselection.sip
index 765027c..8dad1fa 100644
--- a/sip/tdecore/kmanagerselection.sip
+++ b/sip/tdecore/kmanagerselection.sip
@@ -26,7 +26,7 @@
 
 %If ( KDE_3_2_0 -  )
 
-class KSelectionOwner : TQObject
+class TDESelectionOwner : TQObject
 {
 %TypeHeaderCode
 #include <tqdockwindow.h>
@@ -36,8 +36,8 @@ class KSelectionOwner : TQObject
 
 
 public:
-                         KSelectionOwner (Atom, int = -1, TQObject* /TransferThis/ = 0);
-                         KSelectionOwner (const char*, int = -1, TQObject* /TransferThis/ = 0);
+                         TDESelectionOwner (Atom, int = -1, TQObject* /TransferThis/ = 0);
+                         TDESelectionOwner (const char*, int = -1, TQObject* /TransferThis/ = 0);
     bool                 claim (bool, bool = 1);
     void                 release ();
     Window               ownerWindow () const;
@@ -56,14 +56,14 @@ protected:
 protected:
 //igx     virtual void         virtual_hook (int, void*);
 
-};  // class KSelectionOwner
+};  // class TDESelectionOwner
 
 %End
 
 
 %If ( KDE_3_2_0 -  )
 
-class KSelectionWatcher : TQObject
+class TDESelectionWatcher : TQObject
 {
 %TypeHeaderCode
 #include <tqdockwindow.h>
@@ -73,8 +73,8 @@ class KSelectionWatcher : TQObject
 
 
 public:
-                         KSelectionWatcher (Atom, int = -1, TQObject* /TransferThis/ = 0);
-                         KSelectionWatcher (const char*, int = -1, TQObject* /TransferThis/ = 0);
+                         TDESelectionWatcher (Atom, int = -1, TQObject* /TransferThis/ = 0);
+                         TDESelectionWatcher (const char*, int = -1, TQObject* /TransferThis/ = 0);
     Window               owner ();
 //ig     void                 filterEvent (XEvent*);
 
@@ -85,7 +85,7 @@ signals:
 protected:
 //igx     virtual void         virtual_hook (int, void*);
 
-};  // class KSelectionWatcher
+};  // class TDESelectionWatcher
 
 %End
 
diff --git a/sip/tdecore/kshortcut.sip b/sip/tdecore/kshortcut.sip
index 4f7ca1c..4eb2d03 100644
--- a/sip/tdecore/kshortcut.sip
+++ b/sip/tdecore/kshortcut.sip
@@ -182,7 +182,7 @@ public:
 };  // class KKeySequence
 
 
-class KShortcut
+class TDEShortcut
 {
 %TypeHeaderCode
 #include <kshortcut.h>
@@ -196,31 +196,31 @@ public:
         MAX_SEQUENCES
     };
 
-                         KShortcut ();
-                         KShortcut (int);
-                         KShortcut (const TQKeySequence&);
-                         KShortcut (const KKey&);
-                         KShortcut (const KKeySequence&);
-                         KShortcut (const KShortcut&);
-                         KShortcut (const char*);
-                         KShortcut (const TQString&);
+                         TDEShortcut ();
+                         TDEShortcut (int);
+                         TDEShortcut (const TQKeySequence&);
+                         TDEShortcut (const KKey&);
+                         TDEShortcut (const KKeySequence&);
+                         TDEShortcut (const TDEShortcut&);
+                         TDEShortcut (const char*);
+                         TDEShortcut (const TQString&);
     void                 clear ();
     bool                 init (int);
     bool                 init (const TQKeySequence&);
     bool                 init (const KKey&);
     bool                 init (const KKeySequence&);
-    bool                 init (const KShortcut&);
+    bool                 init (const TDEShortcut&);
     bool                 init (const TQString&);
     uint                 count () const;
     const KKeySequence&  seq (uint) const;
     int                  keyCodeQt () const;
     bool                 isNull () const;
-    int                  compare (const KShortcut&) const;
+    int                  compare (const TDEShortcut&) const;
 
 %If ( KDE_3_1_4 -  )
-    bool                 operator == (const KShortcut&) const;
-    bool                 operator != (const KShortcut&) const;
-    bool                 operator < (const KShortcut&) const;
+    bool                 operator == (const TDEShortcut&) const;
+    bool                 operator != (const TDEShortcut&) const;
+    bool                 operator < (const TDEShortcut&) const;
 %End
 
     bool                 contains (const KKey&) const;
@@ -236,7 +236,7 @@ public:
 
 %If ( KDE_3_2_0 -  )
     bool                 append (const KKey&);
-    bool                 append (const KShortcut&);
+    bool                 append (const TDEShortcut&);
 %End
 
 
@@ -245,8 +245,8 @@ public:
 %End
 
     TQString              toString () const;
-    TQString              toStringInternal (const KShortcut* = 0) const;
-    static KShortcut&    null ();
+    TQString              toStringInternal (const TDEShortcut* = 0) const;
+    static TDEShortcut&    null ();
 
 protected:
 
@@ -257,5 +257,5 @@ public:
 %End
 
 
-};  // class KShortcut
+};  // class TDEShortcut
 
diff --git a/sip/tdecore/kshortcutlist.sip b/sip/tdecore/kshortcutlist.sip
index e5eca23..b1fb9bd 100644
--- a/sip/tdecore/kshortcutlist.sip
+++ b/sip/tdecore/kshortcutlist.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KShortcutList
+class TDEShortcutList
 {
 %TypeHeaderCode
 #include <tdeconfigbase.h>
@@ -34,15 +34,15 @@ class KShortcutList
 
 
 public:
-                         KShortcutList ();
+                         TDEShortcutList ();
     virtual uint         count () const = 0;
     virtual TQString      name (uint) const = 0;
     virtual TQString      label (uint) const = 0;
     virtual TQString      whatsThis (uint) const = 0;
-    virtual const KShortcut& shortcut (uint) const = 0;
-    virtual const KShortcut& shortcutDefault (uint) const = 0;
+    virtual const TDEShortcut& shortcut (uint) const = 0;
+    virtual const TDEShortcut& shortcutDefault (uint) const = 0;
     virtual bool         isConfigurable (uint) const = 0;
-    virtual bool         setShortcut (uint, const KShortcut&)  = 0;
+    virtual bool         setShortcut (uint, const TDEShortcut&)  = 0;
     virtual bool         isGlobal (uint) const;
     virtual int          index (const TQString&) const;
     virtual int          index (const KKeySequence&) const;
@@ -53,8 +53,8 @@ public:
 
     };
 
-    virtual TQVariant     getOther (KShortcutList::Other, uint) const = 0;
-    virtual bool         setOther (KShortcutList::Other, uint, TQVariant)  = 0;
+    virtual TQVariant     getOther (TDEShortcutList::Other, uint) const = 0;
+    virtual bool         setOther (TDEShortcutList::Other, uint, TQVariant)  = 0;
     virtual bool         save () const = 0;
     virtual bool         readSettings (const TQString& = TQString ::null , TDEConfigBase* = 0);
     virtual bool         writeSettings (const TQString& = TQString ::null , TDEConfigBase* = 0, bool = 0, bool = 0) const;
@@ -62,10 +62,10 @@ public:
 protected:
 //igx     virtual void         virtual_hook (int, void*);
 
-};  // class KShortcutList
+};  // class TDEShortcutList
 
 
-class KAccelShortcutList : KShortcutList
+class TDEAccelShortcutList : TDEShortcutList
 {
 %TypeHeaderCode
 #include <tdeconfigbase.h>
@@ -75,20 +75,20 @@ class KAccelShortcutList : KShortcutList
 
 
 public:
-                         KAccelShortcutList (KAccel*);
-                         KAccelShortcutList (TDEGlobalAccel*);
-                         KAccelShortcutList (KAccelActions&, bool);
+                         TDEAccelShortcutList (TDEAccel*);
+                         TDEAccelShortcutList (TDEGlobalAccel*);
+                         TDEAccelShortcutList (TDEAccelActions&, bool);
     virtual uint         count () const;
     virtual TQString      name (uint) const;
     virtual TQString      label (uint) const;
     virtual TQString      whatsThis (uint) const;
-    virtual const KShortcut& shortcut (uint) const;
-    virtual const KShortcut& shortcutDefault (uint) const;
+    virtual const TDEShortcut& shortcut (uint) const;
+    virtual const TDEShortcut& shortcutDefault (uint) const;
     virtual bool         isConfigurable (uint) const;
-    virtual bool         setShortcut (uint, const KShortcut&);
+    virtual bool         setShortcut (uint, const TDEShortcut&);
     virtual bool         isGlobal (uint) const;
-    virtual TQVariant     getOther (KShortcutList::Other, uint) const;
-    virtual bool         setOther (KShortcutList::Other, uint, TQVariant);
+    virtual TQVariant     getOther (TDEShortcutList::Other, uint) const;
+    virtual bool         setOther (TDEShortcutList::Other, uint, TQVariant);
     virtual bool         save () const;
 
 protected:
@@ -96,12 +96,12 @@ protected:
 protected:
 //igx     virtual void         virtual_hook (int, void*);
 
-};  // class KAccelShortcutList
+};  // class TDEAccelShortcutList
 
-namespace KStdAccel
+namespace TDEStdAccel
 {
 
-class ShortcutList : KShortcutList
+class ShortcutList : TDEShortcutList
 {
 %TypeHeaderCode
 #include <tdeconfigbase.h>
@@ -116,12 +116,12 @@ public:
     virtual TQString      name (uint) const;
     virtual TQString      label (uint) const;
     virtual TQString      whatsThis (uint) const;
-    virtual const KShortcut& shortcut (uint) const;
-    virtual const KShortcut& shortcutDefault (uint) const;
+    virtual const TDEShortcut& shortcut (uint) const;
+    virtual const TDEShortcut& shortcutDefault (uint) const;
     virtual bool         isConfigurable (uint) const;
-    virtual bool         setShortcut (uint, const KShortcut&);
-    virtual TQVariant     getOther (KShortcutList::Other, uint) const;
-    virtual bool         setOther (KShortcutList::Other, uint, TQVariant);
+    virtual bool         setShortcut (uint, const TDEShortcut&);
+    virtual TQVariant     getOther (TDEShortcutList::Other, uint) const;
+    virtual bool         setOther (TDEShortcutList::Other, uint, TQVariant);
     virtual bool         save () const;
 
 protected:
@@ -129,5 +129,5 @@ protected:
 
 };  // class ShortcutList
 
-};  // namespace KStdAccel
+};  // namespace TDEStdAccel
 
diff --git a/sip/tdecore/kstdaccel.sip b/sip/tdecore/kstdaccel.sip
index c32d1fb..2af5526 100644
--- a/sip/tdecore/kstdaccel.sip
+++ b/sip/tdecore/kstdaccel.sip
@@ -27,7 +27,7 @@
 #include <kstdaccel.h>
 %End
 
-namespace KStdAccel
+namespace TDEStdAccel
 {
 
 %If ( KDE_3_4_0 -  )
@@ -89,83 +89,83 @@ enum StdAccel
 
 %End
 
-const KShortcut&     shortcut (KStdAccel::StdAccel);
-TQString              name (KStdAccel::StdAccel);
-TQString              label (KStdAccel::StdAccel);
-TQString              whatsThis (KStdAccel::StdAccel);
-KStdAccel::StdAccel  findStdAccel (const KKeySequence&);
-KShortcut            shortcutDefault (KStdAccel::StdAccel);
-KShortcut            shortcutDefault3 (KStdAccel::StdAccel);
-KShortcut            shortcutDefault4 (KStdAccel::StdAccel);
-const KShortcut&     open ();
-const KShortcut&     openNew ();
-const KShortcut&     close ();
-const KShortcut&     save ();
-const KShortcut&     print ()  /PyName=print_/;
-const KShortcut&     quit ();
-const KShortcut&     undo ();
-const KShortcut&     redo ();
-const KShortcut&     cut ();
-const KShortcut&     copy ();
-const KShortcut&     paste ();
+const TDEShortcut&     shortcut (TDEStdAccel::StdAccel);
+TQString              name (TDEStdAccel::StdAccel);
+TQString              label (TDEStdAccel::StdAccel);
+TQString              whatsThis (TDEStdAccel::StdAccel);
+TDEStdAccel::StdAccel  findStdAccel (const KKeySequence&);
+TDEShortcut            shortcutDefault (TDEStdAccel::StdAccel);
+TDEShortcut            shortcutDefault3 (TDEStdAccel::StdAccel);
+TDEShortcut            shortcutDefault4 (TDEStdAccel::StdAccel);
+const TDEShortcut&     open ();
+const TDEShortcut&     openNew ();
+const TDEShortcut&     close ();
+const TDEShortcut&     save ();
+const TDEShortcut&     print ()  /PyName=print_/;
+const TDEShortcut&     quit ();
+const TDEShortcut&     undo ();
+const TDEShortcut&     redo ();
+const TDEShortcut&     cut ();
+const TDEShortcut&     copy ();
+const TDEShortcut&     paste ();
 
 %If ( KDE_3_4_0 -  )
-const KShortcut&     pasteSelection ();
+const TDEShortcut&     pasteSelection ();
 %End
 
-const KShortcut&     selectAll ();
-const KShortcut&     deleteWordBack ();
-const KShortcut&     deleteWordForward ();
-const KShortcut&     find ();
-const KShortcut&     findNext ();
-const KShortcut&     findPrev ();
-const KShortcut&     replace ();
-const KShortcut&     zoomIn ();
-const KShortcut&     zoomOut ();
-//ig const KShortcut&     insert ();
-const KShortcut&     home ();
-const KShortcut&     end ();
+const TDEShortcut&     selectAll ();
+const TDEShortcut&     deleteWordBack ();
+const TDEShortcut&     deleteWordForward ();
+const TDEShortcut&     find ();
+const TDEShortcut&     findNext ();
+const TDEShortcut&     findPrev ();
+const TDEShortcut&     replace ();
+const TDEShortcut&     zoomIn ();
+const TDEShortcut&     zoomOut ();
+//ig const TDEShortcut&     insert ();
+const TDEShortcut&     home ();
+const TDEShortcut&     end ();
 
 %If ( KDE_3_3_0 -  )
-const KShortcut&     beginningOfLine ();
-const KShortcut&     endOfLine ();
+const TDEShortcut&     beginningOfLine ();
+const TDEShortcut&     endOfLine ();
 %End
 
-const KShortcut&     prior ();
-const KShortcut&     next ();
-const KShortcut&     gotoLine ();
-const KShortcut&     addBookmark ();
+const TDEShortcut&     prior ();
+const TDEShortcut&     next ();
+const TDEShortcut&     gotoLine ();
+const TDEShortcut&     addBookmark ();
 
 %If ( KDE_3_2_0 -  )
-const KShortcut&     tabNext ();
-const KShortcut&     tabPrev ();
-const KShortcut&     fullScreen ();
+const TDEShortcut&     tabNext ();
+const TDEShortcut&     tabPrev ();
+const TDEShortcut&     fullScreen ();
 %End
 
-const KShortcut&     help ();
-const KShortcut&     completion ();
-const KShortcut&     prevCompletion ();
-const KShortcut&     nextCompletion ();
-const KShortcut&     substringCompletion ();
-const KShortcut&     rotateUp ();
-const KShortcut&     rotateDown ();
-const KShortcut&     popupMenuContext ();
-const KShortcut&     whatsThis ();
-const KShortcut&     reload ();
-const KShortcut&     up ();
-const KShortcut&     back ();
-const KShortcut&     forward ();
+const TDEShortcut&     help ();
+const TDEShortcut&     completion ();
+const TDEShortcut&     prevCompletion ();
+const TDEShortcut&     nextCompletion ();
+const TDEShortcut&     substringCompletion ();
+const TDEShortcut&     rotateUp ();
+const TDEShortcut&     rotateDown ();
+const TDEShortcut&     popupMenuContext ();
+const TDEShortcut&     whatsThis ();
+const TDEShortcut&     reload ();
+const TDEShortcut&     up ();
+const TDEShortcut&     back ();
+const TDEShortcut&     forward ();
 
 %If ( KDE_3_3_0 -  )
-const KShortcut&     backwardWord ();
-const KShortcut&     forwardWord ();
+const TDEShortcut&     backwardWord ();
+const TDEShortcut&     forwardWord ();
 %End
 
-const KShortcut&     showMenubar ();
-TQString              action (KStdAccel::StdAccel);
-TQString              description (KStdAccel::StdAccel);
-int                  key (KStdAccel::StdAccel);
-int                  defaultKey (KStdAccel::StdAccel);
+const TDEShortcut&     showMenubar ();
+TQString              action (TDEStdAccel::StdAccel);
+TQString              description (TDEStdAccel::StdAccel);
+int                  key (TDEStdAccel::StdAccel);
+int                  defaultKey (TDEStdAccel::StdAccel);
 bool                 isEqual (const TQKeyEvent*, int);
 
 %If ( KDE_3_3_0 - KDE_3_4_0 )
@@ -437,5 +437,5 @@ enum StdAccel
 
 %End
 
-};  // namespace KStdAccel
+};  // namespace TDEStdAccel