Rename a number of classes to enhance compatibility with KDE4

24 files changed, 64 insertions, 64 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);