Rename a number of classes to enhance compatibility with KDE4

66 files changed, 183 insertions, 183 deletions

diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
index 6858baf2..b440e3f5 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
@@ -107,13 +107,13 @@ void KisToolBrush::endPaint()
 }
 
 
-void KisToolBrush::setup(KActionCollection *collection)
+void KisToolBrush::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("&Brush"),
+        m_action = new TDERadioAction(i18n("&Brush"),
                                     "tool_freehand", TQt::Key_B, this,
                                     TQT_SLOT(activate()), collection,
                                     name());
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.h b/chalk/plugins/tools/defaulttools/kis_tool_brush.h
index e0c5b3a9..bd932ae5 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.h
@@ -42,7 +42,7 @@ public:
     KisToolBrush();
     virtual ~KisToolBrush();
     virtual void update(KisCanvasSubject *subject);
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
     virtual TQ_UINT32 priority() { return 0; }
     TQWidget* createOptionWidget(TQWidget* parent);
@@ -73,7 +73,7 @@ public:
     KisToolBrushFactory() : super() {};
     virtual ~KisToolBrushFactory(){};
     
-    virtual KisTool * createTool(KActionCollection * ac) { 
+    virtual KisTool * createTool(TDEActionCollection * ac) { 
         KisTool * t =  new KisToolBrush(); 
         TQ_CHECK_PTR(t);
         t->setup(ac); 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
index 3eb7468d..9f6b52ae 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
@@ -209,12 +209,12 @@ void KisToolColorPicker::displayPickedColor()
     }
 }
 
-void KisToolColorPicker::setup(KActionCollection *collection)
+void KisToolColorPicker::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("&Color Picker"), "tool_colorpicker", TQt::Key_P, this, TQT_SLOT(activate()), collection, name());
+        m_action = new TDERadioAction(i18n("&Color Picker"), "tool_colorpicker", TQt::Key_P, this, TQT_SLOT(activate()), collection, name());
         m_action->setToolTip(i18n("Color picker"));
         m_action->setExclusiveGroup("tools");
         m_ownAction = true;
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
index d8c0459a..e7960fd3 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
@@ -40,7 +40,7 @@ public:
 
 public:
     virtual void update(KisCanvasSubject *subject);
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual void buttonPress(KisButtonPressEvent *e);
     virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
@@ -74,7 +74,7 @@ public:
     KisToolColorPickerFactory() : super() {};
     virtual ~KisToolColorPickerFactory(){};
     
-    virtual KisTool * createTool(KActionCollection * ac) { 
+    virtual KisTool * createTool(TDEActionCollection * ac) { 
         KisTool * t =  new KisToolColorPicker(); 
         TQ_CHECK_PTR(t);
         t->setup(ac); 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
index 341bbe9a..0718f116 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
@@ -83,12 +83,12 @@ void KisToolDuplicate::buttonPress(KisButtonPressEvent *e)
 }
 
 
-void KisToolDuplicate::setup(KActionCollection *collection)
+void KisToolDuplicate::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("&Duplicate Brush"),
+        m_action = new TDERadioAction(i18n("&Duplicate Brush"),
                         "tool_duplicate", TQt::Key_C, this,
                         TQT_SLOT(activate()), collection,
                         name());
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
index f5636dd4..a7fd92df 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
@@ -40,7 +40,7 @@ public:
     KisToolDuplicate();
     virtual ~KisToolDuplicate();
   
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_FREEHAND; }
     virtual TQ_UINT32 priority() { return 0; }
     virtual void buttonPress(KisButtonPressEvent *e);
@@ -77,7 +77,7 @@ public:
     KisToolDuplicateFactory() : super() {};
     virtual ~KisToolDuplicateFactory(){};
     
