Rename a number of classes to enhance compatibility with KDE4

8 files changed, 28 insertions, 28 deletions

diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
index b9d06ffe..bfa016ae 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
@@ -90,14 +90,14 @@ KisCurve::iterator KisToolBezierPaint::paintPoint (KisPainter& painter, KisCurve
     return point;
 }
 
-void KisToolBezierPaint::setup(KActionCollection *collection)
+void KisToolBezierPaint::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        KShortcut shortcut(TQt::Key_Plus);
-        shortcut.append(KShortcut(TQt::Key_F9));
-        m_action = new KRadioAction(i18n("&Bezier"),
+        TDEShortcut shortcut(TQt::Key_Plus);
+        shortcut.append(TDEShortcut(TQt::Key_F9));
+        m_action = new TDERadioAction(i18n("&Bezier"),
                                     "tool_bezier_paint",
                                     shortcut,
                                     this,
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h
index a72cae87..01922249 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h
@@ -35,7 +35,7 @@ public:
     KisToolBezierPaint();
     virtual ~KisToolBezierPaint();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
     virtual TQ_UINT32 priority() { return 7; }
     
@@ -51,7 +51,7 @@ public:
     KisToolBezierPaintFactory() : super() {};
     virtual ~KisToolBezierPaintFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolBezierPaint();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
index 294bc1e7..4cc87291 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
@@ -79,14 +79,14 @@ TQValueVector<KisPoint> KisToolBezierSelect::convertCurve()
     return points;
 }
 
-void KisToolBezierSelect::setup(KActionCollection *collection)
+void KisToolBezierSelect::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        KShortcut shortcut(TQt::Key_Plus);
-        shortcut.append(KShortcut(TQt::Key_F9));
-        m_action = new KRadioAction(i18n("&Bezier"),
+        TDEShortcut shortcut(TQt::Key_Plus);
+        shortcut.append(TDEShortcut(TQt::Key_F9));
+        m_action = new TDERadioAction(i18n("&Bezier"),
                                     "tool_bezier_select",
                                     shortcut,
                                     this,
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.h b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.h
index e702fd23..7ce1c382 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.h
@@ -35,7 +35,7 @@ public:
     KisToolBezierSelect();
     virtual ~KisToolBezierSelect();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SELECT; }
     virtual TQ_UINT32 priority() { return 10; }
 
@@ -51,7 +51,7 @@ public:
     KisToolBezierSelectFactory() : super() {};
     virtual ~KisToolBezierSelectFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolBezierSelect();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cc
index 71a34f93..91ae71b8 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cc
@@ -83,14 +83,14 @@ KisToolExample::~KisToolExample()
 
 }
 
-void KisToolExample::setup(KActionCollection *collection)
+void KisToolExample::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        KShortcut shortcut(TQt::Key_Plus);
-        shortcut.append(KShortcut(TQt::Key_F9));
-        m_action = new KRadioAction(i18n("&Example"),
+        TDEShortcut shortcut(TQt::Key_Plus);
+        shortcut.append(TDEShortcut(TQt::Key_F9));
+        m_action = new TDERadioAction(i18n("&Example"),
                                     "tool_example",
                                     shortcut,
                                     this,
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.h b/chalk/plugins/tools/tool_curves/kis_tool_example.h
index 0187d65a..5c01b6e3 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_example.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_example.h
@@ -43,7 +43,7 @@ public:
     KisToolExample();
     virtual ~KisToolExample();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
 
 };
@@ -54,7 +54,7 @@ public:
     KisToolExampleFactory() : super() {};
     virtual ~KisToolExampleFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolExample();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
index 36e94fe8..cf770196 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
@@ -784,14 +784,14 @@ TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent)
     return m_optWidget;
 }
 
-void KisToolMagnetic::setup(KActionCollection *collection)
+void KisToolMagnetic::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        KShortcut shortcut(TQt::Key_Plus);
-        shortcut.append(KShortcut(TQt::Key_F9));
-        m_action = new KRadioAction(i18n("Magnetic Outline"),
+        TDEShortcut shortcut(TQt::Key_Plus);
+        shortcut.append(TDEShortcut(TQt::Key_F9));
+        m_action = new TDERadioAction(i18n("Magnetic Outline"),
                                     "tool_moutline",
                                     shortcut,
                                     this,
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h
index 031efa55..b9b4830f 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h
@@ -76,7 +76,7 @@ public:
     ~KisToolMagnetic();
 
     virtual void update (KisCanvasSubject*);
-    virtual void setup (KActionCollection*);
+    virtual void setup (TDEActionCollection*);
     virtual enumToolType toolType() { return TOOL_SELECT; }
     virtual TQ_UINT32 priority() { return 9; }
 
@@ -120,7 +120,7 @@ public:
     KisToolMagneticFactory() : super() {};
     virtual ~KisToolMagneticFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolMagnetic();
         TQ_CHECK_PTR(t);
         t->setup(ac);