Rename a number of classes to enhance compatibility with KDE4

2 files changed, 24 insertions, 24 deletions

diff --git a/kivio/kiviopart/tools/mousetoolaction.cpp b/kivio/kiviopart/tools/mousetoolaction.cpp
index e46e522c..b49baace 100644
--- a/kivio/kiviopart/tools/mousetoolaction.cpp
+++ b/kivio/kiviopart/tools/mousetoolaction.cpp
@@ -24,51 +24,51 @@
 
 namespace Kivio {
 
-MouseToolAction::MouseToolAction(const TQString& text, const KShortcut& cut,
+MouseToolAction::MouseToolAction(const TQString& text, const TDEShortcut& cut,
                             TQObject* parent, const char* name)
-  : KRadioAction(text, cut, parent, name)
+  : TDERadioAction(text, cut, parent, name)
 {
 }
 
-MouseToolAction::MouseToolAction(const TQString& text, const KShortcut& cut,
+MouseToolAction::MouseToolAction(const TQString& text, const TDEShortcut& cut,
                             const TQObject* receiver, const char* slot,
                             TQObject* parent, const char* name)
-  : KRadioAction(text, cut, receiver, slot, parent, name)
+  : TDERadioAction(text, cut, receiver, slot, parent, name)
 {
 }
 
 MouseToolAction::MouseToolAction(const TQString& text, const TQIconSet& pix,
-                            const KShortcut& cut,
+                            const TDEShortcut& cut,
                             TQObject* parent, const char* name)
-  : KRadioAction(text, pix, cut, parent, name)
+  : TDERadioAction(text, pix, cut, parent, name)
 {
 }
 
 MouseToolAction::MouseToolAction(const TQString& text, const TQString& pix,
-                            const KShortcut& cut,
+                            const TDEShortcut& cut,
                             TQObject* parent, const char* name)
-  : KRadioAction(text, pix, cut, parent, name)
+  : TDERadioAction(text, pix, cut, parent, name)
 {
 }
 
 MouseToolAction::MouseToolAction(const TQString& text, const TQIconSet& pix,
-                            const KShortcut& cut,
+                            const TDEShortcut& cut,
                             const TQObject* receiver, const char* slot,
                             TQObject* parent, const char* name)
-  : KRadioAction(text, pix, cut, receiver, slot, parent, name)
+  : TDERadioAction(text, pix, cut, receiver, slot, parent, name)
 {
 }
 
 MouseToolAction::MouseToolAction(const TQString& text, const TQString& pix,
-                            const KShortcut& cut,
+                            const TDEShortcut& cut,
                             const TQObject* receiver, const char* slot,
                             TQObject* parent, const char* name)
-  : KRadioAction(text, pix, cut, receiver, slot, parent, name)
+  : TDERadioAction(text, pix, cut, receiver, slot, parent, name)
 {
 }
 
 MouseToolAction::MouseToolAction(TQObject* parent, const char* name)
-  : KRadioAction(parent, name)
+  : TDERadioAction(parent, name)
 {
 }
 
@@ -78,15 +78,15 @@ MouseToolAction::~MouseToolAction()
 
 int MouseToolAction::plug(TQWidget* widget, int index)
 {
-  int usedIndex = KRadioAction::plug(widget, index);
+  int usedIndex = TDERadioAction::plug(widget, index);
   
   if(usedIndex == -1) {
     return usedIndex;
   }
   
-  if(::tqqt_cast<KToolBar*>(widget)) {
-    KToolBar* toolBar = static_cast<KToolBar*>(widget);
-    KToolBarButton* button = toolBar->getButton(itemId(usedIndex));
+  if(::tqqt_cast<TDEToolBar*>(widget)) {
+    TDEToolBar* toolBar = static_cast<TDEToolBar*>(widget);
+    TDEToolBarButton* button = toolBar->getButton(itemId(usedIndex));
     connect(button, TQT_SIGNAL(doubleClicked(int)), this, TQT_SIGNAL(doubleClicked()));
   }
   
diff --git a/kivio/kiviopart/tools/mousetoolaction.h b/kivio/kiviopart/tools/mousetoolaction.h
index 64b322ab..f4ba5389 100644
--- a/kivio/kiviopart/tools/mousetoolaction.h
+++ b/kivio/kiviopart/tools/mousetoolaction.h
@@ -24,7 +24,7 @@
 
 namespace Kivio {
 
-class KIVIO_EXPORT MouseToolAction : public KRadioAction
+class KIVIO_EXPORT MouseToolAction : public TDERadioAction
 {
   Q_OBJECT
   
@@ -39,7 +39,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction
     * @param parent This action's parent.
     * @param name An internal name for this action.
       */
-    MouseToolAction(const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0);
+    MouseToolAction(const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0);
   
     /**
       *  @param text The text that will be displayed.
@@ -49,7 +49,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction
       *  @param parent This action's parent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(const TQString& text, const KShortcut& cut,
+    MouseToolAction(const TQString& text, const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0);
   
     /**
@@ -59,7 +59,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction
       *  @param parent This action's parent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
+    MouseToolAction(const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(),
                   TQObject* parent = 0, const char* name = 0);
   
     /**
@@ -69,7 +69,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction
       *  @param parent This action's parent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
+    MouseToolAction(const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(),
                   TQObject* parent = 0, const char* name = 0);
   
     /**
@@ -81,7 +81,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction
       *  @param parent This action's parent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+    MouseToolAction(const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0);
   
     /**
@@ -93,7 +93,7 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction
       *  @param parent This action's parent.
       *  @param name An internal name for this action.
       */
-    MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut,
+    MouseToolAction(const TQString& text, const TQString& pix, const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot,
                   TQObject* parent, const char* name = 0);