-    virtual KisTool * createTool(KActionCollection * ac) { 
+    virtual KisTool * createTool(TDEActionCollection * ac) { 
         KisTool * t =  new KisToolDuplicate();
         TQ_CHECK_PTR(t);
         t->setup(ac); 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc
index 65593c23..4cc7d2f6 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc
@@ -163,14 +163,14 @@ void KisToolEllipse::draw(const KisPoint& start, const KisPoint& end )
     p.end ();
 }
 
-void KisToolEllipse::setup(KActionCollection *collection)
+void KisToolEllipse::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_F7));
-        m_action = new KRadioAction(i18n("&Ellipse"),
+        TDEShortcut shortcut(TQt::Key_Plus);
+        shortcut.append(TDEShortcut(TQt::Key_F7));
+        m_action = new TDERadioAction(i18n("&Ellipse"),
                                     "tool_ellipse",
                                     shortcut,
                                     this,
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.h b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.h
index 6d61d6f6..09311a30 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.h
@@ -49,7 +49,7 @@ public:
         // KisToolPaint interface
         //
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual TQ_UINT32 priority() { return 3; }
     virtual enumToolType toolType() { return TOOL_SHAPE; }
     virtual void buttonPress(KisButtonPressEvent *event);
@@ -77,7 +77,7 @@ public:
     KisToolEllipseFactory() : super() {};
     virtual ~KisToolEllipseFactory(){};
     
-    virtual KisTool * createTool(KActionCollection * ac) { 
+    virtual KisTool * createTool(TDEActionCollection * ac) { 
         KisTool * t =  new KisToolEllipse(); 
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
index f15bf778..93976d6a 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
@@ -212,12 +212,12 @@ void KisToolFill::slotSetFillSelection(bool state)
     m_checkSampleMerged->setEnabled(!state);
 }
 
-void KisToolFill::setup(KActionCollection *collection)
+void KisToolFill::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("&Fill"),
+        m_action = new TDERadioAction(i18n("&Fill"),
                         "tool_color_fill",
                         TQt::Key_F,
                         this,
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.h b/chalk/plugins/tools/defaulttools/kis_tool_fill.h
index 72d0a230..09df0851 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.h
@@ -31,7 +31,7 @@ class TQWidget;
 class TQLabel;
 class TQCheckBox;
 class KIntNumInput;
-class KActionCollection;
+class TDEActionCollection;
 
 class KisToolFill : public KisToolPaint {
 
@@ -44,7 +44,7 @@ public:
     KisToolFill();
     virtual ~KisToolFill();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_FILL; }
     virtual TQ_UINT32 priority() { return 0; }
 
@@ -92,7 +92,7 @@ public:
     KisToolFillFactory() : super() {};
     virtual ~KisToolFillFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisToolFill * t = new KisToolFill();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
index 46ba1f75..6801cf40 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
@@ -290,12 +290,12 @@ void KisToolGradient::slotSetAntiAliasThreshold(double value)
     m_antiAliasThreshold = value;
 }
 
-void KisToolGradient::setup(KActionCollection *collection)
+void KisToolGradient::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("&Gradient"),
+        m_action = new TDERadioAction(i18n("&Gradient"),
                         "tool_gradient", TQt::Key_G, this,
                         TQT_SLOT(activate()), collection,
                         name());
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
index 63cdf458..f5b6130f 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
@@ -54,7 +54,7 @@ public:
     KisToolGradient();
     virtual ~KisToolGradient();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_FILL; }
     virtual TQ_UINT32 priority() { return 1; }
 
@@ -109,7 +109,7 @@ public:
     KisToolGradientFactory() : super() {};
     virtual ~KisToolGradientFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolGradient();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cc
index 960d19f6..5a024bf0 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cc
@@ -231,12 +231,12 @@ void KisToolLine::paintLine(KisCanvasPainter& gc, const TQRect&)
     }
 }
 
