Rename a number of classes to enhance compatibility with KDE4

16 files changed, 40 insertions, 40 deletions

diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
index 85772397..139d99b9 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
@@ -202,12 +202,12 @@ void KisToolMoveSelection::buttonRelease(KisButtonReleaseEvent *e)
     }
 }
 
-void KisToolMoveSelection::setup(KActionCollection *collection)
+void KisToolMoveSelection::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new KRadioAction(i18n("&Move selection"),
+        m_action = new TDERadioAction(i18n("&Move selection"),
                         "tool_move",
                         TQt::SHIFT+TQt::Key_V,
                         this,
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.h b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.h
index 7ed98a53..2809cb85 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.h
@@ -37,7 +37,7 @@ public:
     virtual void update(KisCanvasSubject *subject);
 
 public:
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SELECT; }
     virtual TQ_UINT32 priority() { return 10; }
 
@@ -60,7 +60,7 @@ public:
     KisToolMoveSelectionFactory() : super() {};
     virtual ~KisToolMoveSelectionFactory(){};
     
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolMoveSelection(); 
         TQ_CHECK_PTR(t);
         t->setup(ac); 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
index c2ca5405..478e5904 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
@@ -127,12 +127,12 @@ void KisToolSelectBrush::endPaint()
 }
 
 
