Rename a number of classes to enhance compatibility with KDE4

25 files changed, 166 insertions, 166 deletions

diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp
index babbd4d9..4b0d1ac1 100644
--- a/kolourpaint/kpcommandhistory.cpp
+++ b/kolourpaint/kpcommandhistory.cpp
@@ -253,18 +253,18 @@ struct kpCommandHistoryBasePrivate
 
 
 kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig,
-                                            KActionCollection *ac)
+                                            TDEActionCollection *ac)
     : d (new kpCommandHistoryBasePrivate ())
 {
-    m_actionUndo = new KToolBarPopupAction (undoActionText (),
+    m_actionUndo = new TDEToolBarPopupAction (undoActionText (),
         TQString::fromLatin1 ("undo"),
-        KStdAccel::shortcut (KStdAccel::Undo),
+        TDEStdAccel::shortcut (TDEStdAccel::Undo),
         this, TQT_SLOT (undo ()),
         ac, KStdAction::name (KStdAction::Undo));
 
-    m_actionRedo = new KToolBarPopupAction (redoActionText (),
+    m_actionRedo = new TDEToolBarPopupAction (redoActionText (),
         TQString::fromLatin1 ("redo"),
-        KStdAccel::shortcut (KStdAccel::Redo),
+        TDEStdAccel::shortcut (TDEStdAccel::Redo),
         this, TQT_SLOT (redo ()),
         ac, KStdAction::name (KStdAction::Redo));
 
@@ -771,7 +771,7 @@ void kpCommandHistoryBase::trimCommandLists ()
 }
 
 
-static void populatePopupMenu (KPopupMenu *popupMenu,
+static void populatePopupMenu (TDEPopupMenu *popupMenu,
                                const TQString &undoOrRedo,
                                const TQValueList <kpCommand *> &commandList)
 {
@@ -791,7 +791,7 @@ static void populatePopupMenu (KPopupMenu *popupMenu,
     if (it != commandList.end ())
     {
         // TODO: maybe have a scrollview show all the items instead
-        KPopupTitle *title = new KPopupTitle (popupMenu);
+        TDEPopupTitle *title = new TDEPopupTitle (popupMenu);
         title->setTitle (i18n ("%n more item", "%n more items",
                                commandList.size () - i));
 
diff --git a/kolourpaint/kpcommandhistory.h b/kolourpaint/kpcommandhistory.h
index 13365ff9..3bca4853 100644
--- a/kolourpaint/kpcommandhistory.h
+++ b/kolourpaint/kpcommandhistory.h
@@ -34,8 +34,8 @@
 #include <tqvaluelist.h>
 
 
-class KActionCollection;
-class KToolBarPopupAction;
+class TDEActionCollection;
+class TDEToolBarPopupAction;
 
 class kpDocument;
 class kpMainWindow;
@@ -136,7 +136,7 @@ Q_OBJECT
   
 
 public:
-    kpCommandHistoryBase (bool doReadConfig, KActionCollection *ac);
+    kpCommandHistoryBase (bool doReadConfig, TDEActionCollection *ac);
     virtual ~kpCommandHistoryBase ();
 
 public:
@@ -198,7 +198,7 @@ signals:
     void documentRestored ();
 
 protected:
-    KToolBarPopupAction *m_actionUndo, *m_actionRedo;
+    TDEToolBarPopupAction *m_actionUndo, *m_actionRedo;
 
     // (Front element is the next one)
     TQValueList <kpCommand *> m_undoCommandList;
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index ee506883..3d8fc81a 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -64,7 +64,7 @@
 
 
 kpMainWindow::kpMainWindow ()
-    : KMainWindow (0/*parent*/, "mainWindow"),
+    : TDEMainWindow (0/*parent*/, "mainWindow"),
       m_isFullyConstructed (false)
 {
     init ();
@@ -74,7 +74,7 @@ kpMainWindow::kpMainWindow ()
 }
 
 kpMainWindow::kpMainWindow (const KURL &url)
-    : KMainWindow (0/*parent*/, "mainWindow"),
+    : TDEMainWindow (0/*parent*/, "mainWindow"),
       m_isFullyConstructed (false)
 {
     init ();
@@ -84,7 +84,7 @@ kpMainWindow::kpMainWindow (const KURL &url)
 }
 
 kpMainWindow::kpMainWindow (kpDocument *newDoc)
-    : KMainWindow (0/*parent*/, "mainWindow"),
+    : TDEMainWindow (0/*parent*/, "mainWindow"),
       m_isFullyConstructed (false)
 {
     init ();
@@ -295,8 +295,8 @@ void kpMainWindow::init ()
         kdDebug () << "\tfirstTime: positioning toolbars" << endl;
     #endif
 
-        m_toolToolBar->setBarPos (KToolBar::Left);
-        m_colorToolBar->setBarPos (KToolBar::Bottom);
+        m_toolToolBar->setBarPos (TDEToolBar::Left);
+        m_colorToolBar->setBarPos (TDEToolBar::Bottom);
 
         TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
         TDEConfigBase *cfg = cfgGroupSaver.config ();
@@ -311,7 +311,7 @@ void kpMainWindow::init ()
 }
 
 
-// private virtual [base KMainWindow]
+// private virtual [base TDEMainWindow]
 void kpMainWindow::readProperties (TDEConfig *cfg)
 {
 #if DEBUG_KP_MAIN_WINDOW
@@ -363,8 +363,8 @@ void kpMainWindow::readProperties (TDEConfig *cfg)
 
 }
 
-// private virtual [base KMainWindow]
-// WARNING: KMainWindow API Doc says "No user interaction is allowed
+// private virtual [base TDEMainWindow]
+// WARNING: TDEMainWindow API Doc says "No user interaction is allowed
 //          in this function!"
 void kpMainWindow::saveProperties (TDEConfig *cfg)
 {
@@ -839,7 +839,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
 }
 
 
-// private virtual [base KMainWindow]
+// private virtual [base TDEMainWindow]
 bool kpMainWindow::queryClose ()
 {
 #if DEBUG_KP_MAIN_WINDOW
diff --git a/kolourpaint/kpmainwindow.h b/kolourpaint/kpmainwindow.h
index 9cfe947e..0ac7d114 100644
--- a/kolourpaint/kpmainwindow.h
+++ b/kolourpaint/kpmainwindow.h
@@ -52,16 +52,16 @@ class TQRect;
 class TQSize;
 class TQStringList;
 
-class KAction;
-class KFontAction;
-class KFontSizeAction;
-class KSelectAction;
-class KToggleAction;
-class KToolBar;
+class TDEAction;
+class TDEFontAction;
+class TDEFontSizeAction;
+class TDESelectAction;
+class TDEToggleAction;
+class TDEToolBar;
 class KPrinter;
-class KRecentFilesAction;
+class TDERecentFilesAction;
 class KScanDialog;
-class KToggleFullScreenAction;
+class TDEToggleFullScreenAction;
 
 class kpColor;
 class kpColorToolBar;
@@ -85,7 +85,7 @@ class kpToolToolBar;
 class kpZoomedView;
 
 
-class kpMainWindow : public KMainWindow
+class kpMainWindow : public TDEMainWindow
 {
 Q_OBJECT
   
@@ -313,9 +313,9 @@ private:
     void setupFileMenuActions ();
     void enableFileMenuDocumentActions (bool enable = true);
 
-    KAction *m_actionNew, *m_actionOpen;
-    KRecentFilesAction *m_actionOpenRecent;
-    KAction *m_actionScan, *m_actionSave, *m_actionSaveAs, *m_actionExport,
+    TDEAction *m_actionNew, *m_actionOpen;
+    TDERecentFilesAction *m_actionOpenRecent;
+    TDEAction *m_actionScan, *m_actionSave, *m_actionSaveAs, *m_actionExport,
             *m_actionReload,
             *m_actionPrint, *m_actionPrintPreview,
             *m_actionMail,
@@ -426,7 +426,7 @@ private:
 
     bool m_editMenuDocumentActionsEnabled;
 
-    KAction *m_actionUndo, *m_actionRedo,
+    TDEAction *m_actionUndo, *m_actionRedo,
             *m_actionCut, *m_actionCopy,
             *m_actionPaste, *m_actionPasteInNewWindow,
             *m_actionDelete,
@@ -491,12 +491,12 @@ private:
     void enableViewMenuDocumentActions (bool enable = true);
     void actionShowGridUpdate ();
 
-    KAction *m_actionFullScreenBIC,
+    TDEAction *m_actionFullScreenBIC,
             *m_actionActualSize,
             *m_actionFitToPage, *m_actionFitToWidth, *m_actionFitToHeight,
             *m_actionZoomIn, *m_actionZoomOut;
-    KSelectAction *m_actionZoom;
-    KToggleAction *m_actionShowGrid,
+    TDESelectAction *m_actionZoom;
+    TDEToggleAction *m_actionShowGrid,
                   *m_actionShowThumbnail, *m_actionZoomedThumbnail;
 
     TQValueVector <int> m_zoomList;
@@ -581,7 +581,7 @@ private:
 
     bool m_imageMenuDocumentActionsEnabled;
 
-    KAction *m_actionResizeScale,
+    TDEAction *m_actionResizeScale,
             *m_actionCrop, *m_actionAutoCrop,
             *m_actionFlip, *m_actionRotate, *m_actionSkew,
             *m_actionConvertToBlackAndWhite, *m_actionConvertToGrayscale,
@@ -621,9 +621,9 @@ private:
     void setupSettingsMenuActions ();
     void enableSettingsMenuDocumentActions (bool enable = true);
 
-    KToggleAction *m_actionShowPath;
-    KAction *m_actionKeyBindings, *m_actionConfigureToolbars, *m_actionConfigure;
-    KToggleFullScreenAction *m_actionFullScreen;
+    TDEToggleAction *m_actionShowPath;
+    TDEAction *m_actionKeyBindings, *m_actionConfigureToolbars, *m_actionConfigure;
+    TDEToggleFullScreenAction *m_actionFullScreen;
 
 private slots:
     void slotFullScreen ();
@@ -700,16 +700,16 @@ private slots:
     void slotTextStrikeThruChanged ();
 
 public:
-    KToolBar *textToolBar ();
+    TDEToolBar *textToolBar ();
     bool isTextStyleBackgroundOpaque () const;
     kpTextStyle textStyle () const;
     void setTextStyle (const kpTextStyle &textStyle_);
     int settingTextStyle () const;
 
 private:
-    KFontAction *m_actionTextFontFamily;
-    KFontSizeAction *m_actionTextFontSize;
-    KToggleAction *m_actionTextBold, *m_actionTextItalic,
+    TDEFontAction *m_actionTextFontFamily;
+    TDEFontSizeAction *m_actionTextFontSize;
+    TDEToggleAction *m_actionTextBold, *m_actionTextItalic,
                   *m_actionTextUnderline, *m_actionTextStrikeThru;
 
     int m_settingTextStyle;
diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp
index f7435eaa..65e1f7d5 100644
--- a/kolourpaint/kpmainwindow_edit.cpp
+++ b/kolourpaint/kpmainwindow_edit.cpp
@@ -89,7 +89,7 @@ kpPixmapFX::WarnAboutLossInfo kpMainWindow::pasteWarnAboutLossInfo ()
 // private
 void kpMainWindow::setupEditMenuActions ()
 {
-    KActionCollection *ac = actionCollection ();
+    TDEActionCollection *ac = actionCollection ();
 
 
     // Undo/Redo
@@ -106,21 +106,21 @@ void kpMainWindow::setupEditMenuActions ()
     m_actionCut = KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT (slotCut ()), ac);
     m_actionCopy = KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT (slotCopy ()), ac);
     m_actionPaste = KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT (slotPaste ()), ac);
-    m_actionPasteInNewWindow = new KAction (i18n ("Paste in &New Window"),
+    m_actionPasteInNewWindow = new TDEAction (i18n ("Paste in &New Window"),
         TQt::CTRL + TQt::SHIFT + TQt::Key_V,
         TQT_TQOBJECT(this), TQT_SLOT (slotPasteInNewWindow ()), ac, "edit_paste_in_new_window");
 
     //m_actionDelete = KStdAction::clear (this, TQT_SLOT (slotDelete ()), ac);
-    m_actionDelete = new KAction (i18n ("&Delete Selection"), 0,
+    m_actionDelete = new TDEAction (i18n ("&Delete Selection"), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotDelete ()), ac, "edit_clear");
 
     m_actionSelectAll = KStdAction::selectAll (TQT_TQOBJECT(this), TQT_SLOT (slotSelectAll ()), ac);
     m_actionDeselect = KStdAction::deselect (TQT_TQOBJECT(this), TQT_SLOT (slotDeselect ()), ac);
 
 
-    m_actionCopyToFile = new KAction (i18n ("C&opy to File..."), 0,
+    m_actionCopyToFile = new TDEAction (i18n ("C&opy to File..."), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotCopyToFile ()), ac, "edit_copy_to_file");
-    m_actionPasteFromFile = new KAction (i18n ("Paste &From File..."), 0,
+    m_actionPasteFromFile = new TDEAction (i18n ("Paste &From File..."), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotPasteFromFile ()), ac, "edit_paste_from_file");
 
 
@@ -724,14 +724,14 @@ void kpMainWindow::slotPaste ()
             i18n ("Cannot Paste"));
 
         // TODO: PROPAGATE: interprocess
-        if (KMainWindow::memberList)
+        if (TDEMainWindow::memberList)
         {
         #if DEBUG_KP_MAIN_WINDOW
             kdDebug () << "\thave memberList" << endl;
         #endif
 
-            for (TQPtrList <KMainWindow>::const_iterator it = KMainWindow::memberList->begin ();
-                 it != KMainWindow::memberList->end ();
+            for (TQPtrList <TDEMainWindow>::const_iterator it = TDEMainWindow::memberList->begin ();
+                 it != TDEMainWindow::memberList->end ();
                  it++)
             {
                 kpMainWindow *mw = dynamic_cast <kpMainWindow *> (*it);
diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp
index 455732c9..6cc81cfc 100644
--- a/kolourpaint/kpmainwindow_file.cpp
+++ b/kolourpaint/kpmainwindow_file.cpp
@@ -65,7 +65,7 @@ void kpMainWindow::setupFileMenuActions ()
 #if DEBUG_KP_MAIN_WINDOW
     kdDebug () << "kpMainWindow::setupFileMenuActions()" << endl;
 #endif
-    KActionCollection *ac = actionCollection ();
+    TDEActionCollection *ac = actionCollection ();
 
     m_actionNew = KStdAction::openNew (TQT_TQOBJECT(this), TQT_SLOT (slotNew ()), ac);
     m_actionOpen = KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT (slotOpen ()), ac);
@@ -79,14 +79,14 @@ void kpMainWindow::setupFileMenuActions ()
     m_actionSave = KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT (slotSave ()), ac);
     m_actionSaveAs = KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT (slotSaveAs ()), ac);
 
-    m_actionExport = new KAction (i18n ("E&xport..."), 0,
+    m_actionExport = new TDEAction (i18n ("E&xport..."), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotExport ()), ac, "file_export");
 
-    m_actionScan = new KAction (i18n ("Scan..."), SmallIcon ("scanner"), 0,
+    m_actionScan = new TDEAction (i18n ("Scan..."), SmallIcon ("scanner"), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotScan ()), ac, "file_scan");
 
     //m_actionRevert = KStdAction::revert (this, TQT_SLOT (slotRevert ()), ac);
-    m_actionReload = new KAction (i18n ("Reloa&d"), KStdAccel::reload (),
+    m_actionReload = new TDEAction (i18n ("Reloa&d"), TDEStdAccel::reload (),
         TQT_TQOBJECT(this), TQT_SLOT (slotReload ()), ac, "file_revert");
     slotEnableReload ();
 
@@ -95,9 +95,9 @@ void kpMainWindow::setupFileMenuActions ()
 
     m_actionMail = KStdAction::mail (TQT_TQOBJECT(this), TQT_SLOT (slotMail ()), ac);
 
-    m_actionSetAsWallpaperCentered = new KAction (i18n ("Set as Wa&llpaper (Centered)"), 0,
+    m_actionSetAsWallpaperCentered = new TDEAction (i18n ("Set as Wa&llpaper (Centered)"), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotSetAsWallpaperCentered ()), ac, "file_set_as_wallpaper_centered");
-    m_actionSetAsWallpaperTiled = new KAction (i18n ("Set as Wallpaper (&Tiled)"), 0,
+    m_actionSetAsWallpaperTiled = new TDEAction (i18n ("Set as Wallpaper (&Tiled)"), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled");
 
     m_actionClose = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT (slotClose ()), ac);
@@ -167,14 +167,14 @@ void kpMainWindow::addRecentURL (const KURL &url)
 
 
     // TODO: PROPAGATE: interprocess
-    if (KMainWindow::memberList)
+    if (TDEMainWindow::memberList)
     {
     #if DEBUG_KP_MAIN_WINDOW
         kdDebug () << "\thave memberList" << endl;
     #endif
 
-        for (TQPtrList <KMainWindow>::const_iterator it = KMainWindow::memberList->begin ();
-             it != KMainWindow::memberList->end ();
+        for (TQPtrList <TDEMainWindow>::const_iterator it = TDEMainWindow::memberList->begin ();
+             it != TDEMainWindow::memberList->end ();
              it++)
         {
             kpMainWindow *mw = dynamic_cast <kpMainWindow *> (*it);
@@ -190,12 +190,12 @@ void kpMainWindow::addRecentURL (const KURL &url)
 
             if (mw != this)
             {
-                // WARNING: Do not use KRecentFilesAction::setItems()
+                // WARNING: Do not use TDERecentFilesAction::setItems()
                 //          - it does not work since only its superclass,
-                //          KSelectAction, implements setItems() and can't
-                //          update KRecentFilesAction's URL list.
+                //          TDESelectAction, implements setItems() and can't
+                //          update TDERecentFilesAction's URL list.
 
-                // Avoid URL memory leak in KRecentFilesAction::loadEntries().
+                // Avoid URL memory leak in TDERecentFilesAction::loadEntries().
                 mw->m_actionOpenRecent->clearURLList ();
 
                 mw->m_actionOpenRecent->loadEntries (cfg);
diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp
index 9e351aac..91662481 100644
--- a/kolourpaint/kpmainwindow_help.cpp
+++ b/kolourpaint/kpmainwindow_help.cpp
@@ -45,7 +45,7 @@
 // private
 void kpMainWindow::setupHelpMenuActions ()
 {
-    KActionCollection *ac = actionCollection ();
+    TDEActionCollection *ac = actionCollection ();
 
 
     // Explanation for action name:
@@ -55,7 +55,7 @@ void kpMainWindow::setupHelpMenuActions ()
     // from a digital camera in future versions of KolourPaint.  Hence
     // "Acquiring" is more appropriate.
     // -- Thurston
-    d->m_actionHelpTakingScreenshots = new KAction (
+    d->m_actionHelpTakingScreenshots = new TDEAction (
         i18n ("Acquiring &Screenshots"), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotHelpTakingScreenshots ()),
         ac, "help_taking_screenshots");
@@ -83,7 +83,7 @@ static TQString printScreenShortcutString ()
 
     // (only use 1st key sequence, if it exists)
     const TQString humanReadableShortcut =
-        KShortcut (cfgEntryString).seq (0).toString ();
+        TDEShortcut (cfgEntryString).seq (0).toString ();
 
     if (!humanReadableShortcut.isEmpty ())
     {
diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp
index 6a2ef02e..6d7bc13d 100644
--- a/kolourpaint/kpmainwindow_image.cpp
+++ b/kolourpaint/kpmainwindow_image.cpp
@@ -87,39 +87,39 @@ TQString kpMainWindow::autoCropText () const
 // private
 void kpMainWindow::setupImageMenuActions ()
 {
-    KActionCollection *ac = actionCollection ();
+    TDEActionCollection *ac = actionCollection ();
 
-    m_actionResizeScale = new KAction (i18n ("R&esize / Scale..."), TQt::CTRL + TQt::Key_E,
+    m_actionResizeScale = new TDEAction (i18n ("R&esize / Scale..."), TQt::CTRL + TQt::Key_E,
         TQT_TQOBJECT(this), TQT_SLOT (slotResizeScale ()), ac, "image_resize_scale");
 
-    m_actionCrop = new KAction (i18n ("Se&t as Image (Crop)"), TQt::CTRL + TQt::Key_T,
+    m_actionCrop = new TDEAction (i18n ("Se&t as Image (Crop)"), TQt::CTRL + TQt::Key_T,
         TQT_TQOBJECT(this), TQT_SLOT (slotCrop ()), ac, "image_crop");
 
-    m_actionAutoCrop = new KAction (autoCropText (), TQt::CTRL + TQt::Key_U,
+    m_actionAutoCrop = new TDEAction (autoCropText (), TQt::CTRL + TQt::Key_U,
         TQT_TQOBJECT(this), TQT_SLOT (slotAutoCrop ()), ac, "image_auto_crop");
 
-    m_actionFlip = new KAction (i18n ("&Flip..."), TQt::CTRL + TQt::Key_F,
+    m_actionFlip = new TDEAction (i18n ("&Flip..."), TQt::CTRL + TQt::Key_F,
         TQT_TQOBJECT(this), TQT_SLOT (slotFlip ()), ac, "image_flip");
 
-    m_actionRotate = new KAction (i18n ("&Rotate..."), TQt::CTRL + TQt::Key_R,
+    m_actionRotate = new TDEAction (i18n ("&Rotate..."), TQt::CTRL + TQt::Key_R,
         TQT_TQOBJECT(this), TQT_SLOT (slotRotate ()), ac, "image_rotate");
 
-    m_actionSkew = new KAction (i18n ("S&kew..."), TQt::CTRL + TQt::Key_K,
+    m_actionSkew = new TDEAction (i18n ("S&kew..."), TQt::CTRL + TQt::Key_K,
         TQT_TQOBJECT(this), TQT_SLOT (slotSkew ()), ac, "image_skew");
 
-    m_actionConvertToBlackAndWhite = new KAction (i18n ("Reduce to Mo&nochrome (Dithered)"), 0,
+    m_actionConvertToBlackAndWhite = new TDEAction (i18n ("Reduce to Mo&nochrome (Dithered)"), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white");
 
-    m_actionConvertToGrayscale = new KAction (i18n ("Reduce to &Grayscale"), 0,
+    m_actionConvertToGrayscale = new TDEAction (i18n ("Reduce to &Grayscale"), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale");
 
-    m_actionInvertColors = new KAction (i18n ("&Invert Colors"), TQt::CTRL + TQt::Key_I,
+    m_actionInvertColors = new TDEAction (i18n ("&Invert Colors"), TQt::CTRL + TQt::Key_I,
         TQT_TQOBJECT(this), TQT_SLOT (slotInvertColors ()), ac, "image_invert_colors");
 
-    m_actionClear = new KAction (i18n ("C&lear"), TQt::CTRL + TQt::SHIFT + TQt::Key_N,
+    m_actionClear = new TDEAction (i18n ("C&lear"), TQt::CTRL + TQt::SHIFT + TQt::Key_N,
         TQT_TQOBJECT(this), TQT_SLOT (slotClear ()), ac, "image_clear");
 
-    m_actionMoreEffects = new KAction (i18n ("&More Effects..."), TQt::CTRL + TQt::Key_M,
+    m_actionMoreEffects = new TDEAction (i18n ("&More Effects..."), TQt::CTRL + TQt::Key_M,
         TQT_TQOBJECT(this), TQT_SLOT (slotMoreEffects ()), ac, "image_more_effects");
 
     enableImageMenuDocumentActions (false);
diff --git a/kolourpaint/kpmainwindow_p.h b/kolourpaint/kpmainwindow_p.h
index 9ec94eaa..7a23bfd2 100644
--- a/kolourpaint/kpmainwindow_p.h
+++ b/kolourpaint/kpmainwindow_p.h
@@ -30,16 +30,16 @@
 #define KP_MAIN_WINDOW_P_H
 
 
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
 
 
 struct kpMainWindowPrivate
 {
     bool m_configThumbnailShowRectangle;
-    KToggleAction *m_actionShowThumbnailRectangle;
+    TDEToggleAction *m_actionShowThumbnailRectangle;
 
-    KAction *m_actionHelpTakingScreenshots;
+    TDEAction *m_actionHelpTakingScreenshots;
 
     int m_moreEffectsDialogLastEffect;
     bool m_resizeScaleDialogLastKeepAspect;
diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp
index 79746294..e28b7152 100644
--- a/kolourpaint/kpmainwindow_settings.cpp
+++ b/kolourpaint/kpmainwindow_settings.cpp
@@ -47,7 +47,7 @@
 // private
 void kpMainWindow::setupSettingsMenuActions ()
 {
-    KActionCollection *ac = actionCollection ();
+    TDEActionCollection *ac = actionCollection ();
 
 
     // Settings/Toolbars |> %s
@@ -61,7 +61,7 @@ void kpMainWindow::setupSettingsMenuActions ()
                                                  this/*window*/);
 
 
-    m_actionShowPath = new KToggleAction (i18n ("Show &Path"), 0,
+    m_actionShowPath = new TDEToggleAction (i18n ("Show &Path"), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotShowPathToggled ()), ac, "settings_show_path");
     m_actionShowPath->setCheckedState (i18n ("Hide &Path"));
     slotEnableSettingsShowPath ();
@@ -187,7 +187,7 @@ void kpMainWindow::slotNewToolBarConfig ()
     kdDebug () << "kpMainWindow::slotNewToolBarConfig()" << endl;
 #endif
 
-    // Wouldn't it be nice if createGUI () didn't nuke all the KToolBar's?
+    // Wouldn't it be nice if createGUI () didn't nuke all the TDEToolBar's?
     // (including my non-XMLGUI ones whose states take a _lot_ of effort to
     //  restore).
     // TODO: this message is probably unacceptable - so restore the state of
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index e8d3b951..0e151025 100644
--- a/kolourpaint/kpmainwindow_text.cpp
+++ b/kolourpaint/kpmainwindow_text.cpp
@@ -47,23 +47,23 @@
 // private
 void kpMainWindow::setupTextToolBarActions ()
 {
-    KActionCollection *ac = actionCollection ();
+    TDEActionCollection *ac = actionCollection ();
 
-    m_actionTextFontFamily = new KFontAction (i18n ("Font Family"), 0/*shortcut*/,
+    m_actionTextFontFamily = new TDEFontAction (i18n ("Font Family"), 0/*shortcut*/,
         TQT_TQOBJECT(this), TQT_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family");
-    m_actionTextFontSize = new KFontSizeAction (i18n ("Font Size"), 0/*shortcut*/,
+    m_actionTextFontSize = new TDEFontSizeAction (i18n ("Font Size"), 0/*shortcut*/,
         TQT_TQOBJECT(this), TQT_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size");
 
-    m_actionTextBold = new KToggleAction (i18n ("Bold"),
+    m_actionTextBold = new TDEToggleAction (i18n ("Bold"),
         "text_bold"/*icon*/, 0/*shortcut*/,
         TQT_TQOBJECT(this), TQT_SLOT (slotTextBoldChanged ()), ac, "text_bold");
-    m_actionTextItalic = new KToggleAction (i18n ("Italic"),
+    m_actionTextItalic = new TDEToggleAction (i18n ("Italic"),
         "text_italic"/*icon*/, 0/*shortcut*/,
         TQT_TQOBJECT(this), TQT_SLOT (slotTextItalicChanged ()), ac, "text_italic");
-    m_actionTextUnderline = new KToggleAction (i18n ("Underline"),
+    m_actionTextUnderline = new TDEToggleAction (i18n ("Underline"),
         "text_under"/*icon*/, 0/*shortcut*/,
         TQT_TQOBJECT(this), TQT_SLOT (slotTextUnderlineChanged ()), ac, "text_underline");
-    m_actionTextStrikeThru = new KToggleAction (i18n ("Strike Through"),
+    m_actionTextStrikeThru = new TDEToggleAction (i18n ("Strike Through"),
         "text_strike"/*icon*/, 0/*shortcut*/,
         TQT_TQOBJECT(this), TQT_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru");
 
@@ -136,7 +136,7 @@ void kpMainWindow::slotTextFontFamilyChanged ()
                                            m_textOldFontFamily);
     }
 
-    // Since editable KSelectAction's steal focus from view, switch back to mainView
+    // Since editable TDESelectAction's steal focus from view, switch back to mainView
     // TODO: back to the last view
     if (m_mainView)
         m_mainView->setFocus ();
@@ -169,7 +169,7 @@ void kpMainWindow::slotTextFontSizeChanged ()
                                          m_textOldFontSize);
     }
 
-    // Since editable KSelectAction's steal focus from view, switch back to mainView
+    // Since editable TDESelectAction's steal focus from view, switch back to mainView
     // TODO: back to the last view
     if (m_mainView)
         m_mainView->setFocus ();
@@ -276,7 +276,7 @@ void kpMainWindow::slotTextStrikeThruChanged ()
 
 
 // public
-KToolBar *kpMainWindow::textToolBar ()
+TDEToolBar *kpMainWindow::textToolBar ()
 {
     return toolBar ("textToolBar");
 }
diff --git a/kolourpaint/kpmainwindow_tools.cpp b/kolourpaint/kpmainwindow_tools.cpp
index 93132936..ced91646 100644
--- a/kolourpaint/kpmainwindow_tools.cpp
+++ b/kolourpaint/kpmainwindow_tools.cpp
@@ -98,7 +98,7 @@ void kpMainWindow::setupToolActions ()
     m_tools.append (m_toolCurve = new kpToolCurve (this));
 
 
-    KActionCollection *ac = actionCollection ();
+    TDEActionCollection *ac = actionCollection ();
 
     m_actionPrevToolOptionGroup1 = new kpSingleKeyTriggersAction (
         i18n ("Previous Tool Option (Group #1)"),
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index 49e5e229..7d58055c 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -61,7 +61,7 @@ void kpMainWindow::setupViewMenuActions ()
     m_thumbnailSaveConfigTimer = 0;
 
 
-    KActionCollection *ac = actionCollection ();
+    TDEActionCollection *ac = actionCollection ();
 
     /*m_actionFullScreen = KStdAction::fullScreen (0, 0, ac);
     m_actionFullScreen->setEnabled (false);*/
@@ -77,7 +77,7 @@ void kpMainWindow::setupViewMenuActions ()
     m_actionZoomOut = KStdAction::zoomOut (TQT_TQOBJECT(this), TQT_SLOT (slotZoomOut ()), ac);
 
 
-    m_actionZoom = new KSelectAction (i18n ("&Zoom"), 0,
+    m_actionZoom = new TDESelectAction (i18n ("&Zoom"), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotZoom ()), actionCollection (), "view_zoom_to");
     m_actionZoom->setEditable (true);
 
@@ -90,7 +90,7 @@ void kpMainWindow::setupViewMenuActions ()
     m_zoomList.append (1000); m_zoomList.append (1200); m_zoomList.append (1600);
 
 
-    m_actionShowGrid = new KToggleAction (i18n ("Show &Grid"), CTRL + Key_G,
+    m_actionShowGrid = new TDEToggleAction (i18n ("Show &Grid"), CTRL + Key_G,
         TQT_TQOBJECT(this), TQT_SLOT (slotShowGridToggled ()), actionCollection (), "view_show_grid");
     m_actionShowGrid->setCheckedState (i18n ("Hide &Grid"));
 
@@ -98,12 +98,12 @@ void kpMainWindow::setupViewMenuActions ()
     // TODO: This doesn't work when the thumbnail has focus.
     //       Testcase: Press CTRL+H twice on a fresh KolourPaint.
     //                 The second CTRL+H doesn't close the thumbnail.
-    m_actionShowThumbnail = new KToggleAction (i18n ("Show T&humbnail"), CTRL + Key_H,
+    m_actionShowThumbnail = new TDEToggleAction (i18n ("Show T&humbnail"), CTRL + Key_H,
         TQT_TQOBJECT(this), TQT_SLOT (slotShowThumbnailToggled ()), actionCollection (), "view_show_thumbnail");
     m_actionShowThumbnail->setCheckedState (i18n ("Hide T&humbnail"));
 
     // Please do not use setCheckedState() here - it wouldn't make sense
-    m_actionZoomedThumbnail = new KToggleAction (i18n ("Zoo&med Thumbnail Mode"), 0,
+    m_actionZoomedThumbnail = new TDEToggleAction (i18n ("Zoo&med Thumbnail Mode"), 0,
         TQT_TQOBJECT(this), TQT_SLOT (slotZoomedThumbnailToggled ()), actionCollection (), "view_zoomed_thumbnail");
 
     // For consistency with the above action, don't use setCheckedState()
@@ -111,7 +111,7 @@ void kpMainWindow::setupViewMenuActions ()
     // Also, don't use "Show Thumbnail Rectangle" because if entire doc
     // can be seen in scrollView, checking option won't "Show" anything
     // since rect _surrounds_ entire doc (hence, won't be rendered).
-    d->m_actionShowThumbnailRectangle = new KToggleAction (
+    d->m_actionShowThumbnailRectangle = new TDEToggleAction (
         i18n ("Enable Thumbnail &Rectangle"),
         0,
         TQT_TQOBJECT(this), TQT_SLOT (slotThumbnailShowRectangleToggled ()),
@@ -186,9 +186,9 @@ void kpMainWindow::sendZoomListToActionZoom ()
         items << zoomLevelToString (*it);
     }
 
-    // Work around a KDE bug - KSelectAction::setItems() enables the action.
+    // Work around a KDE bug - TDESelectAction::setItems() enables the action.
     // David Faure said it won't be fixed because it's a feature used by
-    // KRecentFilesAction.
+    // TDERecentFilesAction.
     bool e = m_actionZoom->isEnabled ();
     m_actionZoom->setItems (items);
     if (e != m_actionZoom->isEnabled ())
@@ -477,7 +477,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor)
     #endif
 
 
-        // Since Zoom Level KSelectAction on ToolBar grabs focus after changing
+        // Since Zoom Level TDESelectAction on ToolBar grabs focus after changing
         // Zoom, switch back to the Main View.
         // TODO: back to the last view
         m_mainView->setFocus ();
diff --git a/kolourpaint/kpsinglekeytriggersaction.cpp b/kolourpaint/kpsinglekeytriggersaction.cpp
index 07573bf4..922c1942 100644
--- a/kolourpaint/kpsinglekeytriggersaction.cpp
+++ b/kolourpaint/kpsinglekeytriggersaction.cpp
@@ -87,7 +87,7 @@ void kpSingleKeyTriggersActionInterface::enableSingleKeyTriggers (bool enable)
     {
         m_fullShortcut = /*pure virtual*/actionShortcut ();
 
-        KShortcut newShortcut;
+        TDEShortcut newShortcut;
         if (kpTool::containsSingleKeyTrigger (m_fullShortcut, &newShortcut))
         {
         #if DEBUG_KP_SINGLE_KEY_TRIGGERS_ACTION
@@ -117,10 +117,10 @@ void kpSingleKeyTriggersActionInterface::enableSingleKeyTriggers (bool enable)
 
 
 kpSingleKeyTriggersAction::kpSingleKeyTriggersAction (const TQString &text,
-                            const KShortcut &shortcut,
+                            const TDEShortcut &shortcut,
                             const TQObject *receiver, const char *slot,
-                            KActionCollection *parent, const char *name)
-    : KAction (text, shortcut, receiver, slot, parent, name)
+                            TDEActionCollection *parent, const char *name)
+    : TDEAction (text, shortcut, receiver, slot, parent, name)
 {
 }
 
@@ -140,13 +140,13 @@ const char *kpSingleKeyTriggersAction::actionName () const
 }
 
 // public virtual [base kpSingleKeyTriggersActionInterface]
-KShortcut kpSingleKeyTriggersAction::actionShortcut () const
+TDEShortcut kpSingleKeyTriggersAction::actionShortcut () const
 {
     return shortcut ();
 }
 
 // public virtual [base kpSingleKeyTriggersActionInterface]
-void kpSingleKeyTriggersAction::actionSetShortcut (const KShortcut &shortcut)
+void kpSingleKeyTriggersAction::actionSetShortcut (const TDEShortcut &shortcut)
 {
     setShortcut (shortcut);
 }
diff --git a/kolourpaint/kpsinglekeytriggersaction.h b/kolourpaint/kpsinglekeytriggersaction.h
index 0e88ac8f..b041d250 100644
--- a/kolourpaint/kpsinglekeytriggersaction.h
+++ b/kolourpaint/kpsinglekeytriggersaction.h
@@ -41,22 +41,22 @@ public:
     bool singleKeyTriggersEnabled () const;
     void enableSingleKeyTriggers (bool enable = true);
 
-    // Avoid inheritance diamond by not deriving from KAction
-    // so you'll have to implement these by talking to your base KAction.
+    // Avoid inheritance diamond by not deriving from TDEAction
+    // so you'll have to implement these by talking to your base TDEAction.
     virtual const char *actionName () const { return 0; }
-    virtual KShortcut actionShortcut () const = 0;
-    virtual void actionSetShortcut (const KShortcut &shortcut) = 0;
+    virtual TDEShortcut actionShortcut () const = 0;
+    virtual void actionSetShortcut (const TDEShortcut &shortcut) = 0;
 
 protected:
     bool m_singleKeyTriggersEnabled;
-    KShortcut m_fullShortcut;
+    TDEShortcut m_fullShortcut;
 };
 
 
 #include <kaction.h>
 
 
-class kpSingleKeyTriggersAction : public KAction,
+class kpSingleKeyTriggersAction : public TDEAction,
                                   public kpSingleKeyTriggersActionInterface
 {
 Q_OBJECT
@@ -64,9 +64,9 @@ Q_OBJECT
 
 public:
     kpSingleKeyTriggersAction (const TQString &text,
-                               const KShortcut &shortcut,
+                               const TDEShortcut &shortcut,
                                const TQObject *receiver, const char *slot,
-                               KActionCollection *parent, const char *name);
+                               TDEActionCollection *parent, const char *name);
     virtual ~kpSingleKeyTriggersAction ();
 
 
@@ -75,8 +75,8 @@ public:
     //
 
     virtual const char *actionName () const;
-    virtual KShortcut actionShortcut () const;
-    virtual void actionSetShortcut (const KShortcut &shortcut);
+    virtual TDEShortcut actionShortcut () const;
+    virtual void actionSetShortcut (const TDEShortcut &shortcut);
 };
 
 
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index 1aa58bf7..03cc651a 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -130,7 +130,7 @@ void kpTool::createAction ()
         return;
     }
 
-    KActionCollection *ac = m_mainWindow->actionCollection ();
+    TDEActionCollection *ac = m_mainWindow->actionCollection ();
     if (!ac)
     {
         kdError () << "kpTool::createAction() without ac" << endl;
@@ -188,7 +188,7 @@ void kpTool::setText (const TQString &text)
 
 // public static
 TQString kpTool::toolTipForTextAndShortcut (const TQString &text,
-                                           const KShortcut &shortcut)
+                                           const TDEShortcut &shortcut)
 {
     for (int i = 0; i < (int) shortcut.count (); i++)
     {
@@ -230,9 +230,9 @@ void kpTool::setKey (int key)
 }
 
 // public static
-KShortcut kpTool::shortcutForKey (int key)
+TDEShortcut kpTool::shortcutForKey (int key)
 {
-    KShortcut shortcut;
+    TDEShortcut shortcut;
 
     if (key)
     {
@@ -246,9 +246,9 @@ KShortcut kpTool::shortcutForKey (int key)
 }
 
 // public
-KShortcut kpTool::shortcut () const
+TDEShortcut kpTool::shortcut () const
 {
-    return m_action ? m_action->shortcut () : KShortcut ();
+    return m_action ? m_action->shortcut () : TDEShortcut ();
 }
 
 
@@ -273,14 +273,14 @@ bool kpTool::containsSingleKeyTrigger (const KKeySequence &seq)
 }
 
 // public static
-bool kpTool::containsSingleKeyTrigger (const KShortcut &shortcut,
-    KShortcut *shortcutWithoutSingleKeyTriggers)
+bool kpTool::containsSingleKeyTrigger (const TDEShortcut &shortcut,
+    TDEShortcut *shortcutWithoutSingleKeyTriggers)
 {
     if (shortcutWithoutSingleKeyTriggers)
         *shortcutWithoutSingleKeyTriggers = shortcut;
 
 
-    KShortcut newShortcut;
+    TDEShortcut newShortcut;
     bool needNewShortcut = false;
 
     for (int i = 0; i < (int) shortcut.count (); i++)
diff --git a/kolourpaint/kptool.h b/kolourpaint/kptool.h
index f1fc22bb..2a630144 100644
--- a/kolourpaint/kptool.h
+++ b/kolourpaint/kptool.h
@@ -41,7 +41,7 @@ class TQIconSet;
 class TQPixmap;
 
 class KKeySequence;
-class KShortcut;
+class TDEShortcut;
 
 class kpColor;
 class kpColorToolBar;
@@ -89,7 +89,7 @@ public:
     void setText (const TQString &text);
 
     static TQString toolTipForTextAndShortcut (const TQString &text,
-        const KShortcut &shortcut);
+        const TDEShortcut &shortcut);
     TQString toolTip () const;
 
     TQString description () const;
@@ -101,13 +101,13 @@ public:
     // Given a single <key>, returns a shortcut with <key>
     // (disabled when the user is editing text) and as an alternate,
     // <some modifiers>+<key>.
-    static KShortcut shortcutForKey (int key);
-    KShortcut shortcut () const;
+    static TDEShortcut shortcutForKey (int key);
+    TDEShortcut shortcut () const;
 
     static bool keyIsText (int key);
     static bool containsSingleKeyTrigger (const KKeySequence &seq);
-    static bool containsSingleKeyTrigger (const KShortcut &shortcut,
-        KShortcut *shortcutWithoutSingleKeyTriggers);
+    static bool containsSingleKeyTrigger (const TDEShortcut &shortcut,
+        TDEShortcut *shortcutWithoutSingleKeyTriggers);
 
     bool singleKeyTriggersEnabled () const;
     void enableSingleKeyTriggers (bool enable = true);
diff --git a/kolourpaint/tools/kptoolaction.cpp b/kolourpaint/tools/kptoolaction.cpp
index d45acb30..6d005981 100644
--- a/kolourpaint/tools/kptoolaction.cpp
+++ b/kolourpaint/tools/kptoolaction.cpp
@@ -32,10 +32,10 @@
 
 
 kpToolAction::kpToolAction (const TQString &text,
-                            const TQString &pic, const KShortcut &shortcut,
+                            const TQString &pic, const TDEShortcut &shortcut,
                             const TQObject *receiver, const char *slot,
                             TQObject *parent, const char *name)
-    : KToggleAction (text,
+    : TDEToggleAction (text,
                      pic, shortcut,
                      receiver, slot,
                      parent, name)
@@ -62,27 +62,27 @@ void kpToolAction::updateToolTip ()
 
 
 //
-// KToggleAction interface
+// TDEToggleAction interface
 //
 
-// public slot virtual [base KAction]
+// public slot virtual [base TDEAction]
 void kpToolAction::setText (const TQString &text)
 {
-    KToggleAction::setText (text);
+    TDEToggleAction::setText (text);
     updateToolTip ();
 }
 
-// public slot virtual [base KAction]
-bool kpToolAction::setShortcut (const KShortcut &shortcut)
+// public slot virtual [base TDEAction]
+bool kpToolAction::setShortcut (const TDEShortcut &shortcut)
 {
-    bool ret = KToggleAction::setShortcut (shortcut);
+    bool ret = TDEToggleAction::setShortcut (shortcut);
     updateToolTip ();
     return ret;
 }
 
 
 //
-// KToggleAction implements kpSingleKeyTriggersActionInterface
+// TDEToggleAction implements kpSingleKeyTriggersActionInterface
 //
 
 // public virtual [base kpSingleKeyTriggersActionInterface]
@@ -92,13 +92,13 @@ const char *kpToolAction::actionName () const
 }
 
 // public virtual [base kpSingleKeyTriggersActionInterface]
-KShortcut kpToolAction::actionShortcut () const
+TDEShortcut kpToolAction::actionShortcut () const
 {
     return shortcut ();
 }
 
 // public virtual [base kpSingleKeyTriggersActionInterface]
-void kpToolAction::actionSetShortcut (const KShortcut &shortcut)
+void kpToolAction::actionSetShortcut (const TDEShortcut &shortcut)
 {
     setShortcut (shortcut);
 }
diff --git a/kolourpaint/tools/kptoolaction.h b/kolourpaint/tools/kptoolaction.h
index 9979ed75..210c7668 100644
--- a/kolourpaint/tools/kptoolaction.h
+++ b/kolourpaint/tools/kptoolaction.h
@@ -33,8 +33,8 @@
 #include <kpsinglekeytriggersaction.h>
 
 
-// Same as KToggleAction but shows the first single key trigger in the tooltip.
-class kpToolAction : public KToggleAction,
+// Same as TDEToggleAction but shows the first single key trigger in the tooltip.
+class kpToolAction : public TDEToggleAction,
                      public kpSingleKeyTriggersActionInterface
 {
 Q_OBJECT
@@ -42,7 +42,7 @@ Q_OBJECT
 
 public:
     kpToolAction (const TQString &text,
-        const TQString &pic, const KShortcut &shortcut,
+        const TQString &pic, const TDEShortcut &shortcut,
         const TQObject *receiver, const char *slot,
         TQObject *parent, const char *name);
     virtual ~kpToolAction ();
@@ -57,12 +57,12 @@ protected:
 
 
     //
-    // KToggleAction interface
+    // TDEToggleAction interface
     //
 
 public slots:
     virtual void setText (const TQString &text);
-    virtual bool setShortcut (const KShortcut &shortcut);
+    virtual bool setShortcut (const TDEShortcut &shortcut);
 
 
     //
@@ -71,8 +71,8 @@ public slots:
 
 public:
     virtual const char *actionName () const;
-    virtual KShortcut actionShortcut () const;
-    virtual void actionSetShortcut (const KShortcut &shortcut);
+    virtual TDEShortcut actionShortcut () const;
+    virtual void actionSetShortcut (const TDEShortcut &shortcut);
 };
 
 
diff --git a/kolourpaint/tools/kptoolairspray.h b/kolourpaint/tools/kptoolairspray.h
index 44261aeb..e74159ca 100644
--- a/kolourpaint/tools/kptoolairspray.h
+++ b/kolourpaint/tools/kptoolairspray.h
@@ -94,7 +94,7 @@ public:
     virtual void execute ();
     virtual void unexecute ();
 
-    // interface for KToolAirSpray
+    // interface for TDEToolAirSpray
     void addPoints (const TQPointArray &points);
     void finalize ();
     void cancel ();
diff --git a/kolourpaint/tools/kptoolpen.h b/kolourpaint/tools/kptoolpen.h
index 857d1651..9bbcbb37 100644
--- a/kolourpaint/tools/kptoolpen.h
+++ b/kolourpaint/tools/kptoolpen.h
@@ -145,7 +145,7 @@ public:
     virtual void execute ();
     virtual void unexecute ();
 
-    // interface for KToolPen
+    // interface for TDEToolPen
     void updateBoundingRect (const TQPoint &point);
     void updateBoundingRect (const TQRect &rect);
     void finalize ();
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index 5c6a2aca..26103e0e 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -953,7 +953,7 @@ void kpColorSimilarityToolBarItem::mouseDoubleClickEvent (TQMouseEvent * /*e*/)
  */
 
 kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow, const char *name)
-    : KToolBar (mainWindow, name),
+    : TDEToolBar (mainWindow, name),
       m_mainWindow (mainWindow)
 {
     setText (label);
@@ -993,7 +993,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
     m_lastDockedOrientationSet = false;
     setOrientation (orientation ());
 
-    KToolBar::insertWidget (0, base->width (), base);
+    TDEToolBar::insertWidget (0, base->width (), base);
 }
 
 // virtual
@@ -1025,7 +1025,7 @@ void kpColorToolBar::setOrientation (Qt::Orientation o)
 
     m_colorPalette->setOrientation (o);
 
-    KToolBar::setOrientation (o);
+    TDEToolBar::setOrientation (o);
 }
 
 kpColorToolBar::~kpColorToolBar ()
diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h
index 8f5080cc..14b613c6 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -245,7 +245,7 @@ private:
 };
 
 
-class kpColorToolBar : public KToolBar
+class kpColorToolBar : public TDEToolBar
 {
 Q_OBJECT
   
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index abe63d87..fb0ca446 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -81,7 +81,7 @@ protected:
 
 
 kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, int colsOrRows, const char *name)
-    : KToolBar ((TQWidget *) mainWindow, name, false/*don't use global toolBar settings*/, true/*readConfig*/),
+    : TDEToolBar ((TQWidget *) mainWindow, name, false/*don't use global toolBar settings*/, true/*readConfig*/),
       m_vertCols (colsOrRows),
       m_buttonGroup (0),
       m_baseWidget (0),
@@ -507,7 +507,7 @@ void kpToolToolBar::slotToolActionActivated ()
 
     if (m_currentTool)
     {
-        // If the user clicks on the same KToggleAction, it unchecks it
+        // If the user clicks on the same TDEToggleAction, it unchecks it
         // - this is inconsistent with the Tool Box so always make sure it's
         // checked.
         kpToolAction *action = m_currentTool->action ();
@@ -620,7 +620,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
         }
     }
 
-    KToolBar::setOrientation (o);
+    TDEToolBar::setOrientation (o);
 }
 
 // private
diff --git a/kolourpaint/widgets/kptooltoolbar.h b/kolourpaint/widgets/kptooltoolbar.h
index 0607a377..3777c1fa 100644
--- a/kolourpaint/widgets/kptooltoolbar.h
+++ b/kolourpaint/widgets/kptooltoolbar.h
@@ -51,7 +51,7 @@ class kpToolWidgetLineWidth;
 class kpToolWidgetOpaqueOrTransparent;
 class kpToolWidgetSpraycanSize;
 
-class kpToolToolBar : public KToolBar
+class kpToolToolBar : public TDEToolBar
 {
 Q_OBJECT