-void KisToolLine::setup(KActionCollection *collection)
+void KisToolLine::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("&Line"),
+        m_action = new TDERadioAction(i18n("&Line"),
                         "tool_line", TQt::Key_L, this,
                         TQT_SLOT(activate()), collection,
                         name());
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.h b/chalk/plugins/tools/defaulttools/kis_tool_line.h
index 117e550b..d401a797 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_line.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_line.h
@@ -46,7 +46,7 @@ class KisToolLine : public KisToolPaint {
     KisToolLine();
     virtual ~KisToolLine();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
     virtual TQ_UINT32 priority() { return 1; }
     virtual void update(KisCanvasSubject *subject);
@@ -84,7 +84,7 @@ public:
     KisToolLineFactory() : super() {};
     virtual ~KisToolLineFactory(){};
     
-    virtual KisTool * createTool(KActionCollection * ac) { 
+    virtual KisTool * createTool(TDEActionCollection * ac) { 
         KisTool * t =  new KisToolLine(); 
         TQ_CHECK_PTR(t);
         t->setup(ac); 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cc b/chalk/plugins/tools/defaulttools/kis_tool_move.cc
index 7c8733c9..d7a2bbb6 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_move.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_move.cc
@@ -95,12 +95,12 @@ void KisToolMove::buttonRelease(KisButtonReleaseEvent *e)
     }
 }
 
-void KisToolMove::setup(KActionCollection *collection)
+void KisToolMove::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"),
+        m_action = new TDERadioAction(i18n("&Move"),
                         "tool_move",
                         TQt::SHIFT+TQt::Key_V,
                         this,
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.h b/chalk/plugins/tools/defaulttools/kis_tool_move.h
index 0b27b10a..59cf735d 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_move.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_move.h
@@ -43,7 +43,7 @@ public:
     virtual void update(KisCanvasSubject *subject);
 
 public:
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_TRANSFORM; }
     virtual TQ_UINT32 priority() { return 2; }
 
@@ -74,7 +74,7 @@ public:
     KisToolMoveFactory() : super() {};
     virtual ~KisToolMoveFactory(){};
     
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolMove(); 
         TQ_CHECK_PTR(t);
         t->setup(ac); 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc
index f7a92dcb..287ba2f4 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc
@@ -80,12 +80,12 @@ void KisToolPan::buttonRelease(KisButtonReleaseEvent *e)
     }
 }
 
-void KisToolPan::setup(KActionCollection *collection)
+void KisToolPan::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("&Pan"), "tool_pan", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name());
+        m_action = new TDERadioAction(i18n("&Pan"), "tool_pan", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name());
         m_action->setToolTip(i18n("Pan"));
         m_action->setExclusiveGroup("tools");
         m_ownAction = true;
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.h b/chalk/plugins/tools/defaulttools/kis_tool_pan.h
index fa052292..e6bbc91e 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_pan.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.h
@@ -40,7 +40,7 @@ public:
 
     virtual void update(KisCanvasSubject *subject);
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_VIEW; }
     virtual TQ_UINT32 priority() { return 1; }
 
@@ -66,7 +66,7 @@ public:
     KisToolPanFactory() : super() {};
     virtual ~KisToolPanFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolPan();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc
index b8387d78..abfd1362 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc
@@ -166,12 +166,12 @@ void KisToolRectangle::draw(const KisPoint& start, const KisPoint& end )
     p.end ();
 }
 
-void KisToolRectangle::setup(KActionCollection *collection)
+void KisToolRectangle::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("&Rectangle"),
+        m_action = new TDERadioAction(i18n("&Rectangle"),
                         "tool_rectangle",
                         TQt::Key_F6,
                         this,
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.h b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.h
index 43c83e65..dc56f9e2 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.h
@@ -54,7 +54,7 @@ public:
         // KisToolPaint interface
         //
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
     virtual TQ_UINT32 priority() { return 2; }
     virtual void buttonPress(KisButtonPressEvent *event);
@@ -82,7 +82,7 @@ public:
     KisToolRectangleFactory() : super() {};
     virtual ~KisToolRectangleFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolRectangle();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
index 392fa212..02626efe 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
@@ -155,7 +155,7 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e)
 }
 
 void KisToolText::setFont() {
-    KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ );
+    TDEFontDialog::getFont( m_font, false/*, TQWidget* parent! */ );
     m_lbFontName->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize()));
 }
 
@@ -177,12 +177,12 @@ TQWidget* KisToolText::createOptionWidget(TQWidget* parent)
     return widget;
 }
 