-void KisToolSelectBrush::setup(KActionCollection *collection)
+void KisToolSelectBrush::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new KRadioAction(i18n("&Selection Brush"),
+        m_action = new TDERadioAction(i18n("&Selection Brush"),
                         "tool_brush_selection", "Ctrl+Shift+B", this,
                         TQT_SLOT(activate()), collection,
                         name());
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
index 581269d0..99cc98da 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
@@ -44,7 +44,7 @@ public:
     KisToolSelectBrush();
     virtual ~KisToolSelectBrush();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual TQ_UINT32 priority() { return 1; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
     virtual TQWidget* createOptionWidget(TQWidget* parent);
@@ -69,7 +69,7 @@ public:
     KisToolSelectBrushFactory() : super() {};
     virtual ~KisToolSelectBrushFactory(){};
     
-    virtual KisTool * createTool(KActionCollection * ac) { 
+    virtual KisTool * createTool(TDEActionCollection * ac) { 
         KisTool * t =  new KisToolSelectBrush();
         TQ_CHECK_PTR(t);
         t->setup(ac); 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
index dd762a9d..397e56c7 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
@@ -137,12 +137,12 @@ void KisToolSelectContiguous::buttonPress(KisButtonPressEvent * e)
 
 }
 
-void KisToolSelectContiguous::setup(KActionCollection *collection)
+void KisToolSelectContiguous::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new KRadioAction(i18n("&Contiguous Area Selection"),
+        m_action = new TDERadioAction(i18n("&Contiguous Area Selection"),
                         "tool_contiguous_selection" ,
                         0,
                         this,
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
index 640d36cf..9dca4955 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
@@ -50,7 +50,7 @@ public:
 public:
     virtual void update(KisCanvasSubject *subject);
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual TQ_UINT32 priority() { return 7; }
     virtual enumToolType toolType() { return TOOL_SELECT; };
 
@@ -81,7 +81,7 @@ public:
     KisToolSelectContiguousFactory() : super() {};
     virtual ~KisToolSelectContiguousFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) { 
+    virtual KisTool * createTool(TDEActionCollection * ac) { 
         KisTool * t =  new KisToolSelectContiguous(); 
         TQ_CHECK_PTR(t);
         t->setup(ac); 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
index 77f96c5a..2be4046c 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
@@ -278,12 +278,12 @@ void KisToolSelectElliptical::slotSetAction(int action) {
         m_selectAction =(enumSelectionMode)action;
 }
 
-void KisToolSelectElliptical::setup(KActionCollection *collection)
+void KisToolSelectElliptical::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new KRadioAction(i18n("&Elliptical Selection"),
+        m_action = new TDERadioAction(i18n("&Elliptical Selection"),
                         "tool_elliptical_selection" ,
                         TQt::Key_J,
                         this,
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
index 5e971d96..230de5b1 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
@@ -44,7 +44,7 @@ public:
 
     virtual void update(KisCanvasSubject *subject);
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual TQ_UINT32 priority() { return 4; }
     virtual TQWidget * createOptionWidget(TQWidget* parent);
         virtual TQWidget* optionWidget();
@@ -82,7 +82,7 @@ public:
     KisToolSelectEllipticalFactory() : super() {};
     virtual ~KisToolSelectEllipticalFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolSelectElliptical();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
index 7054f69c..87dc038a 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
@@ -114,12 +114,12 @@ void KisToolSelectEraser::endPaint() {
     if (m_currentImage && m_currentImage->activeDevice())
         m_currentImage->activeDevice()->emitSelectionChanged();
 }
-void KisToolSelectEraser::setup(KActionCollection *collection)
+void KisToolSelectEraser::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new KRadioAction(i18n("Selection &Eraser"),
+        m_action = new TDERadioAction(i18n("Selection &Eraser"),
                         "tool_eraser_selection", "Ctrl+Shift+E", this,
                         TQT_SLOT(activate()), collection,
                         name());
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
index f1f31a9e..762f24a8 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
@@ -42,7 +42,7 @@ public:
     KisToolSelectEraser();
     virtual ~KisToolSelectEraser();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual TQ_UINT32 priority() { return 2; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
     virtual TQWidget* createOptionWidget(TQWidget* parent);
@@ -67,7 +67,7 @@ public:
     KisToolSelectEraserFactory() : super() {};
     virtual ~KisToolSelectEraserFactory(){};
     
-    virtual KisTool * createTool(KActionCollection * ac) { 
+    virtual KisTool * createTool(TDEActionCollection * ac) { 
         KisTool * t =  new KisToolSelectEraser(); 
         TQ_CHECK_PTR(t);
         t->setup(ac); 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
index 3788eaa5..ee869304 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
@@ -247,12 +247,12 @@ void KisToolSelectOutline::deactivate()
     }
 }
 
-void KisToolSelectOutline::setup(KActionCollection *collection)
+void KisToolSelectOutline::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new KRadioAction(i18n("&Outline Selection"),
+        m_action = new TDERadioAction(i18n("&Outline Selection"),
                         "tool_outline_selection",
                         0,
                         this,
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
index 995e6c45..c58a32c6 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
@@ -44,7 +44,7 @@ public:
 
     virtual void update (KisCanvasSubject *subject);
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual TQ_UINT32 priority() { return 6; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
 
@@ -87,7 +87,7 @@ public:
     KisToolSelectOutlineFactory() : super() {};
     virtual ~KisToolSelectOutlineFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolSelectOutline();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
index b7ad8cb6..58fc19c6 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
@@ -266,12 +266,12 @@ void KisToolSelectPolygonal::draw(KisCanvasPainter& gc)
 }
 
 
-void KisToolSelectPolygonal::setup(KActionCollection *collection)
+void KisToolSelectPolygonal::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new KRadioAction(i18n("&Polygonal Selection"),
+        m_action = new TDERadioAction(i18n("&Polygonal Selection"),
                         "tool_polygonal_selection" ,
                         0,
                         this,
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
index 74b9fad9..66ff36e0 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
@@ -49,7 +49,7 @@ public:
         // KisToolPaint interface
         //
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual TQ_UINT32 priority() { return 5; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
     virtual void buttonPress(KisButtonPressEvent *event);
@@ -92,7 +92,7 @@ public:
     KisToolSelectPolygonalFactory() : super() {};
     virtual ~KisToolSelectPolygonalFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolSelectPolygonal();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
index 316ce149..f469ce31 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
@@ -279,12 +279,12 @@ void KisToolSelectRectangular::slotSetAction(int action) {
         m_selectAction =(enumSelectionMode)action;
 }
 
-void KisToolSelectRectangular::setup(KActionCollection *collection)
+void KisToolSelectRectangular::setup(TDEActionCollection *collection)
 {
-    m_action = static_cast<KRadioAction *>(collection->action(name()));
+    m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new KRadioAction(i18n("&Rectangular Selection"),
+        m_action = new TDERadioAction(i18n("&Rectangular Selection"),
                         "tool_rect_selection",
                         TQt::Key_R,
                         this,
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
index 232c5ba9..0289e430 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
@@ -41,7 +41,7 @@ public:
 
     virtual void update(KisCanvasSubject *subject);
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual TQ_UINT32 priority() { return 3; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
     virtual TQWidget * createOptionWidget(TQWidget* parent);
@@ -80,7 +80,7 @@ public:
     KisToolSelectRectangularFactory() : super() {};
     virtual ~KisToolSelectRectangularFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolSelectRectangular();
         t->setup(ac);
         TQ_CHECK_PTR(t);