Rename a number of classes to enhance compatibility with KDE4

34 files changed, 234 insertions, 234 deletions

diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc
index b75de805..2d0dd856 100644
--- a/chalk/ui/kis_controlframe.cc
+++ b/chalk/ui/kis_controlframe.cc
@@ -79,9 +79,9 @@ void KisPopupFrame::keyPressEvent(TQKeyEvent * e)
 }
 
 
-KisControlFrame::KisControlFrame( KMainWindow * /*window*/, KisView * view, const char* name )
+KisControlFrame::KisControlFrame( TDEMainWindow * /*window*/, KisView * view, const char* name )
     : TQObject(view, name)
-    //: KToolBar ( window, TQt::DockTop, false, name, true, true )
+    //: TDEToolBar ( window, TQt::DockTop, false, name, true, true )
     , m_view(view)
     , m_brushWidget(0)
     , m_patternWidget(0)
@@ -102,7 +102,7 @@ KisControlFrame::KisControlFrame( KMainWindow * /*window*/, KisView * view, cons
     m_brushWidget = new KisIconWidget(view, "brushes");
     m_brushWidget->setTextLabel( i18n("Brush Shapes") );
     // XXX: An action without a slot -- that's silly, what kind of action could we use here?
-    KAction * action = new KWidgetAction(m_brushWidget,
+    TDEAction * action = new KWidgetAction(m_brushWidget,
                                          i18n("&Brush"),
                                          0,
                                          TQT_TQOBJECT(view),
diff --git a/chalk/ui/kis_controlframe.h b/chalk/ui/kis_controlframe.h
index f5217b27..d052fc77 100644
--- a/chalk/ui/kis_controlframe.h
+++ b/chalk/ui/kis_controlframe.h
@@ -31,7 +31,7 @@
 class TQWidget;
 class TQTabWidget;
 
-class KToolBar;
+class TDEToolBar;
 
 class KoIconItem;
 class KisIconWidget;
@@ -73,13 +73,13 @@ private:
  *   Control Frame - status display with access to
  *   color selector, brushes, patterns, and preview
  */
-class KisControlFrame : public TQObject  //: public KToolBar
+class KisControlFrame : public TQObject  //: public TDEToolBar
 {
     Q_OBJECT
   
 
 public:
-    KisControlFrame(KMainWindow * window, KisView * view, const char *name = 0 );
+    KisControlFrame(TDEMainWindow * window, KisView * view, const char *name = 0 );
     virtual ~KisControlFrame() {};
 
 public slots:
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc
index 713427e2..4428b0f4 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cc
@@ -77,7 +77,7 @@ KisFilterManager::~KisFilterManager()
     //delete m_filterMapper;
 }
 
-void KisFilterManager::setup(KActionCollection * ac)
+void KisFilterManager::setup(TDEActionCollection * ac)
 {
     KisFilter * f = 0;
     int i = 0;
@@ -85,8 +85,8 @@ void KisFilterManager::setup(KActionCollection * ac)
     // Only create the submenu's we've actually got filters for.
     // XXX: Make this list extensible after 1.5
 
-    KActionMenu * other = 0;
-    KActionMenu * am = 0;
+    TDEActionMenu * other = 0;
+    TDEActionMenu * am = 0;
 
     m_filterList = KisFilterRegistry::instance()->listKeys();
 
@@ -96,63 +96,63 @@ void KisFilterManager::setup(KActionCollection * ac)
 
         TQString s = f->menuCategory();
         if (s == "adjust" && !m_filterActionMenus.find("adjust")) {
-            am = new KActionMenu(i18n("Adjust"), ac, "adjust_filters");
+            am = new TDEActionMenu(i18n("Adjust"), ac, "adjust_filters");
             m_filterActionMenus.insert("adjust", am);
         }
 
         else if (s == "artistic" && !m_filterActionMenus.find("artistic")) {
-            am = new KActionMenu(i18n("Artistic"), ac, "artistic_filters");
+            am = new TDEActionMenu(i18n("Artistic"), ac, "artistic_filters");
             m_filterActionMenus.insert("artistic", am);
         }
 
         else if (s == "blur" && !m_filterActionMenus.find("blur")) {
-            am = new KActionMenu(i18n("Blur"), ac, "blur_filters");
+            am = new TDEActionMenu(i18n("Blur"), ac, "blur_filters");
             m_filterActionMenus.insert("blur", am);
         }
 
         else if (s == "colors" && !m_filterActionMenus.find("colors")) {
-            am = new KActionMenu(i18n("Colors"), ac, "color_filters");
+            am = new TDEActionMenu(i18n("Colors"), ac, "color_filters");
             m_filterActionMenus.insert("colors", am);
         }
 
         else if (s == "decor" && !m_filterActionMenus.find("decor")) {
-            am = new KActionMenu(i18n("Decor"), ac, "decor_filters");
+            am = new TDEActionMenu(i18n("Decor"), ac, "decor_filters");
             m_filterActionMenus.insert("decor", am);
         }
 
         else if (s == "edge" && !m_filterActionMenus.find("edge")) {
-            am = new KActionMenu(i18n("Edge Detection"), ac, "edge_filters");
+            am = new TDEActionMenu(i18n("Edge Detection"), ac, "edge_filters");
             m_filterActionMenus.insert("edge", am);
         }
 
         else if (s == "emboss" && !m_filterActionMenus.find("emboss")) {
-            am = new KActionMenu(i18n("Emboss"), ac, "emboss_filters");
+            am = new TDEActionMenu(i18n("Emboss"), ac, "emboss_filters");
             m_filterActionMenus.insert("emboss", am);
         }
 
         else if (s == "enhance" && !m_filterActionMenus.find("enhance")) {
-            am = new KActionMenu(i18n("Enhance"), ac, "enhance_filters");
+            am = new TDEActionMenu(i18n("Enhance"), ac, "enhance_filters");
             m_filterActionMenus.insert("enhance", am);
         }
 
         else if (s == "map" && !m_filterActionMenus.find("map")) {
-            am = new KActionMenu(i18n("Map"), ac, "map_filters");
+            am = new TDEActionMenu(i18n("Map"), ac, "map_filters");
             m_filterActionMenus.insert("map", am);
         }
 
         else if (s == "nonphotorealistic" && !m_filterActionMenus.find("nonphotorealistic")) {
-            am = new KActionMenu(i18n("Non-photorealistic"), ac, "nonphotorealistic_filters");
+            am = new TDEActionMenu(i18n("Non-photorealistic"), ac, "nonphotorealistic_filters");
             m_filterActionMenus.insert("nonphotorealistic", am);
         }
 
         else if (s == "other" && !m_filterActionMenus.find("other")) {
-            other = new KActionMenu(i18n("Other"), ac, "misc_filters");
+            other = new TDEActionMenu(i18n("Other"), ac, "misc_filters");
             m_filterActionMenus.insert("other", other);
         }
 
     }
 
-    m_reapplyAction = new KAction(i18n("Apply Filter Again"),
+    m_reapplyAction = new TDEAction(i18n("Apply Filter Again"),
                 "Ctrl+Shift+F",
                 this, TQT_SLOT(slotApply()),
                 ac, "filter_apply_again");
@@ -167,17 +167,17 @@ void KisFilterManager::setup(KActionCollection * ac)
         if (!f) break;
 
         // Create action
-        KAction * a = new KAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac,
+        TDEAction * a = new TDEAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac,
                                   TQString("chalk_filter_%1").arg((*it) . id()).ascii());
 
         // Add action to the right submenu
-        KActionMenu * m = m_filterActionMenus.find( f->menuCategory() );
+        TDEActionMenu * m = m_filterActionMenus.find( f->menuCategory() );
         if (m) {
             m->insert(a);
         }
         else {
             if (!other) {
-                other = new KActionMenu(i18n("Other"), ac, "misc_filters");
+                other = new TDEActionMenu(i18n("Other"), ac, "misc_filters");
                 m_filterActionMenus.insert("other", am);
             }
             other->insert(a);
@@ -214,7 +214,7 @@ void KisFilterManager::updateGUI()
     else
         m_reapplyAction->setText(i18n("Apply Filter Again"));
 
-    KAction * a;
+    TDEAction * a;
     int i = 0;
     for (a = m_filterActions.first(); a; a = m_filterActions.next() , i++) {
         KisFilter* filter = KisFilterRegistry::instance()->get(m_filterList[i]);
diff --git a/chalk/ui/kis_filter_manager.h b/chalk/ui/kis_filter_manager.h
index bfb414cc..602ebd8a 100644
--- a/chalk/ui/kis_filter_manager.h
+++ b/chalk/ui/kis_filter_manager.h
@@ -29,13 +29,13 @@
 
 #include <koffice_export.h>
 
-class KAction;
+class TDEAction;
 class KisView;
 class KisDoc;
 class KisFilter;
 class KisFilterConfiguration;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 class KisPreviewDialog;
 
 /**
@@ -51,7 +51,7 @@ public:
     KisFilterManager(KisView * parent, KisDoc * doc);
     ~KisFilterManager();
 
-    void setup(KActionCollection * ac);
+    void setup(TDEActionCollection * ac);
     void updateGUI();
 
 
@@ -69,9 +69,9 @@ private:
     KisView * m_view;
     KisDoc * m_doc;
 
-    KAction * m_reapplyAction;
+    TDEAction * m_reapplyAction;
 
-    TQPtrList<KAction> m_filterActions;
+    TQPtrList<TDEAction> m_filterActions;
     
     KisFilterConfiguration * m_lastFilterConfig;
     KisFilter * m_lastFilter;
@@ -81,7 +81,7 @@ private:
     KisIDList m_filterList; // Map the actions in the signalmapper to the filters
     TQSignalMapper * m_filterMapper;
     
-    TQDict<KActionMenu> m_filterActionMenus;
+    TQDict<TDEActionMenu> m_filterActionMenus;
 };
 
 #endif
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc
index a8fdf71e..531b320e 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cc
@@ -38,7 +38,7 @@ KisGradientSliderWidget::KisGradientSliderWidget(TQWidget *parent, const char* n
 {
     setMinimumHeight(30);
 
-    m_segmentMenu = new KPopupMenu();
+    m_segmentMenu = new TDEPopupMenu();
     m_segmentMenu->insertItem(i18n("Split Segment"), SPLIT_SEGMENT);
     m_segmentMenu->insertItem(i18n("Duplicate Segment"), DUPLICATE_SEGMENT);
     m_segmentMenu->insertItem(i18n("Mirror Segment"), MIRROR_SEGMENT);
diff --git a/chalk/ui/kis_gradient_slider_widget.h b/chalk/ui/kis_gradient_slider_widget.h
index f1b99ef0..e3b22ab6 100644
--- a/chalk/ui/kis_gradient_slider_widget.h
+++ b/chalk/ui/kis_gradient_slider_widget.h
@@ -23,7 +23,7 @@
 #include <kpixmapio.h>
 #include <tqwidget.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 class KisAutogradientResource;
 class KisGradientSegment;
 
@@ -73,7 +73,7 @@ private:
     KisAutogradientResource* m_autogradientResource;
     KisGradientSegment* m_currentSegment;
     KisGradientSegment* m_selectedSegment;
-    KPopupMenu* m_segmentMenu;
+    TDEPopupMenu* m_segmentMenu;
     int m_drag;
 };
 
diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp
index 5eda1cf9..83969e78 100644
--- a/chalk/ui/kis_grid_manager.cpp
+++ b/chalk/ui/kis_grid_manager.cpp
@@ -51,19 +51,19 @@ KisGridManager::~KisGridManager()
 
 }
 
-void KisGridManager::setup(KActionCollection * collection)
+void KisGridManager::setup(TDEActionCollection * collection)
 {
-    m_toggleGrid = new KToggleAction(i18n("Show Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_grid");
+    m_toggleGrid = new TDEToggleAction(i18n("Show Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_grid");
     m_toggleGrid->setCheckedState(KGuiItem(i18n("Hide Grid")));
     m_toggleGrid->setChecked(false);
 
     // Fast grid config
-    m_gridFastConfig1x1 = new KAction(i18n("1x1"), 0, "", this, TQT_SLOT(fastConfig1x1()), collection, "view_fast_grid_1x1");
-    m_gridFastConfig2x2 = new KAction(i18n("2x2"), 0, "", this, TQT_SLOT(fastConfig2x2()), collection, "view_fast_grid_2x2");
-    m_gridFastConfig5x5 = new KAction(i18n("5x5"), 0, "", this, TQT_SLOT(fastConfig5x5()), collection, "view_fast_grid_5x5");
-    m_gridFastConfig10x10 = new KAction(i18n("10x10"), 0, "", this, TQT_SLOT(fastConfig10x10()), collection, "view_fast_grid_10x10");
-    m_gridFastConfig20x20 = new KAction(i18n("20x20"), 0, "", this, TQT_SLOT(fastConfig20x20()), collection, "view_fast_grid_20x20");
-    m_gridFastConfig40x40 = new KAction(i18n("40x40"), 0, "", this, TQT_SLOT(fastConfig40x40()), collection, "view_fast_grid_40x40");
+    m_gridFastConfig1x1 = new TDEAction(i18n("1x1"), 0, "", this, TQT_SLOT(fastConfig1x1()), collection, "view_fast_grid_1x1");
+    m_gridFastConfig2x2 = new TDEAction(i18n("2x2"), 0, "", this, TQT_SLOT(fastConfig2x2()), collection, "view_fast_grid_2x2");
+    m_gridFastConfig5x5 = new TDEAction(i18n("5x5"), 0, "", this, TQT_SLOT(fastConfig5x5()), collection, "view_fast_grid_5x5");
+    m_gridFastConfig10x10 = new TDEAction(i18n("10x10"), 0, "", this, TQT_SLOT(fastConfig10x10()), collection, "view_fast_grid_10x10");
+    m_gridFastConfig20x20 = new TDEAction(i18n("20x20"), 0, "", this, TQT_SLOT(fastConfig20x20()), collection, "view_fast_grid_20x20");
+    m_gridFastConfig40x40 = new TDEAction(i18n("40x40"), 0, "", this, TQT_SLOT(fastConfig40x40()), collection, "view_fast_grid_40x40");
 }
 
 void KisGridManager::updateGUI()
diff --git a/chalk/ui/kis_grid_manager.h b/chalk/ui/kis_grid_manager.h
index dcbc81a3..2493d687 100644
--- a/chalk/ui/kis_grid_manager.h
+++ b/chalk/ui/kis_grid_manager.h
@@ -26,9 +26,9 @@
 #include "kis_types.h"
 
 class KisView;
-class KActionCollection;
-class KToggleAction;
-class KAction;
+class TDEActionCollection;
+class TDEToggleAction;
+class TDEAction;
 
 class KisGridManager : public TQObject
 {
@@ -38,7 +38,7 @@ class KisGridManager : public TQObject
         KisGridManager(KisView * parent);
         ~KisGridManager();
     public:
-        void setup(KActionCollection * collection);
+        void setup(TDEActionCollection * collection);
         void drawGrid(TQRect wr, TQPainter *p, bool openGL = false);
     public slots:
         void updateGUI();
@@ -52,14 +52,14 @@ class KisGridManager : public TQObject
         void fastConfig40x40();
     private:
         KisView* m_view;
-        KToggleAction* m_toggleGrid;
-        KAction* m_gridConfig;
-        KAction* m_gridFastConfig1x1;
-        KAction* m_gridFastConfig2x2;
-        KAction* m_gridFastConfig5x5;
-        KAction* m_gridFastConfig10x10;
-        KAction* m_gridFastConfig20x20;
-        KAction* m_gridFastConfig40x40;
+        TDEToggleAction* m_toggleGrid;
+        TDEAction* m_gridConfig;
+        TDEAction* m_gridFastConfig1x1;
+        TDEAction* m_gridFastConfig2x2;
+        TDEAction* m_gridFastConfig5x5;
+        TDEAction* m_gridFastConfig10x10;
+        TDEAction* m_gridFastConfig20x20;
+        TDEAction* m_gridFastConfig40x40;
 };
 
 #endif
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index 03b8e2af..34a5e411 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -117,7 +117,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char
     connect(list(), TQT_SIGNAL(requestLayerProperties(LayerItem*)),
                     TQT_SLOT(slotRequestLayerProperties(LayerItem*)));
 
-    m_newLayerMenu = new KPopupMenu(this);
+    m_newLayerMenu = new TDEPopupMenu(this);
     m_lst->bnAdd->setPopup(m_newLayerMenu);
     m_lst->bnAdd->setPopupDelay(1);
     m_newLayerMenu->insertItem( SmallIconSet( "filenew" ), i18n( "&New Layer..." ), PAINT_LAYER );
diff --git a/chalk/ui/kis_layerbox.h b/chalk/ui/kis_layerbox.h
index eb721946..9d05601f 100644
--- a/chalk/ui/kis_layerbox.h
+++ b/chalk/ui/kis_layerbox.h
@@ -34,7 +34,7 @@ class TQButton;
 class TQPainter;
 class TQWidget;
 class KIconLoader;
-class KPopupMenu;
+class TDEPopupMenu;
 class KoDocumentEntry;
 class KisCompositeOp;
 class KisLayerList;
@@ -110,7 +110,7 @@ private:
     KisLayerList* list() const;
     void markModified(KisLayer *layer);
 
-    KPopupMenu *m_newLayerMenu;
+    TDEPopupMenu *m_newLayerMenu;
     KoPartSelectAction *m_partLayerAction;
     KisImageSP m_image;
     TQValueList<int> m_modified;
diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc
index 24ae2738..3f1ff018 100644
--- a/chalk/ui/kis_layerlist.cc
+++ b/chalk/ui/kis_layerlist.cc
@@ -53,7 +53,7 @@ void KisLayerList::constructMenu( LayerItem *layer )
 
     if( layer )
     {
-        static KPopupMenu submenu;
+        static TDEPopupMenu submenu;
         submenu.clear();
         submenu.insertItem( SmallIconSet( "file" ), i18n( "&Layer..." ), MenuItems::NewLayer );
         submenu.insertItem( SmallIconSet( "folder" ), i18n( "&Group Layer..." ), MenuItems::NewFolder );
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index 8997af11..9751e246 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -48,7 +48,7 @@ KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * nam
       m_canvasController(view->getCanvasController())
 {
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90)
-    KAcceleratorManager::setNoAccel(this);
+    TDEAcceleratorManager::setNoAccel(this);
 #endif
 
     Q_ASSERT(m_canvasController != 0);
diff --git a/chalk/ui/kis_palette_view.h b/chalk/ui/kis_palette_view.h
index 10e1fcd3..1f8ddb0d 100644
--- a/chalk/ui/kis_palette_view.h
+++ b/chalk/ui/kis_palette_view.h
@@ -23,7 +23,7 @@
 #include <tqscrollview.h>
 #include "kis_palette.h"
 
-class KListBox;
+class TDEListBox;
 class KisPalette;
 class KColorCells;
 class KisResource;
diff --git a/chalk/ui/kis_palette_widget.h b/chalk/ui/kis_palette_widget.h
index 897a55ee..06530fbd 100644
--- a/chalk/ui/kis_palette_widget.h
+++ b/chalk/ui/kis_palette_widget.h
@@ -24,7 +24,7 @@
 
 class TQComboBox;
 class TQLineEdit;
-class KListBox;
+class TDEListBox;
 class KisPalette;
 class KisResource;
 class KisColor;
diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp
index 6c326a3c..174e1395 100644
--- a/chalk/ui/kis_perspective_grid_manager.cpp
+++ b/chalk/ui/kis_perspective_grid_manager.cpp
@@ -54,13 +54,13 @@ void KisPerspectiveGridManager::updateGUI()
     }
 }
 
-void KisPerspectiveGridManager::setup(KActionCollection * collection)
+void KisPerspectiveGridManager::setup(TDEActionCollection * collection)
 {
-    kdDebug() << "KisPerspectiveGridManager::setup(KActionCollection * collection)" << endl;
-    m_toggleGrid = new KToggleAction(i18n("Show Perspective Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_perspective_grid");
+    kdDebug() << "KisPerspectiveGridManager::setup(TDEActionCollection * collection)" << endl;
+    m_toggleGrid = new TDEToggleAction(i18n("Show Perspective Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_perspective_grid");
     m_toggleGrid->setCheckedState(KGuiItem(i18n("Hide Perspective Grid")));
     m_toggleGrid->setChecked(false);
-    m_gridClear = new KAction(i18n("Clear Perspective Grid"), 0, "", this, TQT_SLOT(clearPerspectiveGrid()), collection, "view_clear_perspective_grid");
+    m_gridClear = new TDEAction(i18n("Clear Perspective Grid"), 0, "", this, TQT_SLOT(clearPerspectiveGrid()), collection, "view_clear_perspective_grid");
 }
 
 void KisPerspectiveGridManager::setGridVisible(bool t)
diff --git a/chalk/ui/kis_perspective_grid_manager.h b/chalk/ui/kis_perspective_grid_manager.h
index acb38deb..db5147b7 100644
--- a/chalk/ui/kis_perspective_grid_manager.h
+++ b/chalk/ui/kis_perspective_grid_manager.h
@@ -23,9 +23,9 @@
 
 #include <tqobject.h>
 
-class KAction;
-class KActionCollection;
-class KToggleAction;
+class TDEAction;
+class TDEActionCollection;
+class TDEToggleAction;
 class KisView;
 
 class KisPerspectiveGridManager : public TQObject
@@ -35,7 +35,7 @@ class KisPerspectiveGridManager : public TQObject
     public:
         KisPerspectiveGridManager(KisView * parent);
         ~KisPerspectiveGridManager();
-        void setup(KActionCollection * collection);
+        void setup(TDEActionCollection * collection);
         void drawGrid(TQRect wr, TQPainter *p, bool openGL = false);
         void startEdition();
         void stopEdition();
@@ -48,8 +48,8 @@ class KisPerspectiveGridManager : public TQObject
     private:
         bool m_toggleEdition;
         KisView* m_view;
-        KToggleAction* m_toggleGrid;
-        KAction* m_gridClear;
+        TDEToggleAction* m_toggleGrid;
+        TDEAction* m_gridClear;
 };
 
 #endif
diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc
index 23abb2b9..718dbf02 100644
--- a/chalk/ui/kis_selection_manager.cc
+++ b/chalk/ui/kis_selection_manager.cc
@@ -97,7 +97,7 @@ KisSelectionManager::~KisSelectionManager()
 }
 
 
-void KisSelectionManager::setup(KActionCollection * collection)
+void KisSelectionManager::setup(TDEActionCollection * collection)
 {
     // XXX: setup shortcuts!
 
@@ -116,7 +116,7 @@ void KisSelectionManager::setup(KActionCollection * collection)
                 collection,
                 "paste");
 
-    m_pasteNew = new KAction(i18n("Paste into &New Image"),
+    m_pasteNew = new TDEAction(i18n("Paste into &New Image"),
                 0, 0,
                 this, TQT_SLOT(pasteNew()),
                 collection,
@@ -139,99 +139,99 @@ void KisSelectionManager::setup(KActionCollection * collection)
                 collection,
                 "clear");
 
-    m_reselect = new KAction(i18n("&Reselect"),
+    m_reselect = new TDEAction(i18n("&Reselect"),
                 0, "Ctrl+Shift+D",
                 this, TQT_SLOT(reselect()),
                 collection, "reselect");
 
-    m_invert = new KAction(i18n("&Invert"),
+    m_invert = new TDEAction(i18n("&Invert"),
                 0, "Ctrl+I",
                 this, TQT_SLOT(invert()),
                 collection, "invert");
 
 
-    m_toNewLayer = new KAction(i18n("Copy Selection to New Layer"),
+    m_toNewLayer = new TDEAction(i18n("Copy Selection to New Layer"),
                 0, "Ctrl+J",
                 this, TQT_SLOT(copySelectionToNewLayer()),
                 collection, "copy_selection_to_new_layer");
 
 
-    m_cutToNewLayer = new KAction(i18n("Cut Selection to New Layer"),
+    m_cutToNewLayer = new TDEAction(i18n("Cut Selection to New Layer"),
             0, "Ctrl+Shift+J",
             this, TQT_SLOT(cutToNewLayer()),
             collection, "cut_selection_to_new_layer");
 
-    m_feather = new KAction(i18n("Feather"),
+    m_feather = new TDEAction(i18n("Feather"),
                 0, "Ctrl+Alt+D",
                 this, TQT_SLOT(feather()),
                 collection, "feather");
 
-    m_fillForegroundColor = new KAction(i18n("Fill with Foreground Color"),
+    m_fillForegroundColor = new TDEAction(i18n("Fill with Foreground Color"),
                                              "Alt+backspace", this,
                                              TQT_SLOT(fillForegroundColor()),
                                              collection,
                                              "fill_selection_foreground_color");
-    m_fillBackgroundColor = new KAction(i18n("Fill with Background Color"),
+    m_fillBackgroundColor = new TDEAction(i18n("Fill with Background Color"),
                                              "backspace", this,
                                              TQT_SLOT(fillBackgroundColor()),
                                              collection,
                                              "fill_selection_background_color");
-    m_fillPattern = new KAction(i18n("Fill with Pattern"),
+    m_fillPattern = new TDEAction(i18n("Fill with Pattern"),
                                              0, this,
                                              TQT_SLOT(fillPattern()),
                                              collection,
                                              "fill_selection_pattern");
 
-    m_toggleDisplaySelection = new KToggleAction(i18n("Display Selection"), "Ctrl+h", this, TQT_SLOT(toggleDisplaySelection()), collection, "toggle_display_selection");
+    m_toggleDisplaySelection = new TDEToggleAction(i18n("Display Selection"), "Ctrl+h", this, TQT_SLOT(toggleDisplaySelection()), collection, "toggle_display_selection");
     m_toggleDisplaySelection->setCheckedState(KGuiItem(i18n("Hide Selection")));
     m_toggleDisplaySelection->setChecked(true);
 
     m_border =
-        new KAction(i18n("Border..."),
+        new TDEAction(i18n("Border..."),
                 0, 0,
                 this, TQT_SLOT(border()),
                 collection, "border");
     m_expand =
-        new KAction(i18n("Expand..."),
+        new TDEAction(i18n("Expand..."),
                 0, 0,
                 this, TQT_SLOT(expand()),
                 collection, "expand");
 
     m_smooth =
-        new KAction(i18n("Smooth..."),
+        new TDEAction(i18n("Smooth..."),
                 0, 0,
                 this, TQT_SLOT(smooth()),
                 collection, "smooth");
 
 
     m_contract =
-        new KAction(i18n("Contract..."),
+        new TDEAction(i18n("Contract..."),
                 0, 0,
                 this, TQT_SLOT(contract()),
                 collection, "contract");
     m_similar =
-        new KAction(i18n("Similar"),
+        new TDEAction(i18n("Similar"),
                 0, 0,
                 this, TQT_SLOT(similar()),
                 collection, "similar");
 
 
     m_transform
-        = new KAction(i18n("Transform..."),
+        = new TDEAction(i18n("Transform..."),
                   0, 0,
                   this, TQT_SLOT(transform()),
                   collection, "transform_selection");
 
 
 //     m_load
-//         = new KAction(i18n("Load..."),
+//         = new TDEAction(i18n("Load..."),
 //                   0, 0,
 //                   this, TQT_SLOT(load()),
 //                   collection, "load_selection");
 //
 //
 //     m_save
-//         = new KAction(i18n("Save As..."),
+//         = new TDEAction(i18n("Save As..."),
 //                   0, 0,
 //                   this, TQT_SLOT(save()),
 //                   collection, "save_selection");
@@ -246,7 +246,7 @@ void KisSelectionManager::clipboardDataChanged()
 }
 
 
-void KisSelectionManager::addSelectionAction(KAction * action)
+void KisSelectionManager::addSelectionAction(TDEAction * action)
 {
     m_pluginActions.append(action);
 }
@@ -310,7 +310,7 @@ void KisSelectionManager::updateGUI()
 //    m_save->setEnabled(enable);
 
 
-    KAction * a;
+    TDEAction * a;
     for (a = m_pluginActions.first(); a; a = m_pluginActions.next()) {
         a->setEnabled(img != 0);
     }
diff --git a/chalk/ui/kis_selection_manager.h b/chalk/ui/kis_selection_manager.h
index 435e186d..1bec7c34 100644
--- a/chalk/ui/kis_selection_manager.h
+++ b/chalk/ui/kis_selection_manager.h
@@ -24,7 +24,7 @@
 #include "kis_image.h"
 #include <koffice_export.h>
 
-class KAction;
+class TDEAction;
 class KisView;
 class KisDoc;
 class KisClipboard;
@@ -43,9 +43,9 @@ public:
     KisSelectionManager(KisView * parent, KisDoc * doc);
     virtual ~KisSelectionManager();
 
-    void setup(KActionCollection * collection);
+    void setup(TDEActionCollection * collection);
 
-    void addSelectionAction(KAction * action);
+    void addSelectionAction(TDEAction * action);
 
 public:
     /**
@@ -105,32 +105,32 @@ private:
 
     KisClipboard * m_clipboard;
 
-    KAction *m_copy;
-    KAction *m_cut;
-    KAction *m_paste;
-    KAction *m_pasteNew;
-    KAction *m_cutToNewLayer;
-    KAction *m_selectAll;
-    KAction *m_deselect;
-    KAction *m_clear;
-    KAction *m_reselect;
-    KAction *m_invert;
-    KAction *m_toNewLayer;
-    KAction *m_feather;
-    KAction *m_border;
-    KAction *m_expand;
-    KAction *m_smooth;
-    KAction *m_contract;
-    KAction *m_similar;
-    KAction *m_transform;
-    KAction *m_load;
-    KAction *m_save;
-    KAction *m_fillForegroundColor;
-    KAction *m_fillBackgroundColor;
-    KAction *m_fillPattern;
-    KToggleAction *m_toggleDisplaySelection;
-
-    TQPtrList<KAction> m_pluginActions;
+    TDEAction *m_copy;
+    TDEAction *m_cut;
+    TDEAction *m_paste;
+    TDEAction *m_pasteNew;
+    TDEAction *m_cutToNewLayer;
+    TDEAction *m_selectAll;
+    TDEAction *m_deselect;
+    TDEAction *m_clear;
+    TDEAction *m_reselect;
+    TDEAction *m_invert;
+    TDEAction *m_toNewLayer;
+    TDEAction *m_feather;
+    TDEAction *m_border;
+    TDEAction *m_expand;
+    TDEAction *m_smooth;
+    TDEAction *m_contract;
+    TDEAction *m_similar;
+    TDEAction *m_transform;
+    TDEAction *m_load;
+    TDEAction *m_save;
+    TDEAction *m_fillForegroundColor;
+    TDEAction *m_fillBackgroundColor;
+    TDEAction *m_fillPattern;
+    TDEToggleAction *m_toggleDisplaySelection;
+
+    TQPtrList<TDEAction> m_pluginActions;
 
 };
 
diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc
index b2ae9f36..db5e8c46 100644
--- a/chalk/ui/kis_text_brush.cc
+++ b/chalk/ui/kis_text_brush.cc
@@ -57,7 +57,7 @@ KisTextBrush::KisTextBrush(TQWidget *parent, const char* name, const TQString& c
 
 void KisTextBrush::getFont()
 {
-	KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ );
+	TDEFontDialog::getFont( m_font, false/*, TQWidget* parent! */ );
 	rebuildTextBrush();
 }
 
diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h
index cd9cc424..45f3fbd1 100644
--- a/chalk/ui/kis_tool.h
+++ b/chalk/ui/kis_tool.h
@@ -34,8 +34,8 @@ class TQEvent;
 class TQKeyEvent;
 class TQRect;
 class TQWidget;
-class KActionCollection;
-class KRadioAction;
+class TDEActionCollection;
+class TDERadioAction;
 class KDialog;
 class KisBrush;
 class KisGradient;
@@ -72,7 +72,7 @@ public:
     virtual void paint(KisCanvasPainter& gc, const TQRect& rc) = 0;
 
     /**
-     * This function is called after the creation of a tool to create the KAction corresponding
+     * This function is called after the creation of a tool to create the TDEAction corresponding
      * to the tool.
      *
      * The code should look like :
@@ -80,7 +80,7 @@ public:
      * 
      * @endcode
      */
-    virtual void setup(KActionCollection *collection) = 0;
+    virtual void setup(TDEActionCollection *collection) = 0;
 
     virtual void buttonPress(KisButtonPressEvent *e) = 0;
     virtual void move(KisMoveEvent *e) = 0;
@@ -100,7 +100,7 @@ public:
      * @return the current configuration widget.
      */
     virtual TQWidget* optionWidget();
-    KRadioAction *action() const { return m_action; }
+    TDERadioAction *action() const { return m_action; }
 
     /**
      * Return true if this tool wants auto canvas-scrolling to 
@@ -131,7 +131,7 @@ private:
     KisTool& operator=(const KisTool&);
 
 protected:
-    KRadioAction *m_action;
+    TDERadioAction *m_action;
     bool m_ownAction;
 
 private:
diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc
index bc478d4e..74311391 100644
--- a/chalk/ui/kis_tool_dummy.cc
+++ b/chalk/ui/kis_tool_dummy.cc
@@ -82,12 +82,12 @@ void KisToolDummy::buttonRelease(KisButtonReleaseEvent *e)
     }
 }
 
-void KisToolDummy::setup(KActionCollection *collection)
+void KisToolDummy::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("&Dummy"), "tool_dummy", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name());
+        m_action = new TDERadioAction(i18n("&Dummy"), "tool_dummy", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name());
         m_action->setExclusiveGroup("tools");
         m_ownAction = true;
     }
diff --git a/chalk/ui/kis_tool_dummy.h b/chalk/ui/kis_tool_dummy.h
index 378781d6..bf4e52ef 100644
--- a/chalk/ui/kis_tool_dummy.h
+++ b/chalk/ui/kis_tool_dummy.h
@@ -48,7 +48,7 @@ public:
 
     virtual void update(KisCanvasSubject *subject);
 
-    virtual void setup(KActionCollection *collection);
+    virtual void setup(TDEActionCollection *collection);
     virtual void buttonPress(KisButtonPressEvent *e);
     virtual void move(KisMoveEvent *e);
     virtual void buttonRelease(KisButtonReleaseEvent *e);
@@ -71,7 +71,7 @@ public:
     KisToolDummyFactory() : super() {};
     virtual ~KisToolDummyFactory() {};
 
-    virtual KisTool * createTool(KActionCollection * ac) {
+    virtual KisTool * createTool(TDEActionCollection * ac) {
         KisTool * t =  new KisToolDummy();
         TQ_CHECK_PTR(t);
         t->setup(ac);
diff --git a/chalk/ui/kis_tool_factory.h b/chalk/ui/kis_tool_factory.h
index 90240f0c..24cf5d72 100644
--- a/chalk/ui/kis_tool_factory.h
+++ b/chalk/ui/kis_tool_factory.h
@@ -32,7 +32,7 @@ public:
     KisToolFactory() {}
     virtual ~KisToolFactory() {};
 
-    virtual KisTool * createTool(KActionCollection * ac) = 0;
+    virtual KisTool * createTool(TDEActionCollection * ac) = 0;
     virtual KisID id() { return KisID("Abstract Tool", i18n("Abstract Tool")); }
 
 };
diff --git a/chalk/ui/kis_tool_manager.cc b/chalk/ui/kis_tool_manager.cc
index 458b54e2..04388058 100644
--- a/chalk/ui/kis_tool_manager.cc
+++ b/chalk/ui/kis_tool_manager.cc
@@ -50,7 +50,7 @@ KisToolManager::~KisToolManager()
     delete m_dummyTool;
 }
 
-void KisToolManager::setUp(KoToolBox * toolbox, KoPaletteManager * paletteManager, KActionCollection * actionCollection)
+void KisToolManager::setUp(KoToolBox * toolbox, KoPaletteManager * paletteManager, TDEActionCollection * actionCollection)
 {
     if (setup) {
         resetToolBox( toolbox );
@@ -241,7 +241,7 @@ void KisToolManager::setToolForInputDevice(KisInputDevice oldDevice, KisInputDev
         vKisTool& oldTools = (*vit).second;
         for (vKisTool::iterator it = oldTools.begin(); it != oldTools.end(); ++it) {
             KisTool *tool = *it;
-            KAction *toolAction = tool->action();
+            TDEAction *toolAction = tool->action();
             toolAction->disconnect(TQT_SIGNAL(activated()), tool, TQT_SLOT(activate()));
         }
     }
@@ -261,7 +261,7 @@ void KisToolManager::setToolForInputDevice(KisInputDevice oldDevice, KisInputDev
 
     for (vKisTool::iterator it = tools.begin(); it != tools.end(); ++it) {
         KisTool *tool = *it;
-        KAction *toolAction = tool->action();
+        TDEAction *toolAction = tool->action();
         connect(toolAction, TQT_SIGNAL(activated()), tool, TQT_SLOT(activate()));
     }
 }
diff --git a/chalk/ui/kis_tool_manager.h b/chalk/ui/kis_tool_manager.h
index e19d0b07..4b937881 100644
--- a/chalk/ui/kis_tool_manager.h
+++ b/chalk/ui/kis_tool_manager.h
@@ -52,7 +52,7 @@ public:
 
 public:
 
-    void setUp(KoToolBox * toolbox, KoPaletteManager * paletteManager, KActionCollection * collection);
+    void setUp(KoToolBox * toolbox, KoPaletteManager * paletteManager, TDEActionCollection * collection);
     
     // Called when the toolbox is deleted because the view was made inactive in favour of another view
     void youAintGotNoToolBox();
@@ -86,7 +86,7 @@ private:
     KisCanvasController * m_controller;
 
     KoPaletteManager * m_paletteManager;
-    KActionCollection * m_actionCollection;
+    TDEActionCollection * m_actionCollection;
 
     KoToolBox * m_toolBox;
 
diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc
index d96f8ef4..32e57e12 100644
--- a/chalk/ui/kis_tool_registry.cc
+++ b/chalk/ui/kis_tool_registry.cc
@@ -78,7 +78,7 @@ KisToolRegistry* KisToolRegistry::instance()
 
 
 
-vKisTool KisToolRegistry::createTools(KActionCollection * ac, KisCanvasSubject *subject) const
+vKisTool KisToolRegistry::createTools(TDEActionCollection * ac, KisCanvasSubject *subject) const
 {
     Q_ASSERT(subject);
 
@@ -100,7 +100,7 @@ vKisTool KisToolRegistry::createTools(KActionCollection * ac, KisCanvasSubject *
     return tools;
 }
 
-KisTool * KisToolRegistry::createTool(KActionCollection * ac, KisCanvasSubject * subject, KisID & id) const
+KisTool * KisToolRegistry::createTool(TDEActionCollection * ac, KisCanvasSubject * subject, KisID & id) const
 {
     KisToolFactorySP f = get(id);
     KisTool * t = f->createTool(ac);
diff --git a/chalk/ui/kis_tool_registry.h b/chalk/ui/kis_tool_registry.h
index fe477131..2717b989 100644
--- a/chalk/ui/kis_tool_registry.h
+++ b/chalk/ui/kis_tool_registry.h
@@ -25,7 +25,7 @@
 #include "kis_generic_registry.h"
 #include <koffice_export.h>
 
-class KActionCollection;
+class TDEActionCollection;
 class KisCanvasSubject;
 class TQStringList;
 
@@ -45,8 +45,8 @@ public:
 
      static KisToolRegistry* instance();
 
-    vKisTool createTools(KActionCollection * ac, KisCanvasSubject *subject) const;
-    KisTool * createTool(KActionCollection * ac, KisCanvasSubject * subject, KisID & id) const;
+    vKisTool createTools(TDEActionCollection * ac, KisCanvasSubject *subject) const;
+    KisTool * createTool(TDEActionCollection * ac, KisCanvasSubject * subject, KisID & id) const;
     
 private:
     KisToolRegistry();
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 6c8303d7..357be9d2 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -362,7 +362,7 @@ KisView::~KisView()
 
 static TQt::Dock stringToDock( const TQString& attrPosition )
 {
-    KToolBar::Dock dock = KToolBar::DockTop;
+    TDEToolBar::Dock dock = TDEToolBar::DockTop;
     if ( !attrPosition.isEmpty() ) {
         if ( attrPosition == "top" )
             dock = TQt::DockTop;
@@ -603,83 +603,83 @@ void KisView::setupActions()
     m_fullScreen = KStdAction::fullScreen( NULL, NULL, actionCollection(), this );
     connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool )));
 
-    m_imgProperties = new KAction(i18n("Image Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageProperties()), actionCollection(), "img_properties");
-    m_imgScan = 0; // How the hell do I get a KAction to the scan plug-in?!?
-    m_imgResizeToLayer = new KAction(i18n("Resize Image to Size of Current Layer"), 0, TQT_TQOBJECT(this), TQT_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer");
+    m_imgProperties = new TDEAction(i18n("Image Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageProperties()), actionCollection(), "img_properties");
+    m_imgScan = 0; // How the hell do I get a TDEAction to the scan plug-in?!?
+    m_imgResizeToLayer = new TDEAction(i18n("Resize Image to Size of Current Layer"), 0, TQT_TQOBJECT(this), TQT_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer");
 
     // view actions
     m_zoomIn = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in");
     m_zoomOut = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out");
-    m_actualPixels = new KAction(i18n("Actual Pixels"), "Ctrl+0", TQT_TQOBJECT(this), TQT_SLOT(slotActualPixels()), actionCollection(), "actual_pixels");
+    m_actualPixels = new TDEAction(i18n("Actual Pixels"), "Ctrl+0", TQT_TQOBJECT(this), TQT_SLOT(slotActualPixels()), actionCollection(), "actual_pixels");
     m_actualSize = KStdAction::actualSize(TQT_TQOBJECT(this), TQT_SLOT(slotActualSize()), actionCollection(), "actual_size");
     m_actualSize->setEnabled(false);
     m_fitToCanvas = KStdAction::fitToPage(TQT_TQOBJECT(this), TQT_SLOT(slotFitToCanvas()), actionCollection(), "fit_to_canvas");
 
     // layer actions
-    m_layerAdd = new KAction(i18n("&Add..."), "Ctrl+Shift+N", TQT_TQOBJECT(this), TQT_SLOT(layerAdd()), actionCollection(), "insert_layer");
+    m_layerAdd = new TDEAction(i18n("&Add..."), "Ctrl+Shift+N", TQT_TQOBJECT(this), TQT_SLOT(layerAdd()), actionCollection(), "insert_layer");
 
     m_actionPartLayer = new KoPartSelectAction( i18n( "&Object Layer" ), "frame_query",
                                                     TQT_TQOBJECT(this), TQT_SLOT( addPartLayer() ),
                                                     actionCollection(), "insert_part_layer" );
 
 
-    m_actionAdjustmentLayer = new KAction( i18n( "&Adjustment Layer" ), 0,
+    m_actionAdjustmentLayer = new TDEAction( i18n( "&Adjustment Layer" ), 0,
             TQT_TQOBJECT(this), TQT_SLOT( addAdjustmentLayer() ),
             actionCollection(), "insert_adjustment_layer" );
 
 
-    m_layerRm = new KAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerRemove()), actionCollection(), "remove_layer");
-    m_layerDup = new KAction(i18n("Duplicate"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerDuplicate()), actionCollection(), "duplicate_layer");
-    m_layerHide = new KToggleAction(i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerToggleVisible()), actionCollection(), "hide_layer");
+    m_layerRm = new TDEAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerRemove()), actionCollection(), "remove_layer");
+    m_layerDup = new TDEAction(i18n("Duplicate"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerDuplicate()), actionCollection(), "duplicate_layer");
+    m_layerHide = new TDEToggleAction(i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerToggleVisible()), actionCollection(), "hide_layer");
     m_layerHide->setCheckedState(KGuiItem(i18n("&Show")));
     m_layerHide->setChecked(false);
 
-    m_layerRaise = new KAction(i18n("Raise"), "raise", "Ctrl+]", TQT_TQOBJECT(this), TQT_SLOT(layerRaise()), actionCollection(), "raiselayer");
-    m_layerLower = new KAction(i18n("Lower"), "lower", "Ctrl+[", TQT_TQOBJECT(this), TQT_SLOT(layerLower()), actionCollection(), "lowerlayer");
-    m_layerTop = new KAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", TQT_TQOBJECT(this), TQT_SLOT(layerFront()), actionCollection(), "toplayer");
-    m_layerBottom = new KAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", TQT_TQOBJECT(this), TQT_SLOT(layerBack()), actionCollection(), "bottomlayer");
-    m_layerProperties = new KAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerProperties()), actionCollection(), "layer_properties");
-    (void)new KAction(i18n("I&nsert Image as Layer..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer");
-    m_layerSaveAs = new KAction(i18n("Save Layer as Image..."), "filesave", TQT_TQOBJECT(this), TQT_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image");
-    (void)new KAction(i18n("Flip on &X Axis"), "view_left_right", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX");
-    (void)new KAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY");
-
-    m_createMask = new KAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this),
+    m_layerRaise = new TDEAction(i18n("Raise"), "raise", "Ctrl+]", TQT_TQOBJECT(this), TQT_SLOT(layerRaise()), actionCollection(), "raiselayer");
+    m_layerLower = new TDEAction(i18n("Lower"), "lower", "Ctrl+[", TQT_TQOBJECT(this), TQT_SLOT(layerLower()), actionCollection(), "lowerlayer");
+    m_layerTop = new TDEAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", TQT_TQOBJECT(this), TQT_SLOT(layerFront()), actionCollection(), "toplayer");
+    m_layerBottom = new TDEAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", TQT_TQOBJECT(this), TQT_SLOT(layerBack()), actionCollection(), "bottomlayer");
+    m_layerProperties = new TDEAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerProperties()), actionCollection(), "layer_properties");
+    (void)new TDEAction(i18n("I&nsert Image as Layer..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer");
+    m_layerSaveAs = new TDEAction(i18n("Save Layer as Image..."), "filesave", TQT_TQOBJECT(this), TQT_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image");
+    (void)new TDEAction(i18n("Flip on &X Axis"), "view_left_right", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX");
+    (void)new TDEAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY");
+
+    m_createMask = new TDEAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this),
                                TQT_SLOT(slotCreateMask()), actionCollection(), "create_mask");
-    m_maskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this),
+    m_maskFromSelection = new TDEAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotMaskFromSelection()), actionCollection(),
                                       "mask_fromsel");
-    m_maskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this),
+    m_maskToSelection = new TDEAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this),
                                TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel");
-    m_applyMask = new KAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()),
+    m_applyMask = new TDEAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()),
                               actionCollection(), "apply_mask");
-    m_removeMask = new KAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this),
+    m_removeMask = new TDEAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this),
                                TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_mask");
-    m_showMask = new KToggleAction(i18n( "Show Mask" ), 0, TQT_TQOBJECT(this),
+    m_showMask = new TDEToggleAction(i18n( "Show Mask" ), 0, TQT_TQOBJECT(this),
                                    TQT_SLOT(slotShowMask()), actionCollection(), "show_mask");
-    m_editMask = new KToggleAction(i18n( "Edit Mask" ), 0, TQT_TQOBJECT(this),
+    m_editMask = new TDEToggleAction(i18n( "Edit Mask" ), 0, TQT_TQOBJECT(this),
                                    TQT_SLOT(slotEditMask()), actionCollection(), "edit_mask");
 
     // image actions
-    m_imgFlatten = new KAction(i18n("&Flatten Image"), "Ctrl+Shift+E", TQT_TQOBJECT(this), TQT_SLOT(flattenImage()), actionCollection(), "flatten_image");
-    m_imgMergeLayer = new KAction(i18n("&Merge with Layer Below"), "Ctrl+E", TQT_TQOBJECT(this), TQT_SLOT(mergeLayer()), actionCollection(), "merge_layer");
+    m_imgFlatten = new TDEAction(i18n("&Flatten Image"), "Ctrl+Shift+E", TQT_TQOBJECT(this), TQT_SLOT(flattenImage()), actionCollection(), "flatten_image");
+    m_imgMergeLayer = new TDEAction(i18n("&Merge with Layer Below"), "Ctrl+E", TQT_TQOBJECT(this), TQT_SLOT(mergeLayer()), actionCollection(), "merge_layer");
 
     // setting actions
     KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection(), "preferences");
 
-    m_RulerAction = new KToggleAction( i18n( "Show Rulers" ), "Ctrl+R", TQT_TQOBJECT(this), TQT_SLOT( showRuler() ), actionCollection(), "view_ruler" );
+    m_RulerAction = new TDEToggleAction( i18n( "Show Rulers" ), "Ctrl+R", TQT_TQOBJECT(this), TQT_SLOT( showRuler() ), actionCollection(), "view_ruler" );
     m_RulerAction->setChecked(cfg.showRulers());
     m_RulerAction->setCheckedState(i18n("Hide Rulers"));
     m_RulerAction->setWhatsThis( i18n("The rulers show the horizontal and vertical positions of the mouse on the image "
                                       "and can be used to position your mouse at the right place on the canvas. <p>Uncheck this to disable "
                                       "the rulers from being displayed." ) );
 
-    //m_guideAction = new KToggleAction( i18n( "Guide Lines" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" );
+    //m_guideAction = new TDEToggleAction( i18n( "Guide Lines" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" );
 
     // Add new palette
-    new KAction(i18n("Add New Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddPalette()),
+    new TDEAction(i18n("Add New Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddPalette()),
                 actionCollection(), "add_palette");
-    new KAction(i18n("Edit Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPalette()),
+    new TDEAction(i18n("Edit Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPalette()),
                 actionCollection(), "edit_palette");
 
     // XXX: This triggers a repaint of the image, but way too early
@@ -2569,7 +2569,7 @@ void KisView::canvasGotDropEvent(TQDropEvent *event)
                 cancelId
             };
 
-            KPopupMenu popup(this, "drop_popup");
+            TDEPopupMenu popup(this, "drop_popup");
 
             if (urls.count() == 1) {
                 if (currentImg() != 0) {
diff --git a/chalk/ui/kis_view.h b/chalk/ui/kis_view.h
index 514f789f..61d44ac4 100644
--- a/chalk/ui/kis_view.h
+++ b/chalk/ui/kis_view.h
@@ -61,11 +61,11 @@ class TQPopup;
 class TQPopupMenu;
 
 class DCOPObject;
-class KAction;
-class KActionMenu;
+class TDEAction;
+class TDEActionMenu;
 class KPrinter;
-class KToggleAction;
-class KToolBar;
+class TDEToggleAction;
+class TDEToolBar;
 
 class KoPartSelectAction;
 class KoDocumentEntry;
@@ -540,44 +540,44 @@ private:
     TQ_INT32 m_hScrollBarExtent;
 
     // Actions
-    KAction *m_imgFlatten;
-    KAction *m_imgMergeLayer;
-    KAction *m_imgRename;
-    KAction *m_imgResizeToLayer;
-    KAction *m_imgScan;
+    TDEAction *m_imgFlatten;
+    TDEAction *m_imgMergeLayer;
+    TDEAction *m_imgRename;
+    TDEAction *m_imgResizeToLayer;
+    TDEAction *m_imgScan;
 
     KoPartSelectAction * m_actionPartLayer;
-    KAction * m_actionAdjustmentLayer;
-    KAction *m_layerAdd;
-    KAction *m_layerBottom;
-    KAction *m_layerDup;
-    KToggleAction *m_layerHide;
-    KAction *m_layerLower;
-    KAction *m_layerProperties;
-    KAction *m_layerRaise;
-    KAction *m_layerRm;
-    KAction *m_layerSaveAs;
-    KAction *m_layerTop;
-
-    KAction *m_createMask;
-    KAction *m_maskFromSelection;
-    KAction *m_maskToSelection;
-    KAction *m_applyMask;
-    KAction *m_removeMask;
-    KToggleAction *m_editMask;
-    KToggleAction *m_showMask;
-
-    KAction *m_zoomIn;
-    KAction *m_zoomOut;
-    KAction *m_actualPixels;
-    KAction *m_actualSize;
-    KAction *m_fitToCanvas;
-
-    KAction *m_fullScreen;
-    KAction *m_imgProperties;
-
-    KToggleAction *m_RulerAction;
-    KToggleAction *m_guideAction;
+    TDEAction * m_actionAdjustmentLayer;
+    TDEAction *m_layerAdd;
+    TDEAction *m_layerBottom;
+    TDEAction *m_layerDup;
+    TDEToggleAction *m_layerHide;
+    TDEAction *m_layerLower;
+    TDEAction *m_layerProperties;
+    TDEAction *m_layerRaise;
+    TDEAction *m_layerRm;
+    TDEAction *m_layerSaveAs;
+    TDEAction *m_layerTop;
+
+    TDEAction *m_createMask;
+    TDEAction *m_maskFromSelection;
+    TDEAction *m_maskToSelection;
+    TDEAction *m_applyMask;
+    TDEAction *m_removeMask;
+    TDEToggleAction *m_editMask;
+    TDEToggleAction *m_showMask;
+
+    TDEAction *m_zoomIn;
+    TDEAction *m_zoomOut;
+    TDEAction *m_actualPixels;
+    TDEAction *m_actualSize;
+    TDEAction *m_fitToCanvas;
+
+    TDEAction *m_fullScreen;
+    TDEAction *m_imgProperties;
+
+    TDEToggleAction *m_RulerAction;
+    TDEToggleAction *m_guideAction;
 
     DCOPObject *m_dcop;
 
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index 033e0c19..3db739d4 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -71,8 +71,8 @@ KoBirdEyePanel::KoBirdEyePanel( KoZoomAdapter * zoomListener,
     m_page->view->installEventFilter(this);
     m_page->view->setBackgroundMode(TQt::NoBackground);
 
-    m_zoomIn = new KAction( i18n("Zoom In"), "birdeye_zoom_plus", 0, TQT_TQOBJECT(this), TQT_SLOT(zoomPlus()), TQT_TQOBJECT(this), "zoomIn" );
-    m_zoomOut = new KAction( i18n("Zoom Out"), "birdeye_zoom_minus", 0, TQT_TQOBJECT(this), TQT_SLOT(zoomMinus()), TQT_TQOBJECT(this), "zoomOut" );
+    m_zoomIn = new TDEAction( i18n("Zoom In"), "birdeye_zoom_plus", 0, TQT_TQOBJECT(this), TQT_SLOT(zoomPlus()), TQT_TQOBJECT(this), "zoomIn" );
+    m_zoomOut = new TDEAction( i18n("Zoom Out"), "birdeye_zoom_minus", 0, TQT_TQOBJECT(this), TQT_SLOT(zoomMinus()), TQT_TQOBJECT(this), "zoomOut" );
 
     l->addWidget(m_page);
 
diff --git a/chalk/ui/kobirdeyepanel.h b/chalk/ui/kobirdeyepanel.h
index 61b85fb0..c93fc78e 100644
--- a/chalk/ui/kobirdeyepanel.h
+++ b/chalk/ui/kobirdeyepanel.h
@@ -28,7 +28,7 @@
 #include <KoRect.h>
 
 class TQPixmap;
-class KAction;
+class TDEAction;
 class KoDocument;
 class WdgBirdEye;
 
@@ -247,8 +247,8 @@ private:
     KoThumbnailAdapter * m_thumbnailProvider;
     KoCanvasAdapter * m_canvas;
     
-    KAction* m_zoomIn;
-    KAction* m_zoomOut;
+    TDEAction* m_zoomIn;
+    TDEAction* m_zoomOut;
     TQPixmap m_viewBuffer;
     TQPixmap m_thumbnail;
 
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 19f49200..790765b4 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -80,7 +80,7 @@ public:
     bool previewsShown;
     int itemHeight;
     TQValueList<LayerProperty> properties;
-    KPopupMenu contextMenu;
+    TDEPopupMenu contextMenu;
     LayerToolTip *tooltip;
 
     Private( TQWidget *parent, LayerList *list );
@@ -456,7 +456,7 @@ bool LayerList::property( int id, const TQString &name ) const
     return l->property( name );
 }
 
-KPopupMenu *LayerList::contextMenu() const
+TDEPopupMenu *LayerList::contextMenu() const
 {
     return &( d->contextMenu );
 }
diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h
index 39cd0214..b51a1c68 100644
--- a/chalk/ui/layerlist.h
+++ b/chalk/ui/layerlist.h
@@ -26,12 +26,12 @@
 
 class TQMouseEvent;
 class TQString;
-class KPopupMenu;
+class TDEPopupMenu;
 class LayerItem;
 class LayerFolder;
 template<class T> class TQPtrList;
 
-class LayerList: public KListView
+class LayerList: public TDEListView
 {
     Q_OBJECT
   
@@ -68,7 +68,7 @@ public:
     {
         enum { NewLayer = 0, NewFolder, RemoveLayer, LayerProperties, COUNT };
     };
-    KPopupMenu *contextMenu() const;
+    TDEPopupMenu *contextMenu() const;
 
 public slots:
     void setFoldersCanBeActive( bool can );
@@ -143,7 +143,7 @@ protected slots:
     virtual void menuActivated( int id, LayerItem *layer );
 
 private:
-    typedef KListView super;
+    typedef TDEListView super;
     friend class LayerItem;
     friend class LayerToolTIp;
 
@@ -166,7 +166,7 @@ protected:
     virtual void findDrop( const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after );
 };
 
-class LayerItem: public KListViewItem
+class LayerItem: public TDEListViewItem
 {
 public:
     LayerItem( const TQString &displayName, LayerList *parent, LayerItem *after = 0, int id = -1 );
@@ -240,7 +240,7 @@ protected:
     virtual TQImage tooltipPreview() const;
 
 private:
-    typedef KListViewItem super;
+    typedef TDEListViewItem super;
     friend class LayerList;
     friend class LayerToolTip;
 
diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui
index 506e2803..0f18a51b 100644
--- a/chalk/ui/wdgbirdeye.ui
+++ b/chalk/ui/wdgbirdeye.ui
@@ -182,7 +182,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="KToolBar">
+        <widget class="TDEToolBar">
             <property name="name">
                 <cstring>toolbar</cstring>
             </property>
@@ -266,7 +266,7 @@
 </widget>
 <customwidgets>
     <customwidget>
-        <class>KToolBar</class>
+        <class>TDEToolBar</class>
         <header location="local">ktoolbar.h</header>
         <sizehint>
             <width>20</width>