-void KisToolText::setup(KActionCollection *collection)
+void KisToolText::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("T&ext"),
+        m_action = new TDERadioAction(i18n("T&ext"),
                         "tool_text",
                         TQt::SHIFT+TQt::Key_T,
                         this,
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.h b/chalk/plugins/tools/defaulttools/kis_tool_text.h
index 5e49cbd3..9acd2465 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.h
@@ -41,7 +41,7 @@ public:
     virtual ~KisToolText();
 
     virtual void update(KisCanvasSubject *subject);
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_FILL; }
     virtual TQ_UINT32 priority() { return 2; }
     virtual void buttonPress(KisButtonPressEvent*);
@@ -68,7 +68,7 @@ public:
     KisToolTextFactory() : super() {};
     virtual ~KisToolTextFactory(){};
     
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolText(); 
         TQ_CHECK_PTR(t);
         t->setup(ac); 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
index eda09f6e..fda422c5 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
@@ -176,12 +176,12 @@ void KisToolZoom::paintOutline(KisCanvasPainter& gc, const TQRect&)
     }
 }
 
-void KisToolZoom::setup(KActionCollection *collection)
+void KisToolZoom::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("&Zoom"), "tool_zoom", TQt::Key_Z, this, TQT_SLOT(activate()), collection, name());
+        m_action = new TDERadioAction(i18n("&Zoom"), "tool_zoom", TQt::Key_Z, this, TQT_SLOT(activate()), collection, name());
         m_action->setToolTip(i18n("Zoom"));
         m_action->setExclusiveGroup("tools");
         m_ownAction = true;
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.h b/chalk/plugins/tools/defaulttools/kis_tool_zoom.h
index 7ad9c510..ca084ca3 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.h
@@ -43,7 +43,7 @@ public:
     virtual void update(KisCanvasSubject *subject);
 
 public:
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_VIEW; }
     virtual TQ_UINT32 priority() { return 2; }
 
@@ -85,7 +85,7 @@ public:
     KisToolZoomFactory() : super() {};
     virtual ~KisToolZoomFactory(){};
     
-    virtual KisTool * createTool(KActionCollection * ac) { 
+    virtual KisTool * createTool(TDEActionCollection * ac) { 
         KisTool * t = new KisToolZoom(); 
         TQ_CHECK_PTR(t);
         t->setup(ac); 
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);
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
index ec763b1a..ff5d98a7 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
@@ -719,12 +719,12 @@ TQWidget* KisToolCrop::optionWidget()
     return m_optWidget;
 }
 
-void KisToolCrop::setup(KActionCollection *collection)
+void KisToolCrop::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("&Crop"),
+        m_action = new TDERadioAction(i18n("&Crop"),
                                     "tool_crop",
                                     0,
                                     this,
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.h b/chalk/plugins/tools/tool_crop/kis_tool_crop.h
index 08b64f1d..3bca3442 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.h
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.h
@@ -53,7 +53,7 @@ public:
     virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_TRANSFORM; }
     virtual TQ_UINT32 priority() { return 1; }
     virtual void paint(KisCanvasPainter& gc);
@@ -134,7 +134,7 @@ public:
     KisToolCropFactory() : super() {};
     virtual ~KisToolCropFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t = new KisToolCrop();
         TQ_CHECK_PTR(t);
         t->setup(ac);
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);
diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
index 5dd75d4b..3364bfce 100644
--- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
@@ -60,12 +60,12 @@ KisToolFilter::~KisToolFilter()
 {
 }
 
-void KisToolFilter::setup(KActionCollection *collection)
+void KisToolFilter::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("&Filter Brush"),
+        m_action = new TDERadioAction(i18n("&Filter Brush"),
                         "tool_filter", 0, this,
                         TQT_SLOT(activate()), collection,
                         name());
diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.h b/chalk/plugins/tools/tool_filter/kis_tool_filter.h
index 67144b6b..e1ce4ba1 100644
--- a/chalk/plugins/tools/tool_filter/kis_tool_filter.h
+++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.h
@@ -43,7 +43,7 @@ public:
     KisToolFilter();
     virtual ~KisToolFilter();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_FREEHAND; }
     virtual TQ_UINT32 priority() { return 1; }
     virtual TQWidget* createOptionWidget(TQWidget* parent);
@@ -68,7 +68,7 @@ public:
     KisToolFilterFactory() : super() {};
     virtual ~KisToolFilterFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolFilter();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
index 623cb848..97660392 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
@@ -465,12 +465,12 @@ void KisToolPerspectiveGrid::drawGrid()
 }
 
 
-void KisToolPerspectiveGrid::setup(KActionCollection *collection)
+void KisToolPerspectiveGrid::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("&Perspective Grid"),
+        m_action = new TDERadioAction(i18n("&Perspective Grid"),
                                     "tool_perspectivegrid" ,
                         0,
                         this,
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h
index b10fc308..bd250637 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h
@@ -49,7 +49,7 @@ public:
         // KisToolPaint interface
         //
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual TQ_UINT32 priority() { return 3; }
     virtual enumToolType toolType() { return TOOL_VIEW; }
     virtual void buttonPress(KisButtonPressEvent *event);
@@ -97,7 +97,7 @@ public:
     KisToolPerspectiveGridFactory() : super() {};
     virtual ~KisToolPerspectiveGridFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolPerspectiveGrid();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
index 16a2ad54..ddd70364 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
@@ -720,12 +720,12 @@ TQWidget* KisToolPerspectiveTransform::optionWidget()
     return 0;
 }
 
-void KisToolPerspectiveTransform::setup(KActionCollection *collection)
+void KisToolPerspectiveTransform::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("&Perspective Transform"),
+        m_action = new TDERadioAction(i18n("&Perspective Transform"),
                         "tool_perspectivetransform",
                         0,
                         this,
diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h
index 7f278955..0f0d3e7d 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h
@@ -56,7 +56,7 @@ public:
     virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_TRANSFORM; }
     virtual TQ_UINT32 priority() { return 4; }
     virtual void paint(KisCanvasPainter& gc);
@@ -117,7 +117,7 @@ public:
     KisToolPerspectiveTransformFactory() : super() {};
     virtual ~KisToolPerspectiveTransformFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t = new KisToolPerspectiveTransform();
         TQ_CHECK_PTR(t);
         t->setup(ac); return t;
diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc
index 56eeb5ab..1cf41f9a 100644
--- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc
+++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc
@@ -216,14 +216,14 @@ void KisToolPolygon::draw(KisCanvasPainter& gc)
 
 
 
-void KisToolPolygon::setup(KActionCollection *collection)
+void KisToolPolygon::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("&Polygon"),
+        TDEShortcut shortcut(TQt::Key_Plus);
+        shortcut.append(TDEShortcut(TQt::Key_F9));
+        m_action = new TDERadioAction(i18n("&Polygon"),
                         "tool_polygon",
                         shortcut,
                         this,
diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.h b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.h
index 30b13373..dcbf5c37 100644
--- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.h
+++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.h
@@ -51,7 +51,7 @@ public:
     // KisToolPaint interface
     //
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
     virtual TQ_UINT32 priority() { return 4; }
     virtual void buttonPress(KisButtonPressEvent *event);
@@ -89,7 +89,7 @@ public:
     KisToolPolygonFactory() : super() {};
     virtual ~KisToolPolygonFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolPolygon();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc
index 405b7aa1..6eb7817d 100644
--- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc
+++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc
@@ -231,14 +231,14 @@ void KisToolPolyline::draw(KisCanvasPainter& gc)
     }
 }
 
-void KisToolPolyline::setup(KActionCollection *collection)
+void KisToolPolyline::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("&Polyline"),
+        TDEShortcut shortcut(TQt::Key_Plus);
+        shortcut.append(TDEShortcut(TQt::Key_F9));
+        m_action = new TDERadioAction(i18n("&Polyline"),
                         "polyline",
                         shortcut,
                         this,
diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.h b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.h
index 1cfd56c2..f8522167 100644
--- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.h
+++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.h
@@ -54,7 +54,7 @@ public:
     // KisToolPaint interface
     //
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
     virtual TQ_UINT32 priority() { return 5; }
 
@@ -96,7 +96,7 @@ public:
     KisToolPolylineFactory() : super() {};
     virtual ~KisToolPolylineFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolPolyline();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
index 9eb795ba..4827af08 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
@@ -197,12 +197,12 @@ void KisToolSelectSimilar::setPickerCursor(enumSelectionMode action)
     }
 }
 
-void KisToolSelectSimilar::setup(KActionCollection *collection)
+void KisToolSelectSimilar::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("&Similar Selection"), "tool_similar_selection", "Ctrl+E", this, TQT_SLOT(activate()), collection, name());
+        m_action = new TDERadioAction(i18n("&Similar Selection"), "tool_similar_selection", "Ctrl+E", this, TQT_SLOT(activate()), collection, name());
         TQ_CHECK_PTR(m_action);
         m_action->setToolTip(i18n("Select similar colors"));
         m_action->setExclusiveGroup("tools");
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h
index b76f4ef4..ad61b7da 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h
@@ -48,7 +48,7 @@ public:
     virtual ~KisToolSelectSimilar();
 
     virtual void update(KisCanvasSubject *subject);
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual TQ_UINT32 priority() { return 8; }
     virtual enumToolType toolType() { return TOOL_SELECT; }
 
@@ -88,7 +88,7 @@ public:
     KisToolSelectSimilarFactory() : super() {};
     virtual ~KisToolSelectSimilarFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolSelectSimilar();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc
index 7405de7d..8ba6a172 100644
--- a/chalk/plugins/tools/tool_star/kis_tool_star.cc
+++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc
@@ -173,14 +173,14 @@ void KisToolStar::draw(const KisPoint& start, const KisPoint& end )
     p.end ();
 }
 
-void KisToolStar::setup(KActionCollection *collection)
+void KisToolStar::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("&Star"),
+        TDEShortcut shortcut(TQt::Key_Plus);
+        shortcut.append(TDEShortcut(TQt::Key_F9));
+        m_action = new TDERadioAction(i18n("&Star"),
                                     "tool_star",
                                     shortcut,
                                     this,
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.h b/chalk/plugins/tools/tool_star/kis_tool_star.h
index dd97f027..203785c9 100644
--- a/chalk/plugins/tools/tool_star/kis_tool_star.h
+++ b/chalk/plugins/tools/tool_star/kis_tool_star.h
@@ -52,7 +52,7 @@ public:
         // KisToolPaint interface
         //
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
     virtual TQ_UINT32 priority() { return 6; }	
     virtual void buttonPress(KisButtonPressEvent *event);
@@ -88,7 +88,7 @@ public:
     KisToolStarFactory() : super() {};
     virtual ~KisToolStarFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolStar();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
index 51dff9a5..bfad9c6b 100644
--- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
@@ -894,12 +894,12 @@ TQWidget* KisToolTransform::optionWidget()
     return m_optWidget;
 }
 
-void KisToolTransform::setup(KActionCollection *collection)
+void KisToolTransform::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("&Transform"),
+        m_action = new TDERadioAction(i18n("&Transform"),
                         "tool_transform",
                         0,
                         this,
diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.h b/chalk/plugins/tools/tool_transform/kis_tool_transform.h
index ba5f493b..e7a053ae 100644
--- a/chalk/plugins/tools/tool_transform/kis_tool_transform.h
+++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.h
@@ -51,7 +51,7 @@ public:
     virtual TQWidget* createOptionWidget(TQWidget* parent);
     virtual TQWidget* optionWidget();
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_TRANSFORM; }
     virtual TQ_UINT32 priority() { return 3; }
     virtual void paint(KisCanvasPainter& gc);
@@ -141,7 +141,7 @@ public:
     KisToolTransformFactory() : super() {};
     virtual ~KisToolTransformFactory(){};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t = new KisToolTransform();
         TQ_CHECK_PTR(t);
         t->setup(ac); return t;