Rename a number of classes to enhance compatibility with KDE4

140 files changed, 1066 insertions, 1066 deletions

diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index f7481526..58d47734 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -51,8 +51,8 @@ KKameraConfig *KKameraConfig::m_instance = NULL;
 KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &)
 	: TDECModule(KKameraConfigFactory::instance(), parent, name)
 {
-	m_devicePopup = new KPopupMenu(this);
-	m_actions = new KActionCollection(this);
+	m_devicePopup = new TDEPopupMenu(this);
+	m_actions = new TDEActionCollection(this);
 	m_config = new KSimpleConfig(KProtocolInfo::config("camera"));
 	
 	m_context = gp_context_new();
@@ -100,7 +100,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
 	TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0);
 	topLayout->setAutoAdd(true);
 	
-	m_toolbar = new KToolBar(this, "ToolBar");
+	m_toolbar = new TDEToolBar(this, "ToolBar");
 	m_toolbar->setMovingEnabled(false);
 	
 	// create list of devices
@@ -116,26 +116,26 @@ void KKameraConfig::displayGPSuccessDialogue(void)
 	m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	
 	// create actions
-	KAction *act;
+	TDEAction *act;
 	
-	act = new KAction(i18n("Add"), "camera", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
+	act = new TDEAction(i18n("Add"), "camera", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
 	act->setWhatsThis(i18n("Click this button to add a new camera."));
 	act->plug(m_toolbar);
 	m_toolbar->insertLineSeparator();
-	act = new KAction(i18n("Test"), "camera_test", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_testCamera()), m_actions, "camera_test");
+	act = new TDEAction(i18n("Test"), "camera_test", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_testCamera()), m_actions, "camera_test");
 	act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
 	act->plug(m_toolbar);
-	act = new KAction(i18n("Remove"), "edittrash", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove");
+	act = new TDEAction(i18n("Remove"), "edittrash", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove");
 	act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
 	act->plug(m_toolbar);
-	act = new KAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure");
+	act = new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure");
 	act->setWhatsThis(i18n("Click this button to change the configuration of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model."));
 	act->plug(m_toolbar);
-	act = new KAction(i18n("Information"), "hwinfo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
+	act = new TDEAction(i18n("Information"), "hwinfo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
 	act->setWhatsThis(i18n("Click this button to view a summary of the current status of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model."));
 	act->plug(m_toolbar);
 	m_toolbar->insertLineSeparator();
-	act = new KAction(i18n("Cancel"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
+	act = new TDEAction(i18n("Cancel"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
 	act->setWhatsThis(i18n("Click this button to cancel the current camera operation."));
 	act->setEnabled(false);
 	act->plug(m_toolbar);
diff --git a/kamera/kcontrol/kamera.h b/kamera/kcontrol/kamera.h
index 66dd054e..38e46c10 100644
--- a/kamera/kcontrol/kamera.h
+++ b/kamera/kcontrol/kamera.h
@@ -40,9 +40,9 @@ class KCamera;
 class KameraDeviceSelectDialog;
 class KSimpleConfig;
 class KIconView;
-class KActionCollection;
-class KToolBar;
-class KPopupMenu;
+class TDEActionCollection;
+class TDEToolBar;
+class TDEPopupMenu;
 
 class KKameraConfig : public TDECModule
 {
@@ -101,10 +101,10 @@ private:
 
 	// widgets for the cameras listview
 	KIconView *m_deviceSel;
-	KActionCollection *m_actions;
+	TDEActionCollection *m_actions;
 	TQPushButton *m_addCamera, *m_removeCamera, *m_testCamera, *m_configureCamera;
-	KToolBar *m_toolbar;
-	KPopupMenu *m_devicePopup;
+	TDEToolBar *m_toolbar;
+	TDEPopupMenu *m_devicePopup;
 
 	// true if libgphoto2 was initialised successfully in
 	// the constructor
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 572e819a..8a76b37f 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -288,7 +288,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
 	TQHBoxLayout *topLayout = new TQHBoxLayout(page, 0, KDialog::spacingHint());
 
 	// the models list
-	m_modelSel = new KListView(page);
+	m_modelSel = new TDEListView(page);
 	topLayout->addWidget( m_modelSel );
 	m_modelSel->addColumn(i18n("Supported Cameras"));
 	m_modelSel->setColumnWidthMode(0, TQListView::Maximum);
diff --git a/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h
index 5ee6fea8..9db8b4c5 100644
--- a/kamera/kcontrol/kameradevice.h
+++ b/kamera/kcontrol/kameradevice.h
@@ -29,7 +29,7 @@
 
 class TDEConfig;
 class TQString;
-class KListView;
+class TDEListView;
 class TQWidgetStack;
 class TQVButtonGroup;
 class TQVGroupBox;
@@ -105,7 +105,7 @@ protected:
 	void setPortType(int type);
 
 	// port settings widgets
-	KListView *m_modelSel;
+	TDEListView *m_modelSel;
 	TQLineEdit *m_nameEdit;
 	TQWidgetStack *m_settingsStack;
 	TQVButtonGroup *m_portSelectGroup;
diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp
index 8e62a2d6..7ecc032e 100644
--- a/kcoloredit/kcoloredit.cpp
+++ b/kcoloredit/kcoloredit.cpp
@@ -40,7 +40,7 @@
 #include <kstatusbar.h>
 
 
-KColorEditApp::KColorEditApp() : KMainWindow(0) {
+KColorEditApp::KColorEditApp() : TDEMainWindow(0) {
   config=kapp->config();
 
   ///////////////////////////////////////////////////////////////////
@@ -74,7 +74,7 @@ void KColorEditApp::initActions()
   m_actRecent = KStdAction::openRecent( TQT_TQOBJECT(this),
           TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() );
 
-  ( void ) new KAction( i18n("New &Window"), kapp->miniIcon(), KShortcut(),
+  ( void ) new TDEAction( i18n("New &Window"), kapp->miniIcon(), TDEShortcut(),
           TQT_TQOBJECT(this), TQT_SLOT( slotFileNewWindow() ), actionCollection(),
           "file_new_window" );
 
@@ -89,14 +89,14 @@ void KColorEditApp::initActions()
   m_actPaste->setEnabled( false );
 
   // Color Menu
-  m_actNames = new KToggleAction( i18n("Show &Color Names"), KShortcut(), TQT_TQOBJECT(this),
+  m_actNames = new TDEToggleAction( i18n("Show &Color Names"), TDEShortcut(), TQT_TQOBJECT(this),
           TQT_SLOT( slotViewColorNames() ), actionCollection(),
           "color_view_names" );
   m_actNames->setCheckedState(i18n("Hide &Color Names"));
-  m_actPalette = new KAction( i18n("From &Palette"), KShortcut(), TQT_TQOBJECT(this),
+  m_actPalette = new TDEAction( i18n("From &Palette"), TDEShortcut(), TQT_TQOBJECT(this),
           TQT_SLOT( slotColorFromPalette() ), actionCollection(),
           "color_from_palette" );
-  ( void ) new KAction( i18n("From &Screen"), KShortcut(), TQT_TQOBJECT(this),
+  ( void ) new TDEAction( i18n("From &Screen"), TDEShortcut(), TQT_TQOBJECT(this),
           TQT_SLOT( slotColorFromScreen() ), actionCollection(),
           "color_from_screen" );
 }
@@ -125,7 +125,7 @@ void KColorEditApp::initDocument()
 void KColorEditApp::initView()
 {
   ////////////////////////////////////////////////////////////////////
-  // create the main widget here that is managed by KMainWindow's view-region
+  // create the main widget here that is managed by TDEMainWindow's view-region
   // and connect the widget to your document to display document contents.
 
   view = new KColorEditView(this);
@@ -303,7 +303,7 @@ void KColorEditApp::slotQuit()
   saveOptions();
   // close the first window, the list makes the next one the first again.
   // This ensures that queryClose() is called on each window to ask for closing
-  KMainWindow* w;
+  TDEMainWindow* w;
   if(memberList)
   {
     for(w=memberList->first(); w!=0; w=memberList->next())
@@ -357,7 +357,7 @@ void KColorEditApp::mouseReleaseEvent(TQMouseEvent* event) {
 		color.setComponents(rgbColor.red(), rgbColor.green(), rgbColor.blue());
 		view->chooseColor(&color);
 	} else
-		KMainWindow::mouseReleaseEvent(event);
+		TDEMainWindow::mouseReleaseEvent(event);
 }
 
 #include "kcoloredit.moc"
diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h
index 59969965..557cdc02 100644
--- a/kcoloredit/kcoloredit.h
+++ b/kcoloredit/kcoloredit.h
@@ -41,17 +41,17 @@ class KColorEditView;
   * window and reads the config file as well as providing a menubar, toolbar
   * and statusbar. An instance of KColorEditView creates your center view, which is connected
   * to the window's Doc object.
-  * KColorEditApp reimplements the methods that KMainWindow provides for main window handling and supports
-  * full session management as well as keyboard accelerator configuration by using KAccel.
-  * @see KMainWindow
+  * KColorEditApp reimplements the methods that TDEMainWindow provides for main window handling and supports
+  * full session management as well as keyboard accelerator configuration by using TDEAccel.
+  * @see TDEMainWindow
   * @see TDEApplication
   * @see TDEConfig
-  * @see KAccel
+  * @see TDEAccel
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
   * @version KDevelop version 0.4 code generation
   */
-class KColorEditApp : public KMainWindow
+class KColorEditApp : public TDEMainWindow
 {
   Q_OBJECT
   
@@ -68,7 +68,7 @@ class KColorEditApp : public KMainWindow
     /** opens a file specified by commandline option
      */
     void openDocumentFile(const char *_cmdl=0);
-    /** returns a pointer to the current document connected to the KMainWindow instance and is used by
+    /** returns a pointer to the current document connected to the TDEMainWindow instance and is used by
      * the View class to access the document object's methods
      */
     KColorEditDoc *document() const;
@@ -92,21 +92,21 @@ class KColorEditApp : public KMainWindow
      * @see initView();
      */
     void initDocument();
-    /** creates the centerwidget of the KMainWindow instance and sets it as the view
+    /** creates the centerwidget of the TDEMainWindow instance and sets it as the view
      */
     void initView();
-    /** queryClose is called by KMainWindow on each closeEvent of a window. Against the
+    /** queryClose is called by TDEMainWindow on each closeEvent of a window. Against the
      * default implementation (only returns true), this calles saveModified() on the document object to ask if the document shall
      * be saved if Modified; on cancel the closeEvent is rejected.
-     * @see KMainWindow#queryClose
-     * @see KMainWindow#closeEvent
+     * @see TDEMainWindow#queryClose
+     * @see TDEMainWindow#closeEvent
      */
     virtual bool queryClose();
-    /** queryExit is called by KMainWindow when the last window of the application is going to be closed during the closeEvent().
+    /** queryExit is called by TDEMainWindow when the last window of the application is going to be closed during the closeEvent().
      * Against the default implementation that just returns true, this calls saveOptions() to save the settings of the last window's
      * properties.
-     * @see KMainWindow#queryExit
-     * @see KMainWindow#closeEvent
+     * @see TDEMainWindow#queryExit
+     * @see TDEMainWindow#closeEvent
      */
     virtual bool queryExit();
 
@@ -168,9 +168,9 @@ class KColorEditApp : public KMainWindow
     /** the configuration object of the application */
     TDEConfig *config;
 
-    KAction *m_actSave, *m_actCut, *m_actCopy, *m_actPaste, *m_actPalette;
-    KToggleAction *m_actNames;
-    KRecentFilesAction *m_actRecent;
+    TDEAction *m_actSave, *m_actCut, *m_actCopy, *m_actPaste, *m_actPalette;
+    TDEToggleAction *m_actNames;
+    TDERecentFilesAction *m_actRecent;
 
     /** view is the main widget which represents your working area. The View
      * class should handle all events of the view widget.  It is kept empty so
diff --git a/kcoloredit/kcoloreditdoc.h b/kcoloredit/kcoloreditdoc.h
index edf5242c..abb499bf 100644
--- a/kcoloredit/kcoloreditdoc.h
+++ b/kcoloredit/kcoloreditdoc.h
@@ -37,7 +37,7 @@ class KColorEditView;
 /**	KColorEditDoc provides a document object for a document-view model.
   *
   * The KColorEditDoc class provides a document object that can be used in conjunction with the classes KColorEditApp and KColorEditView
-  * to create a document-view model for standard TDE applications based on TDEApplication and KMainWindow. Thereby, the document object
+  * to create a document-view model for standard TDE applications based on TDEApplication and TDEMainWindow. Thereby, the document object
   * is created by the KColorEditApp instance and contains the document structure with the according methods for manipulation of the document
   * data by KColorEditView objects. Also, KColorEditDoc contains the methods for serialization of the document data from and to files.
   *
diff --git a/kcoloredit/kcoloreditview.h b/kcoloredit/kcoloreditview.h
index 18709764..a41b0a47 100644
--- a/kcoloredit/kcoloreditview.h
+++ b/kcoloredit/kcoloreditview.h
@@ -34,7 +34,7 @@
 class KColorEditDoc;
 
 /** The KColorEditView class provides the view widget for the KColorEditApp instance.	
- * The View instance inherits TQWidget as a base class and represents the view object of a KMainWindow. As KColorEditView is part of the
+ * The View instance inherits TQWidget as a base class and represents the view object of a TDEMainWindow. As KColorEditView is part of the
  * docuement-view model, it needs a reference to the document object connected with it by the KColorEditApp class to manipulate and display
  * the document structure provided by the KColorEditDoc class.
  * 	
diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp
index bb4a3c23..f753649e 100644
--- a/kcoloredit/kzcolorselector.cpp
+++ b/kcoloredit/kzcolorselector.cpp
@@ -24,7 +24,7 @@
 #include "kzcolorselector.h"
 
 KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *parent, const char *name) :
-	KSelector(o, parent, name) {
+	TDESelector(o, parent, name) {
 	baseColorH = -1;
 	baseColorS = 0;
 	baseColorV = 0;
diff --git a/kcoloredit/kzcolorselector.h b/kcoloredit/kzcolorselector.h
index 13d627c1..6afd369d 100644
--- a/kcoloredit/kzcolorselector.h
+++ b/kcoloredit/kzcolorselector.h
@@ -27,7 +27,7 @@
 /** A widget for selecting a color component
  * @author Artur Rataj
  */
-class KZColorSelector : public KSelector {
+class KZColorSelector : public TDESelector {
    Q_OBJECT
   
 	
diff --git a/kdvi/dviRenderer.h b/kdvi/dviRenderer.h
index 38d4d897..6dc76545 100644
--- a/kdvi/dviRenderer.h
+++ b/kdvi/dviRenderer.h
@@ -27,7 +27,7 @@ class dviRenderer;
 class fontProgressDialog;
 class ghostscript_interface;
 class infoDialog;
-class KAction;
+class TDEAction;
 class KDVIMultiPage;
 class KPrinter;
 class TDEProcess;
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index 0396c09e..eadd9a5f 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -67,11 +67,11 @@ KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQO
   DVIRenderer.setName("DVI renderer");
   setRenderer(&DVIRenderer);
 
-  docInfoAction    = new KAction(i18n("Document &Info"), "info", 0, &DVIRenderer, TQT_SLOT(showInfo()), actionCollection(), "info_dvi");
-  embedPSAction    = new KAction(i18n("Embed External PostScript Files..."), 0, this, TQT_SLOT(slotEmbedPostScript()), actionCollection(), "embed_postscript");
-  new KAction(i18n("Enable All Warnings && Messages"), 0, this, TQT_SLOT(doEnableWarnings()), actionCollection(), "enable_msgs");
-  exportPSAction   = new KAction(i18n("PostScript..."), 0, &DVIRenderer, TQT_SLOT(exportPS()), actionCollection(), "export_postscript");
-  exportPDFAction  = new KAction(i18n("PDF..."), 0, &DVIRenderer, TQT_SLOT(exportPDF()), actionCollection(), "export_pdf");
+  docInfoAction    = new TDEAction(i18n("Document &Info"), "info", 0, &DVIRenderer, TQT_SLOT(showInfo()), actionCollection(), "info_dvi");
+  embedPSAction    = new TDEAction(i18n("Embed External PostScript Files..."), 0, this, TQT_SLOT(slotEmbedPostScript()), actionCollection(), "embed_postscript");
+  new TDEAction(i18n("Enable All Warnings && Messages"), 0, this, TQT_SLOT(doEnableWarnings()), actionCollection(), "enable_msgs");
+  exportPSAction   = new TDEAction(i18n("PostScript..."), 0, &DVIRenderer, TQT_SLOT(exportPS()), actionCollection(), "export_postscript");
+  exportPDFAction  = new TDEAction(i18n("PDF..."), 0, &DVIRenderer, TQT_SLOT(exportPDF()), actionCollection(), "export_pdf");
 
   KStdAction::tipOfDay(this, TQT_SLOT(showTip()), actionCollection(), "help_tipofday");
 
diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h
index 812d56ce..29adbe26 100644
--- a/kdvi/kdvi_multipage.h
+++ b/kdvi/kdvi_multipage.h
@@ -87,10 +87,10 @@ private:
 
   /** Pointers to several actions which are disabled if no file is
       loaded. */
-  KAction      *docInfoAction;
-  KAction      *embedPSAction;
-  KAction      *exportPDFAction;
-  KAction      *exportPSAction;
+  TDEAction      *docInfoAction;
+  TDEAction      *embedPSAction;
+  TDEAction      *exportPDFAction;
+  TDEAction      *exportPSAction;
 };
 
 
diff --git a/kfax/ChangeLog b/kfax/ChangeLog
index 39accef4..8eab19cb 100644
--- a/kfax/ChangeLog
+++ b/kfax/ChangeLog
@@ -19,7 +19,7 @@ Sun Oct  5 22:17:09 1997  Bernd Johannes Wuebben  <wuebben@petit.cornell.edu>
 
 Sun Aug  3 09:55:52 1997  Bernd Johannes Wuebben  <wuebben@petit.cornell.edu>
 
-	* Made kfax work with the new KToolBar etc.
+	* Made kfax work with the new TDEToolBar etc.
 
 Thu Jul 24 20:44:33 1997  Bernd Johannes Wuebben  <wuebben@petit.cornell.edu>
 
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index 9e3479c1..b742a372 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -189,7 +189,7 @@ bool MyApp::x11EventFilter( XEvent * ev)
 }
 
 TopLevel::TopLevel (TQWidget *, const char *name)
-    : KMainWindow (0, name)
+    : TDEMainWindow (0, name)
 {
   setMinimumSize (100, 100);
 
@@ -244,7 +244,7 @@ void TopLevel::setupMenuBar()
           actionCollection() );
   actPrint = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection() );
   KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
-  actAdd = new KAction( i18n( "A&dd..." ), "filenew", KShortcut(), TQT_TQOBJECT(this),
+  actAdd = new TDEAction( i18n( "A&dd..." ), "filenew", TDEShortcut(), TQT_TQOBJECT(this),
       TQT_SLOT( faxAdd() ), actionCollection(), "file_add_fax" );
 
   actRecent->setMaxItems( 5 );
@@ -256,11 +256,11 @@ void TopLevel::setupMenuBar()
   actZoomOut = KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( zoomout() ),
       actionCollection() );
 
-  actRotate = new KAction( i18n( "&Rotate Page" ), "rotate", KShortcut(), TQT_TQOBJECT(this),
+  actRotate = new TDEAction( i18n( "&Rotate Page" ), "rotate", TDEShortcut(), TQT_TQOBJECT(this),
       TQT_SLOT( rotatePage() ), actionCollection(), "view_rotate" );
-  actMirror = new KAction( i18n( "Mirror Page" ), KShortcut(), TQT_TQOBJECT(this),
+  actMirror = new TDEAction( i18n( "Mirror Page" ), TDEShortcut(), TQT_TQOBJECT(this),
       TQT_SLOT( mirrorPage() ), actionCollection(), "view_mirror" );
-  actFlip = new KAction( i18n( "&Flip Page" ), KShortcut(), TQT_TQOBJECT(this),
+  actFlip = new TDEAction( i18n( "&Flip Page" ), TDEShortcut(), TQT_TQOBJECT(this),
       TQT_SLOT( flipPage() ), actionCollection(), "view_flip" );
 
   // Go menu
@@ -560,7 +560,7 @@ void TopLevel::openadd(TQString filename)
 
 void TopLevel::resizeEvent(TQResizeEvent *e)
 {
-  KMainWindow::resizeEvent(e);
+  TDEMainWindow::resizeEvent(e);
 
   resizeView();
 }
diff --git a/kfax/kfax.h b/kfax/kfax.h
index 1b1d2449..2627cff1 100644
--- a/kfax/kfax.h
+++ b/kfax/kfax.h
@@ -38,20 +38,20 @@
 class TQPopupMenu;
 class TDEConfig;
 class KStatusBar;
-class KAction;
-class KRecentFilesAction;
+class TDEAction;
+class TDERecentFilesAction;
 class KPrinter;
 class TQPainter;
 class TQScrollBar;
 
-typedef KToolBar::BarPosition BarPosition;
+typedef TDEToolBar::BarPosition BarPosition;
 
 class MyApp:public TDEApplication {
 public:
    virtual bool x11EventFilter( XEvent * );
 };
 
-class TopLevel : public KMainWindow
+class TopLevel : public TDEMainWindow
 {
     Q_OBJECT
   
@@ -105,10 +105,10 @@ private:
     KURL fileURL;
     KStatusBar *statusbar;
 
-    KRecentFilesAction *actRecent;
-    KAction *actAdd, *actSave, *actSaveAs, *actPrint;
-    KAction *actSize, *actZoomIn, *actZoomOut, *actRotate, *actMirror;
-    KAction *actFlip, *actNext, *actPrev, *actFirst, *actLast;
+    TDERecentFilesAction *actRecent;
+    TDEAction *actAdd, *actSave, *actSaveAs, *actPrint;
+    TDEAction *actSize, *actZoomIn, *actZoomOut, *actRotate, *actMirror;
+    TDEAction *actFlip, *actNext, *actPrev, *actFirst, *actLast;
 
     int open_mode;
 
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index 57b1e7db..97c6965b 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -187,34 +187,34 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     //-- File Menu ----------------------------------------------------------
     KStdAction::saveAs( document(), TQT_SLOT( saveAs() ),
                         actionCollection() );
-    new KAction( i18n( "Document &Info" ), 0,
+    new TDEAction( i18n( "Document &Info" ), 0,
                  miniWidget(), TQT_SLOT( info() ),
                  actionCollection(), "info" );
 
     //-- Edit Menu -----------------------------------------------------
-    _popup = new KPopupMenu( _markList, "marklist_menu" );
+    _popup = new TDEPopupMenu( _markList, "marklist_menu" );
 
-    KAction *act = new KAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
+    TDEAction *act = new TDEAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
                  TQT_TQOBJECT(_markList), TQT_SLOT( markCurrent() ),
                  actionCollection(), "mark_current" );
     act->plug( _popup );
-    act = new KAction( i18n( "Mark &All Pages" ), 0,
+    act = new TDEAction( i18n( "Mark &All Pages" ), 0,
                  TQT_TQOBJECT(_markList), TQT_SLOT( markAll() ),
                  actionCollection(), "mark_all" );
     act->plug( _popup );
-    act = new KAction( i18n( "Mark &Even Pages" ), 0,
+    act = new TDEAction( i18n( "Mark &Even Pages" ), 0,
                  TQT_TQOBJECT(_markList), TQT_SLOT( markEven() ),
                  actionCollection(), "mark_even" );
     act->plug( _popup );
-    act = new KAction( i18n( "Mark &Odd Pages" ), 0,
+    act = new TDEAction( i18n( "Mark &Odd Pages" ), 0,
                  TQT_TQOBJECT(_markList), TQT_SLOT( markOdd() ),
                  actionCollection(), "mark_odd" );
     act->plug( _popup );
-    act = new KAction( i18n( "&Toggle Page Marks" ), 0,
+    act = new TDEAction( i18n( "&Toggle Page Marks" ), 0,
                  TQT_TQOBJECT(_markList), TQT_SLOT( toggleMarks() ),
                  actionCollection(), "toggle" );
     act->plug( _popup );
-    act = new KAction( i18n("&Remove Page Marks"), 0,
+    act = new TDEAction( i18n("&Remove Page Marks"), 0,
                  TQT_TQOBJECT(_markList), TQT_SLOT( removeMarks() ),
                  actionCollection(), "remove" );
     act->plug( _popup );
@@ -222,12 +222,12 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     // TODO -- disable entry if there aren't any page names
 
     //-- View Menu ----------------------------------------------------------
-    _selectOrientation = new KSelectAction( i18n( "&Orientation" ), 0, 0, 0,
+    _selectOrientation = new TDESelectAction( i18n( "&Orientation" ), 0, 0, 0,
                                     actionCollection(), "orientation_menu" );
-    _selectMedia       = new KSelectAction( i18n( "Paper &Size" ), 0, 0, 0,
+    _selectMedia       = new TDESelectAction( i18n( "Paper &Size" ), 0, 0, 0,
                                     actionCollection(), "media_menu" );
 
-    _flick = new KToggleAction( i18n( "No &Flicker" ), 0,
+    _flick = new TDEToggleAction( i18n( "No &Flicker" ), 0,
                                 this, TQT_SLOT( slotFlicker() ),
                                 actionCollection(), "no_flicker" );
     
@@ -245,7 +245,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
              this, TQT_SLOT( slotMedia( int ) ) );
 
     {
-	KShortcut zoomInShort = KStdAccel::zoomIn();
+	TDEShortcut zoomInShort = TDEStdAccel::zoomIn();
 	zoomInShort.append( KKey( CTRL+Key_Equal ) );
 	_zoomIn = KStdAction::zoomIn( this, TQT_SLOT( slotZoomIn() ),
 				    actionCollection(), "zoomIn" );
@@ -253,7 +253,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     }
     _zoomOut = KStdAction::zoomOut( this,  TQT_SLOT( slotZoomOut() ),
                                     actionCollection(), "zoomOut" );
-    _zoomTo = new KSelectAction(  i18n( "Zoom" ), "viewmag", 0, actionCollection(), "zoomTo" );
+    _zoomTo = new TDESelectAction(  i18n( "Zoom" ), "viewmag", 0, actionCollection(), "zoomTo" );
     connect(  _zoomTo, TQT_SIGNAL(  activated(  const TQString & ) ), this, TQT_SLOT(  slotZoom( const TQString& ) ) );
     _zoomTo->setEditable(  true );
     _zoomTo->clear();
@@ -273,18 +273,18 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     _zoomTo->setItems( zooms );
     _zoomTo->setCurrentItem( idx );
 
-    _fitWidth = new KAction( i18n( "&Fit to Page Width" ), 0, this,
+    _fitWidth = new TDEAction( i18n( "&Fit to Page Width" ), 0, this,
 	    TQT_SLOT( slotFitToPage() ), actionCollection(),
 	    "fit_to_page");
-    _fitScreen = new KAction( i18n( "&Fit to Screen" ), Key_S, this,
+    _fitScreen = new TDEAction( i18n( "&Fit to Screen" ), Key_S, this,
 	    TQT_SLOT( slotFitToScreen() ), actionCollection(),
 	    "fit_to_screen");
 
-    _prevPage  = new KAction( i18n( "Previous Page" ), CTRL+Key_PageUp, this, TQT_SLOT( slotPrevPage() ),
+    _prevPage  = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, this, TQT_SLOT( slotPrevPage() ),
                                     actionCollection(), "prevPage" );
     _prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) );
 
-    _nextPage  = new KAction( i18n( "Next Page" ), CTRL + Key_PageDown, this, TQT_SLOT( slotNextPage() ),
+    _nextPage  = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, this, TQT_SLOT( slotNextPage() ),
                                    actionCollection(), "nextPage" );
     _nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
 
@@ -296,15 +296,15 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
                                    actionCollection(), "goToEnd" );
     _lastPage->setWhatsThis( i18n( "Moves to the last page of the document" ) );
 
-    KShortcut readUpShort = KStdAccel::shortcut( KStdAccel::Prior );
+    TDEShortcut readUpShort = TDEStdAccel::shortcut( TDEStdAccel::Prior );
     readUpShort.append( KKey( SHIFT+Key_Space ) );
-    _readUp    = new KAction( i18n( "Read Up" ), "up",
+    _readUp    = new TDEAction( i18n( "Read Up" ), "up",
                               readUpShort, this, TQT_SLOT( slotReadUp() ),
                               actionCollection(), "readUp" );
 
-    KShortcut readDownShort = KStdAccel::shortcut( KStdAccel::Next );
+    TDEShortcut readDownShort = TDEStdAccel::shortcut( TDEStdAccel::Next );
     readDownShort.append( KKey( Key_Space ) );
-    _readDown  = new KAction( i18n( "Read Down" ), "down",
+    _readDown  = new TDEAction( i18n( "Read Down" ), "down",
                               readDownShort, this, TQT_SLOT( slotReadDown() ),
                               actionCollection(), "readDown" );
 
@@ -312,16 +312,16 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
                                       actionCollection(), "goToPage" );
 
     //-- Settings Menu ------------------------------------------------------
-    _showScrollBars = new KToggleAction( i18n( "Show &Scrollbars" ), 0,
+    _showScrollBars = new TDEToggleAction( i18n( "Show &Scrollbars" ), 0,
                                 actionCollection(), "show_scrollbars" );
     _showScrollBars->setCheckedState(i18n("Hide &Scrollbars"));
-    _watchFile	    = new KToggleAction( i18n( "&Watch File" ), 0,
+    _watchFile	    = new TDEToggleAction( i18n( "&Watch File" ), 0,
                                 this, TQT_SLOT( slotWatchFile() ),
                                 actionCollection(), "watch_file" );
-    _showPageList   = new KToggleAction( i18n( "Show &Page List" ), 0,
+    _showPageList   = new TDEToggleAction( i18n( "Show &Page List" ), 0,
                                 actionCollection(), "show_page_list" );
     _showPageList->setCheckedState(i18n("Hide &Page List"));
-    _showPageLabels = new KToggleAction( i18n("Show Page &Labels"), 0,
+    _showPageLabels = new TDEToggleAction( i18n("Show Page &Labels"), 0,
                                 actionCollection(), "show_page_labels" );
     _showPageLabels->setCheckedState(i18n("Hide Page &Labels"));
     KStdAction::preferences( this, TQT_SLOT( slotConfigure() ), actionCollection() );
diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h
index e9feb249..ee863731 100644
--- a/kghostview/kgv_view.h
+++ b/kghostview/kgv_view.h
@@ -32,13 +32,13 @@ class TQFrame;
 class TQWidget;
 
 class TDEAboutData;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 class KDirWatch;
 class TDEInstance;
-class KPopupMenu;
-class KSelectAction;
-class KToggleAction;
+class TDEPopupMenu;
+class TDESelectAction;
+class TDEToggleAction;
 
 class KGVBrowserExtension;
 class KGVConfigDialog;
@@ -187,26 +187,26 @@ private:
 
     TQTimer*		_fitTimer;
 
-    KSelectAction* _selectOrientation;
-    KSelectAction* _selectMedia;
-    KAction*       _zoomIn;
-    KAction*       _zoomOut;
-    KSelectAction* _zoomTo;
-    KAction *      _fitWidth;
-    KAction *      _fitScreen;
-    KAction*       _prevPage;
-    KAction*       _nextPage;
-    KAction*       _firstPage;
-    KAction*       _lastPage;
-    KAction*       _readUp;
-    KAction*       _readDown;
-    KAction*       _gotoPage;
-    KToggleAction* _showScrollBars;
-    KToggleAction* _watchFile;
-    KToggleAction* _flick;
-    KToggleAction* _showPageList;
-    KToggleAction* _showPageLabels;
-    KPopupMenu*    _popup;
+    TDESelectAction* _selectOrientation;
+    TDESelectAction* _selectMedia;
+    TDEAction*       _zoomIn;
+    TDEAction*       _zoomOut;
+    TDESelectAction* _zoomTo;
+    TDEAction *      _fitWidth;
+    TDEAction *      _fitScreen;
+    TDEAction*       _prevPage;
+    TDEAction*       _nextPage;
+    TDEAction*       _firstPage;
+    TDEAction*       _lastPage;
+    TDEAction*       _readUp;
+    TDEAction*       _readDown;
+    TDEAction*       _gotoPage;
+    TDEToggleAction* _showScrollBars;
+    TDEToggleAction* _watchFile;
+    TDEToggleAction* _flick;
+    TDEToggleAction* _showPageList;
+    TDEToggleAction* _showPageLabels;
+    TDEPopupMenu*    _popup;
 
     TQFile             _tmpFile;
     TDEIO::TransferJob* _job;
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 75f27dad..2cf72258 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -75,11 +75,11 @@ KGVShell::KGVShell() :
 	    KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() );
 
     /*---- View -----------------------------------------------------------*/
-            new KAction( i18n(  "&Reload" ), "reload",
-		    KStdAccel::shortcut( KStdAccel::Reload ),
+            new TDEAction( i18n(  "&Reload" ), "reload",
+		    TDEStdAccel::shortcut( TDEStdAccel::Reload ),
 		    m_gvpart, TQT_SLOT(  reloadFile() ),
 		    actionCollection(), "reload" );
-	    new KAction( i18n( "&Maximize" ), Key_M, TQT_TQOBJECT(this),
+	    new TDEAction( i18n( "&Maximize" ), Key_M, TQT_TQOBJECT(this),
 			 TQT_SLOT( slotMaximize() ), actionCollection(),
 			 "maximize");
     _showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection() );
@@ -93,14 +93,14 @@ KGVShell::KGVShell() :
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
     m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
 #else
-    m_fullScreenAction = new KToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) );
+    m_fullScreenAction = new TDEToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) );
 #endif
     KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
     KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
 actionCollection());
 
-    //_popup = new KPopupMenu( i18n( "Full Screen Options" ), this, "rmb popup" );
-    _popup = new KPopupMenu( this, "rmb popup" );
+    //_popup = new TDEPopupMenu( i18n( "Full Screen Options" ), this, "rmb popup" );
+    _popup = new TDEPopupMenu( this, "rmb popup" );
     _popup->insertTitle( i18n( "Full Screen Options" ) );
     m_fullScreenAction->plug( _popup );
     _showMenuBarAction->plug( _popup );
@@ -339,7 +339,7 @@ void KGVShell::slotUpdateFullScreen()
 	m_gvpart->updateFullScreen( false );
 	menuBar()->show();
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
-	KToggleAction *statusbarAction = dynamic_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar)));
+	TDEToggleAction *statusbarAction = dynamic_cast<TDEToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar)));
 	assert( statusbarAction );
 	if (statusbarAction->isChecked()) statusBar()->show();
 #endif
diff --git a/kghostview/kgvshell.h b/kghostview/kgvshell.h
index 0f1fa60f..f273cfbb 100644
--- a/kghostview/kgvshell.h
+++ b/kghostview/kgvshell.h
@@ -25,13 +25,13 @@
 
 class TQTimer;
 
-class KRecentFilesAction;
+class TDERecentFilesAction;
 class ScrollBox;
 class KGVPart;
-class KAction;
+class TDEAction;
 class TDEConfig;
 class KTempFile;
-class KPopupMenu;
+class TDEPopupMenu;
 class DisplayOptions;
 class FullScreenFilter;
 
@@ -79,12 +79,12 @@ private:
     KGVPart* m_gvpart;
     TQString cwd;
 
-    KAction* openact;
-    KToggleAction* _showMenuBarAction;
-    KToggleAction* m_fullScreenAction;
+    TDEAction* openact;
+    TDEToggleAction* _showMenuBarAction;
+    TDEToggleAction* m_fullScreenAction;
     FullScreenFilter* m_fsFilter;
-    KPopupMenu* _popup;
-    KRecentFilesAction* recent;
+    TDEPopupMenu* _popup;
+    TDERecentFilesAction* recent;
     KTempFile* _tmpFile; // Used for storing data received from stdin
 };
 
diff --git a/kiconedit/kiconconfig.h b/kiconedit/kiconconfig.h
index f9551d70..70e05f76 100644
--- a/kiconedit/kiconconfig.h
+++ b/kiconedit/kiconconfig.h
@@ -32,7 +32,7 @@
 #include "config.h"
 #endif
 
-class KAccel;
+class TDEAccel;
 class KKeyChooser;
 class KColorButton;
 class KURLRequester;
diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp
index 0afd63c4..c51e0d58 100644
--- a/kiconedit/kiconedit.cpp
+++ b/kiconedit/kiconedit.cpp
@@ -34,7 +34,7 @@
 WindowList KIconEdit::windowList;
 
 KIconEdit::KIconEdit(const TQImage image, const char *name)
- : KMainWindow(0, name)
+ : TDEMainWindow(0, name)
 {
     init();
     img = image;
@@ -44,7 +44,7 @@ KIconEdit::KIconEdit(const TQImage image, const char *name)
 }
 
 KIconEdit::KIconEdit(KURL url, const char *name)
- : KMainWindow(0, name)
+ : TDEMainWindow(0, name)
 {
     init();
     icon->open(&img, url);
@@ -234,12 +234,12 @@ void KIconEdit::setupActions()
 {
   kdDebug(4640) << "setupActions" << endl;
 
-  KAction *action;
-  KRadioAction *toolAction;
-  KShortcut cut;
+  TDEAction *action;
+  TDERadioAction *toolAction;
+  TDEShortcut cut;
 
   // File Menu
-  action = new KAction(i18n("New &Window"), "window_new", cut,
+  action = new TDEAction(i18n("New &Window"), "window_new", cut,
       TQT_TQOBJECT(this),  TQT_SLOT(slotNewWin()), actionCollection(), "file_new_window");
   action->setWhatsThis(i18n("New window\n\nOpens a new icon editor window."));
 
@@ -284,18 +284,18 @@ void KIconEdit::setupActions()
        "(Tip: Select \"Paste transparent pixels\" in the configuration dialog"
        " if you also want to paste transparency.)"));
 
-  m_actPasteNew = new KAction( i18n( "Paste as &New" ), cut, TQT_TQOBJECT(grid),
+  m_actPasteNew = new TDEAction( i18n( "Paste as &New" ), cut, TQT_TQOBJECT(grid),
       TQT_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" );
 
   KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actionCollection());
   KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection());
 
-  action = new KAction(i18n("Resi&ze..."), "transform", cut,
+  action = new TDEAction(i18n("Resi&ze..."), "transform", cut,
       TQT_TQOBJECT(grid),  TQT_SLOT(editResize()), actionCollection(), "edit_resize");
   action->setWhatsThis(i18n("Resize\n\nSmoothly resizes the icon while"
       " trying to preserve the contents"));
 
-  action = new KAction(i18n("&GrayScale"), "grayscale", cut,
+  action = new TDEAction(i18n("&GrayScale"), "grayscale", cut,
       TQT_TQOBJECT(grid),  TQT_SLOT(grayScale()), actionCollection(), "edit_grayscale");
   action->setWhatsThis(i18n("Gray scale\n\nGray scale the current icon.\n"
       "(Warning: The result is likely to contain colors not in the icon"
@@ -310,23 +310,23 @@ void KIconEdit::setupActions()
       actionCollection());
   m_actZoomOut->setWhatsThis(i18n("Zoom out\n\nZoom out by one."));
 
-  KActionMenu *actMenu = new KActionMenu( i18n( "&Zoom" ), "viewmag",
+  TDEActionMenu *actMenu = new TDEActionMenu( i18n( "&Zoom" ), "viewmag",
       actionCollection(), "view_zoom" );
 
   // xgettext:no-c-format
-  action = new KAction( i18n( "100%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom1() ),
+  action = new TDEAction( i18n( "100%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom1() ),
       actionCollection(), "view_zoom_1" );
   actMenu->insert( action );
   // xgettext:no-c-format
-  action = new KAction( i18n( "200%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom2() ),
+  action = new TDEAction( i18n( "200%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom2() ),
       actionCollection(), "view_zoom_2" );
   actMenu->insert( action );
   // xgettext:no-c-format
-  action = new KAction( i18n( "500%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom5() ),
+  action = new TDEAction( i18n( "500%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom5() ),
       actionCollection(), "view_zoom_5" );
   actMenu->insert( action );
   // xgettext:no-c-format
-  action = new KAction( i18n( "1000%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom10() ),
+  action = new TDEAction( i18n( "1000%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom10() ),
       actionCollection(), "view_zoom_10" );
   actMenu->insert( action );
 
@@ -338,9 +338,9 @@ void KIconEdit::setupActions()
 
   createStandardStatusBarAction();
 
-  KToggleAction *toggle;
+  TDEToggleAction *toggle;
 
-  toggle = new KToggleAction( i18n( "Show &Grid" ), "grid",
+  toggle = new TDEToggleAction( i18n( "Show &Grid" ), "grid",
       cut, TQT_TQOBJECT(this), TQT_SLOT( slotShowGrid() ), actionCollection(),
       "options_show_grid" );
   toggle->setCheckedState(i18n("Hide &Grid"));
@@ -349,14 +349,14 @@ void KIconEdit::setupActions()
   toggle->setChecked( KIconEditProperties::self()->showGrid() );
 
   // Tools Menu
-  toolAction = new KRadioAction(i18n("Color Picker"), "colorpicker",
+  toolAction = new TDERadioAction(i18n("Color Picker"), "colorpicker",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolPointer()), actionCollection(),
       "tool_find_pixel");
   toolAction->setExclusiveGroup("toolActions");
   toolAction->setWhatsThis(i18n("Color Picker\n\nThe color of the pixel clicked"
       " on will be the current draw color"));
 
-  toolAction = new KRadioAction(i18n("Freehand"), "paintbrush",
+  toolAction = new TDERadioAction(i18n("Freehand"), "paintbrush",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFreehand()), actionCollection(),
       "tool_freehand");
   toolAction->setExclusiveGroup("toolActions");
@@ -365,64 +365,64 @@ void KIconEdit::setupActions()
   toolAction->setChecked( true );
   grid->setTool(KIconEditGrid::Freehand);
 
-  toolAction = new KRadioAction(i18n("Rectangle"), "rectangle",
+  toolAction = new TDERadioAction(i18n("Rectangle"), "rectangle",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolRectangle()), actionCollection(),
       "tool_rectangle");
   toolAction->setExclusiveGroup("toolActions");
   toolAction->setWhatsThis(i18n("Rectangle\n\nDraw a rectangle"));
 
-  toolAction = new KRadioAction(i18n("Filled Rectangle"), "filledrectangle",
+  toolAction = new TDERadioAction(i18n("Filled Rectangle"), "filledrectangle",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledRectangle()), actionCollection(),
       "tool_filled_rectangle");
   toolAction->setExclusiveGroup("toolActions");
   toolAction->setWhatsThis(i18n("Filled rectangle\n\nDraw a filled rectangle"));
 
-  toolAction = new KRadioAction(i18n("Circle"), "circle",
+  toolAction = new TDERadioAction(i18n("Circle"), "circle",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolCircle()), actionCollection(),
       "tool_circle");
   toolAction->setExclusiveGroup("toolActions");
   toolAction->setWhatsThis(i18n("Circle\n\nDraw a circle"));
 
-  toolAction = new KRadioAction(i18n("Filled Circle"), "filledcircle",
+  toolAction = new TDERadioAction(i18n("Filled Circle"), "filledcircle",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledCircle()), actionCollection(),
       "tool_filled_circle");
   toolAction->setExclusiveGroup("toolActions");
   toolAction->setWhatsThis(i18n("Filled circle\n\nDraw a filled circle"));
 
-  toolAction = new KRadioAction(i18n("Ellipse"), "ellipse",
+  toolAction = new TDERadioAction(i18n("Ellipse"), "ellipse",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolEllipse()), actionCollection(),
       "tool_ellipse");
   toolAction->setExclusiveGroup("toolActions");
   toolAction->setWhatsThis(i18n("Ellipse\n\nDraw an ellipse"));
 
-  toolAction = new KRadioAction(i18n("Filled Ellipse"), "filledellipse",
+  toolAction = new TDERadioAction(i18n("Filled Ellipse"), "filledellipse",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledEllipse()), actionCollection(),
       "tool_filled_ellipse");
   toolAction->setExclusiveGroup("toolActions");
   toolAction->setWhatsThis(i18n("Filled ellipse\n\nDraw a filled ellipse"));
 
-  toolAction = new KRadioAction(i18n("Spray"), "airbrush",
+  toolAction = new TDERadioAction(i18n("Spray"), "airbrush",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolSpray()), actionCollection(),
       "tool_spray");
   toolAction->setExclusiveGroup("toolActions");
   toolAction->setWhatsThis(i18n("Spray\n\nDraw scattered pixels in the"
       " current color"));
 
-  toolAction = new KRadioAction(i18n("Flood Fill"), "fill",
+  toolAction = new TDERadioAction(i18n("Flood Fill"), "fill",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFlood()), actionCollection(),
       "tool_flood_fill");
   toolAction->setExclusiveGroup("toolActions");
   toolAction->setWhatsThis(i18n("Flood fill\n\nFill adjoining pixels with"
       " the same color with the current color"));
 
-  toolAction = new KRadioAction(i18n("Line"), "line",
+  toolAction = new TDERadioAction(i18n("Line"), "line",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolLine()), actionCollection(),
       "tool_line");
   toolAction->setExclusiveGroup("toolActions");
   toolAction->setWhatsThis(i18n("Line\n\nDraw a straight line vertically,"
       " horizontally or at 45 deg. angles"));
 
-  toolAction = new KRadioAction(i18n("Eraser (Transparent)"), "eraser",
+  toolAction = new TDERadioAction(i18n("Eraser (Transparent)"), "eraser",
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolEraser()), actionCollection(),
       "tool_eraser");
   toolAction->setExclusiveGroup("toolActions");
@@ -431,14 +431,14 @@ void KIconEdit::setupActions()
       " different tool, first click on \"Erase\" then on the tool you want"
       " to use)"));
 
-  toolAction = new KRadioAction(i18n("Rectangular Selection"),
+  toolAction = new TDERadioAction(i18n("Rectangular Selection"),
       "selectrect", cut, TQT_TQOBJECT(this),  TQT_SLOT(slotToolSelectRect()),
       actionCollection(), "edit_select_rectangle");
   toolAction->setExclusiveGroup( "toolActions" );
   toolAction->setWhatsThis(i18n("Select\n\nSelect a rectangular section"
       " of the icon using the mouse."));
 
-  toolAction = new KRadioAction(i18n("Circular Selection"),
+  toolAction = new TDERadioAction(i18n("Circular Selection"),
       "selectcircle", cut, TQT_TQOBJECT(this),  TQT_SLOT(slotToolSelectCircle()),
       actionCollection(), "edit_select_circle");
   toolAction->setExclusiveGroup( "toolActions" );
diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h
index 746090db..1b057b17 100644
--- a/kiconedit/kiconedit.h
+++ b/kiconedit/kiconedit.h
@@ -56,7 +56,7 @@ class PaletteToolBar;
 * @author Thomas Tanghus <tanghus@kde.org>
 * @version 0.4
 */
-class KIconEdit : public KMainWindow
+class KIconEdit : public TDEMainWindow
 {
     Q_OBJECT
   
@@ -150,9 +150,9 @@ protected:
   TQImage img;
   TQString m_name;
 
-  KAction *m_actCopy, *m_actPaste, *m_actCut, *m_actPasteNew;
-  KAction *m_actZoomIn, *m_actZoomOut;
-  KRecentFilesAction *m_actRecent;
+  TDEAction *m_actCopy, *m_actPaste, *m_actCut, *m_actPasteNew;
+  TDEAction *m_actZoomIn, *m_actZoomOut;
+  TDERecentFilesAction *m_actRecent;
 };
 
 #endif //__KICONEDIT_H__
diff --git a/kiconedit/kiconeditslots.cpp b/kiconedit/kiconeditslots.cpp
index f0c42eb3..c46f892f 100644
--- a/kiconedit/kiconeditslots.cpp
+++ b/kiconedit/kiconeditslots.cpp
@@ -256,7 +256,7 @@ void KIconEdit::slotCut()
 
 void KIconEdit::slotPaste()
 {
-    static_cast<KRadioAction*>(actionCollection()
+    static_cast<TDERadioAction*>(actionCollection()
         ->action("tool_find_pixel"))->setChecked(true);
     grid->setTool(KIconEditGrid::Find);
     grid->editPaste();
diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp
index 23e0603f..eee9b87b 100644
--- a/kiconedit/palettetoolbar.cpp
+++ b/kiconedit/palettetoolbar.cpp
@@ -31,7 +31,7 @@
 #include "palettetoolbar.h"
 
 PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
-    : KToolBar( parent, name )
+    : TDEToolBar( parent, name )
 {
   TQWidget *base = new TQWidget( this );
 
diff --git a/kiconedit/palettetoolbar.h b/kiconedit/palettetoolbar.h
index 6d1e3166..b54a2ac9 100644
--- a/kiconedit/palettetoolbar.h
+++ b/kiconedit/palettetoolbar.h
@@ -29,7 +29,7 @@ class TQLabel;
 class KSysColors;
 class KCustomColors;
 
-class PaletteToolBar : public KToolBar
+class PaletteToolBar : public TDEToolBar
 {
   Q_OBJECT
   
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
   
diff --git a/kooka/dwmenuaction.cpp b/kooka/dwmenuaction.cpp
index da0cee48..c8e75c00 100644
--- a/kooka/dwmenuaction.cpp
+++ b/kooka/dwmenuaction.cpp
@@ -31,10 +31,10 @@
 #include "dwmenuaction.moc"
 //-------------------------------------
 
-dwMenuAction::dwMenuAction( const TQString& text, const KShortcut& cut,
+dwMenuAction::dwMenuAction( const TQString& text, const TDEShortcut& cut,
 			    KDockWidget *dw,TQObject* parent,
 			    KDockMainWindow *mw, const char* name )
-    :KToggleAction(text,cut,parent,name),m_dw(dw),m_mw(mw)
+    :TDEToggleAction(text,cut,parent,name),m_dw(dw),m_mw(mw)
 {
     connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
     connect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged()));
diff --git a/kooka/dwmenuaction.h b/kooka/dwmenuaction.h
index fa9b9d66..0430eb29 100644
--- a/kooka/dwmenuaction.h
+++ b/kooka/dwmenuaction.h
@@ -35,18 +35,18 @@
 
 /**
  * This class is just a helper class since the KDockWidget classes do not yet
- * export KActions but only a TQPopup-Pointer, which is quite useless in case
+ * export TDEActions but only a TQPopup-Pointer, which is quite useless in case
  * you have a xml-file driven gui.
  * This class provides Actions for show and hide parts of the GUI (dockwidgets)
  * Maybe that classes can be removed as soon the DockWidget know Actions
  */
-class dwMenuAction:public KToggleAction
+class dwMenuAction:public TDEToggleAction
 {
    Q_OBJECT
   
 public:
    dwMenuAction( const TQString& text,
-		 const KShortcut& cut = KShortcut(),
+		 const TDEShortcut& cut = TDEShortcut(),
 		 KDockWidget *dw=0, TQObject* parent = 0,
 		 KDockMainWindow * mw=0, const char* name = 0 );
    virtual ~dwMenuAction();
diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp
index 70ff9b21..018fa120 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -137,26 +137,26 @@ actionCollection());
     m_view->createDockMenu(actionCollection(), this, "settings_show_docks" );
 
     /* Image Viewer action Toolbar - OCR, Scaling etc. */
-    (void) new KAction(i18n("&OCR Image..."), "ocr", CTRL+Key_O,
+    (void) new TDEAction(i18n("&OCR Image..."), "ocr", CTRL+Key_O,
 		       m_view, TQT_SLOT(doOCR()),
 		       actionCollection(), "ocrImage" );
 
-    (void) new KAction(i18n("O&CR on Selection..."), "ocr-select", CTRL+Key_C,
+    (void) new TDEAction(i18n("O&CR on Selection..."), "ocr-select", CTRL+Key_C,
 		       m_view, TQT_SLOT(doOCRonSelection()),
 		       actionCollection(), "ocrImageSelect" );
 
-    KAction *act;
-    act =  new KAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I,
+    TDEAction *act;
+    act =  new TDEAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I,
 		       m_view, TQT_SLOT( slIVScaleToWidth()),
 		       actionCollection(), "scaleToWidth" );
     m_view->connectViewerAction( act );
 
-    act = new KAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H,
+    act = new TDEAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H,
 		       m_view, TQT_SLOT( slIVScaleToHeight()),
 		       actionCollection(), "scaleToHeight" );
     m_view->connectViewerAction( act );
 
-    act = new KAction(i18n("Original &Size"), "scaleorig", CTRL+Key_S,
+    act = new TDEAction(i18n("Original &Size"), "scaleorig", CTRL+Key_S,
                       m_view, TQT_SLOT( slIVScaleOriginal()),
                       actionCollection(), "scaleOriginal" );
     m_view->connectViewerAction( act );
@@ -166,10 +166,10 @@ actionCollection());
     TQIconSet lockSet;
     lockSet.setPixmap(BarIcon("lock")  , TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::On );
     lockSet.setPixmap(BarIcon("unlock"), TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::Off);
-    act = new KToggleAction ( i18n("Keep &Zoom Setting"), lockSet, CTRL+Key_Z,
+    act = new TDEToggleAction ( i18n("Keep &Zoom Setting"), lockSet, CTRL+Key_Z,
                               actionCollection(), "keepZoom" );
 #else
-    act = new KToggleAction( i18n("Keep &Zoom Setting"), BarIcon("lockzoom"), CTRL+Key_Z,
+    act = new TDEToggleAction( i18n("Keep &Zoom Setting"), BarIcon("lockzoom"), CTRL+Key_Z,
                              actionCollection(), "keepZoom" );
 #endif
 
@@ -179,93 +179,93 @@ actionCollection());
     m_view->connectViewerAction( act );
 
     /* thumbview and gallery actions */
-    act = new KAction(i18n("Set Zoom..."), "viewmag", 0,
+    act = new TDEAction(i18n("Set Zoom..."), "viewmag", 0,
 		       TQT_TQOBJECT(m_view), TQT_SLOT( slIVShowZoomDialog()),
 		       actionCollection(), "showZoomDialog" );
     m_view->connectViewerAction( act );
 
-    (void) new KAction(i18n("Create From Selectio&n"), "crop", CTRL+Key_N,
+    (void) new TDEAction(i18n("Create From Selectio&n"), "crop", CTRL+Key_N,
 		       TQT_TQOBJECT(m_view), TQT_SLOT( slCreateNewImgFromSelection() ),
 		       actionCollection(), "createFromSelection" );
 
-    (void) new KAction(i18n("Mirror Image &Vertically"), "mirror-vert", CTRL+Key_V,
+    (void) new TDEAction(i18n("Mirror Image &Vertically"), "mirror-vert", CTRL+Key_V,
 		       TQT_TQOBJECT(this), TQT_SLOT( slMirrorVertical() ),
 		       actionCollection(), "mirrorVertical" );
 
-    (void) new KAction(i18n("&Mirror ImageQt::Horizontally"), "mirror-horiz", CTRL+Key_M,
+    (void) new TDEAction(i18n("&Mirror ImageQt::Horizontally"), "mirror-horiz", CTRL+Key_M,
 		       TQT_TQOBJECT(this), TQT_SLOT( slMirrorHorizontal() ),
 		       actionCollection(), "mirrorHorizontal" );
 
-    (void) new KAction(i18n("Mirror Image &Both Directions"), "mirror-both", CTRL+Key_B,
+    (void) new TDEAction(i18n("Mirror Image &Both Directions"), "mirror-both", CTRL+Key_B,
 		       TQT_TQOBJECT(this), TQT_SLOT( slMirrorBoth() ),
 		       actionCollection(), "mirrorBoth" );
 
-    (void) new KAction(i18n("Open Image in &Graphic Application..."), "fileopen", CTRL+Key_G,
+    (void) new TDEAction(i18n("Open Image in &Graphic Application..."), "fileopen", CTRL+Key_G,
 		       TQT_TQOBJECT(m_view), TQT_SLOT( slOpenCurrInGraphApp() ),
 		       actionCollection(), "openInGraphApp" );
 
-    act = new KAction(i18n("&Rotate Image Clockwise"), "rotate_cw", CTRL+Key_R,
+    act = new TDEAction(i18n("&Rotate Image Clockwise"), "rotate_cw", CTRL+Key_R,
 		      TQT_TQOBJECT(this), TQT_SLOT( slRotateClockWise() ),
 		       actionCollection(), "rotateClockwise" );
     m_view->connectViewerAction( act );
 
-    act = new KAction(i18n("Rotate Image Counter-Clock&wise"), "rotate_ccw", CTRL+Key_W,
+    act = new TDEAction(i18n("Rotate Image Counter-Clock&wise"), "rotate_ccw", CTRL+Key_W,
 		       TQT_TQOBJECT(this), TQT_SLOT( slRotateCounterClockWise() ),
 		       actionCollection(), "rotateCounterClockwise" );
     m_view->connectViewerAction( act );
 
-    act = new KAction(i18n("Rotate Image 180 &Degrees"), "rotate", CTRL+Key_D,
+    act = new TDEAction(i18n("Rotate Image 180 &Degrees"), "rotate", CTRL+Key_D,
 		       TQT_TQOBJECT(this), TQT_SLOT( slRotate180() ),
 		       actionCollection(), "upsitedown" );
     m_view->connectViewerAction( act );
 
     /* Gallery actions */
-    act = new KAction(i18n("&Create Folder..."), "folder_new", 0,
+    act = new TDEAction(i18n("&Create Folder..."), "folder_new", 0,
 		      TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotCreateFolder() ),
 		       actionCollection(), "foldernew" );
     m_view->connectGalleryAction( act );
 
-    act = new KAction(i18n("&Save Image..."), "filesave", 0,
+    act = new TDEAction(i18n("&Save Image..."), "filesave", 0,
 		      TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotExportFile() ),
 		       actionCollection(), "saveImage" );
     m_view->connectGalleryAction( act );
 
-    act = new KAction(i18n("&Import Image..."), "inline_image", 0,
+    act = new TDEAction(i18n("&Import Image..."), "inline_image", 0,
 		      TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotImportFile() ),
 		       actionCollection(), "importImage" );
     m_view->connectGalleryAction( act );
 
-    act = new KAction(i18n("&Delete Image"), "edittrash", 0,
+    act = new TDEAction(i18n("&Delete Image"), "edittrash", 0,
 		      TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotDeleteItems() ),
 		       actionCollection(), "deleteImage" );
     m_view->connectGalleryAction( act );
 
-    act = new KAction(i18n("&Unload Image"), "fileclose", 0,
+    act = new TDEAction(i18n("&Unload Image"), "fileclose", 0,
 		      TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotUnloadItems() ),
 		       actionCollection(), "unloadImage" );
     m_view->connectGalleryAction( act );
 
 #if 0
     /* not yet supported actions - coming post 3.1 */
-    (void) new KAction(i18n("&Load Scan Parameters"), "bookmark_add", CTRL+Key_L,
+    (void) new TDEAction(i18n("&Load Scan Parameters"), "bookmark_add", CTRL+Key_L,
                        m_view, TQT_SLOT(slLoadScanParams()),
                        actionCollection(), "loadscanparam" );
 
-    (void) new KAction(i18n("Save &Scan Parameters"), "bookmark_add", CTRL+Key_S,
+    (void) new TDEAction(i18n("Save &Scan Parameters"), "bookmark_add", CTRL+Key_S,
 		       m_view, TQT_SLOT(slSaveScanParams()),
 		       actionCollection(), "savescanparam" );
 #endif
 
-    (void) new KAction(i18n("Select Scan Device"), "scanner", 0,
+    (void) new TDEAction(i18n("Select Scan Device"), "scanner", 0,
 		       TQT_TQOBJECT(m_view), TQT_SLOT( slSelectDevice()),
 		       actionCollection(), "selectsource" );
 
-    (void) new KAction( i18n("Enable All Warnings && Messages"), 0,
+    (void) new TDEAction( i18n("Enable All Warnings && Messages"), 0,
 			TQT_TQOBJECT(this),  TQT_SLOT(slEnableWarnings()),
 			actionCollection(), "enable_msgs");
 
 
-    m_saveOCRTextAction = new KAction( i18n("Save OCR Res&ult Text"), "filesaveas", CTRL+Key_U,
+    m_saveOCRTextAction = new TDEAction( i18n("Save OCR Res&ult Text"), "filesaveas", CTRL+Key_U,
                                        m_view, TQT_SLOT(slSaveOCRResult()),
                                        actionCollection(), "saveOCRResult");
 }
diff --git a/kooka/kooka.h b/kooka/kooka.h
index 5d8dc476..6702af62 100644
--- a/kooka/kooka.h
+++ b/kooka/kooka.h
@@ -40,8 +40,8 @@
 #define PREFERENCE_DIA_TAB "PreferencesTab"
 
 class KPrinter;
-class KToggleAction;
-class KActionMenu;
+class TDEToggleAction;
+class TDEActionMenu;
 class KookaView;
 
 /**
@@ -131,11 +131,11 @@ private:
    KookaView *m_view;
 
    KPrinter   *m_printer;
-   KToggleAction *m_scanParamsAction;
-   KToggleAction *m_previewerAction;
-   KActionMenu   *m_settingsShowDocks;
+   TDEToggleAction *m_scanParamsAction;
+   TDEToggleAction *m_previewerAction;
+   TDEActionMenu   *m_settingsShowDocks;
 
-    KAction      *m_saveOCRTextAction;
+    TDEAction      *m_saveOCRTextAction;
    int m_prefDialogIndex;
 };
 
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp
index bdc2a075..d74eed20 100644
--- a/kooka/kookaview.cpp
+++ b/kooka/kookaview.cpp
@@ -115,7 +115,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
    connect( img_canvas, TQT_SIGNAL( imageReadOnly(bool)),
 	    this, TQT_SLOT(slViewerReadOnly(bool)));
    
-   KPopupMenu *ctxtmenu = static_cast<KPopupMenu*>(img_canvas->contextMenu());
+   TDEPopupMenu *ctxtmenu = static_cast<TDEPopupMenu*>(img_canvas->contextMenu());
    if( ctxtmenu )
        ctxtmenu->insertTitle(i18n("Image View"));
    m_mainDock->setWidget( img_canvas );
@@ -1013,7 +1013,7 @@ TQImage KookaView::rotate180( TQImage *m_img )
 
 
 
-void KookaView::connectViewerAction( KAction *action )
+void KookaView::connectViewerAction( TDEAction *action )
 {
    TQPopupMenu *popup = img_canvas->contextMenu();
    kdDebug(29000) << "This is the popup: " << popup << endl;
@@ -1023,7 +1023,7 @@ void KookaView::connectViewerAction( KAction *action )
    }
 }
 
-void KookaView::connectGalleryAction( KAction *action )
+void KookaView::connectGalleryAction( TDEAction *action )
 {
    TQPopupMenu *popup = packager->contextMenu();
 
@@ -1047,35 +1047,35 @@ void KookaView::slFreshUpThumbView()
    }
 }
 
-void KookaView::createDockMenu( KActionCollection *col, KDockMainWindow *mainWin, const char * name )
+void KookaView::createDockMenu( TDEActionCollection *col, KDockMainWindow *mainWin, const char * name )
 {
-   KActionMenu *actionMenu = new KActionMenu( i18n("Tool Views"), "view_icon", col, name );
+   TDEActionMenu *actionMenu = new TDEActionMenu( i18n("Tool Views"), "view_icon", col, name );
 
    actionMenu->insert( new dwMenuAction( i18n("Show Image Viewer"),
-					 KShortcut(), m_mainDock, col,
+					 TDEShortcut(), m_mainDock, col,
 					 mainWin, "dock_viewer" ));
 
    actionMenu->insert( new dwMenuAction( i18n("Show Preview"),
-					 KShortcut(), m_dockPreview, col,
+					 TDEShortcut(), m_dockPreview, col,
 					 mainWin, "dock_preview" ));
 
    actionMenu->insert( new dwMenuAction( i18n("Show Recent Gallery Folders"),
-					 KShortcut(), m_dockRecent, col,
+					 TDEShortcut(), m_dockRecent, col,
 					 mainWin, "dock_recent" ));
    actionMenu->insert( new dwMenuAction( i18n("Show Gallery"),
-					 KShortcut(), m_dockPackager, col,
+					 TDEShortcut(), m_dockPackager, col,
 					 mainWin, "dock_gallery" ));
 
    actionMenu->insert( new dwMenuAction( i18n("Show Thumbnail Window"),
-					 KShortcut(), m_dockThumbs, col,
+					 TDEShortcut(), m_dockThumbs, col,
 					 mainWin, "dock_thumbs" ));
 
    actionMenu->insert( new dwMenuAction( i18n("Show Scan Parameters"),
-					 KShortcut(), m_dockScanParam, col,
+					 TDEShortcut(), m_dockScanParam, col,
 					 mainWin, "dock_scanparams" ));
 
    actionMenu->insert( new dwMenuAction( i18n("Show OCR Results"),
-					 KShortcut(), m_dockOCRText, col,
+					 TDEShortcut(), m_dockOCRText, col,
 					 mainWin, "dock_ocrResults" ));
 }
 
diff --git a/kooka/kookaview.h b/kooka/kookaview.h
index aaccd74a..f084e057 100644
--- a/kooka/kookaview.h
+++ b/kooka/kookaview.h
@@ -51,8 +51,8 @@ class KSANEOCR;
 class TDEConfig;
 class KPrinter;
 class KComboBox;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 class ThumbView;
 class KookaImage;
 class TQPixmap;
@@ -93,7 +93,7 @@ public:
     void loadStartupImage( void );
     KDockWidget *mainDockWidget( ) { return m_mainDock; }
 
-    void createDockMenu( KActionCollection*, KDockMainWindow *, const char *);
+    void createDockMenu( TDEActionCollection*, KDockMainWindow *, const char *);
 
     ScanPackager *gallery() { return packager; }
 
@@ -161,8 +161,8 @@ public slots:
      */
     bool slSelectDevice(const TQCString& useDevice=TQCString());
 
-    void connectViewerAction( KAction *action );
-    void connectGalleryAction( KAction *action );
+    void connectViewerAction( TDEAction *action );
+    void connectGalleryAction( TDEAction *action );
 
     void slScanStart();
     void slScanFinished( KScanStat stat );
@@ -234,7 +234,7 @@ private:
     KDockWidget *m_dockPreview;
     KDockWidget *m_dockOCRText;
 
-    KMainWindow *m_mainWindow;
+    TDEMainWindow *m_mainWindow;
 
     ocrResEdit  *m_ocrResEdit;
 };
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index ec9ad987..e02ff547 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -126,8 +126,8 @@ ScanPackager::ScanPackager( TQWidget *parent ) : KFileTreeView( parent )
    m_startup = true;
 
    /* create a context menu and set the title */
-   m_contextMenu = new KPopupMenu();
-   static_cast<KPopupMenu*>(m_contextMenu)->insertTitle( i18n( "Gallery" ));
+   m_contextMenu = new TDEPopupMenu();
+   static_cast<TDEPopupMenu*>(m_contextMenu)->insertTitle( i18n( "Gallery" ));
 
 }
 
diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp
index c3c24a3d..8b1a2184 100644
--- a/kpdf/core/document.cpp
+++ b/kpdf/core/document.cpp
@@ -430,7 +430,7 @@ bool KPDFDocument::hasFonts() const
     return generator ? generator->hasFonts() : false;
 }
 
-void KPDFDocument::putFontInfo(KListView *list)
+void KPDFDocument::putFontInfo(TDEListView *list)
 {
     if (generator) generator->putFontInfo(list);
 }
diff --git a/kpdf/core/document.h b/kpdf/core/document.h
index d4d44f9a..a0529261 100644
--- a/kpdf/core/document.h
+++ b/kpdf/core/document.h
@@ -26,7 +26,7 @@ class DocumentInfo;
 class DocumentSynopsis;
 class Generator;
 class PixmapRequest;
-class KListView;
+class TDEListView;
 class KPrinter;
 class KURL;
 
@@ -85,7 +85,7 @@ class KPDFDocument : public TQObject
         TQString getMetaData( const TQString & key, const TQString & option = TQString() ) const;
         bool supportsSearching() const;
         bool hasFonts() const;
-        void putFontInfo(KListView *list);
+        void putFontInfo(TDEListView *list);
 
         // perform actions on document / pages
         void setViewportPage( int page, int excludeId = -1, bool smoothMove = false );
diff --git a/kpdf/core/generator.h b/kpdf/core/generator.h
index a3c1f985..5ed6aa73 100644
--- a/kpdf/core/generator.h
+++ b/kpdf/core/generator.h
@@ -14,7 +14,7 @@
 #include <tqvaluevector.h>
 #include <tqstring.h>
 #include "core/document.h"
-class KListView;
+class TDEListView;
 class KPrinter;
 class KPDFPage;
 class KPDFLink;
@@ -64,7 +64,7 @@ class Generator : public TQObject
         virtual bool hasFonts() const = 0;
 
         // font related
-        virtual void putFontInfo(KListView *list) = 0;
+        virtual void putFontInfo(TDEListView *list) = 0;
 
         // print document using already configured kprinter
         virtual bool print( KPrinter& /*printer*/ ) { return false; }
diff --git a/kpdf/core/generator_kimgio/generator_kimgio.cpp b/kpdf/core/generator_kimgio/generator_kimgio.cpp
index 82491ddc..2cba5559 100644
--- a/kpdf/core/generator_kimgio/generator_kimgio.cpp
+++ b/kpdf/core/generator_kimgio/generator_kimgio.cpp
@@ -60,7 +60,7 @@ bool KIMGIOGenerator::hasFonts() const
     return false;
 }
 
-void KIMGIOGenerator::putFontInfo( KListView * )
+void KIMGIOGenerator::putFontInfo( TDEListView * )
 {
 }
 
diff --git a/kpdf/core/generator_kimgio/generator_kimgio.h b/kpdf/core/generator_kimgio/generator_kimgio.h
index 2e4606a7..150d3581 100644
--- a/kpdf/core/generator_kimgio/generator_kimgio.h
+++ b/kpdf/core/generator_kimgio/generator_kimgio.h
@@ -31,7 +31,7 @@ class KIMGIOGenerator : public Generator
         bool hasFonts() const;
 
         // font related
-        void putFontInfo(KListView *list);
+        void putFontInfo(TDEListView *list);
 
         // [INHERITED] print document using already configured kprinter
         bool print( KPrinter& printer );
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 1f03d9c0..20bb8516 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -360,7 +360,7 @@ bool PDFGenerator::hasFonts() const
     return true;
 }
 
-void PDFGenerator::putFontInfo(KListView *list)
+void PDFGenerator::putFontInfo(TDEListView *list)
 {
     Page *page;
     Dict *resDict;
@@ -634,7 +634,7 @@ bool PDFGenerator::reparseConfig()
 }
 //END Generator inherited functions
 
-void PDFGenerator::scanFonts(Dict *resDict, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize, TQValueVector<Ref> *visitedXObjects)
+void PDFGenerator::scanFonts(Dict *resDict, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize, TQValueVector<Ref> *visitedXObjects)
 {
     Object obj1, obj2, xObjDict, xObj, xObj2, resObj;
     Ref r;
@@ -709,7 +709,7 @@ void PDFGenerator::scanFonts(Dict *resDict, KListView *list, Ref **fonts, int &f
     xObjDict.free();
 }
 
-void PDFGenerator::scanFont(GfxFont *font, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize)
+void PDFGenerator::scanFont(GfxFont *font, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize)
 {
     Ref fontRef, embRef;
     Object fontObj, toUnicodeObj;
@@ -772,7 +772,7 @@ void PDFGenerator::scanFont(GfxFont *font, KListView *list, Ref **fonts, int &fo
         sPath = i18n("-");
     }
     sEmb = emb ? i18n("Yes") : i18n("No");
-    new KListViewItem(list, sName, fontTypeNames[font->getType()], sEmb, sPath);
+    new TDEListViewItem(list, sName, fontTypeNames[font->getType()], sEmb, sPath);
 
     // add this font to the list
     if (fontsLen == fontsSize)
diff --git a/kpdf/core/generator_pdf/generator_pdf.h b/kpdf/core/generator_pdf/generator_pdf.h
index 0aba8224..025deb0c 100644
--- a/kpdf/core/generator_pdf/generator_pdf.h
+++ b/kpdf/core/generator_pdf/generator_pdf.h
@@ -71,7 +71,7 @@ class PDFGenerator : public Generator
         bool hasFonts() const;
 
         // [INHERITED] font related
-        void putFontInfo(KListView *list);
+        void putFontInfo(TDEListView *list);
 
         // [INHERITED] print page using an already configured kprinter
         bool print( KPrinter& printer );
@@ -86,8 +86,8 @@ class PDFGenerator : public Generator
         // friend class to access private document related variables
         friend class PDFPixmapGeneratorThread;
 
-        void scanFonts(Dict *resDict, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize, TQValueVector<Ref> *visitedXObjects);
-        void scanFont(GfxFont *font, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize);
+        void scanFonts(Dict *resDict, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize, TQValueVector<Ref> *visitedXObjects);
+        void scanFont(GfxFont *font, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize);
 
         void fillViewportFromLink( DocumentViewport &viewport, LinkDest *destination );
 
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 458a0e2f..d0d6ba8e 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -157,7 +157,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 		connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) );
 
 	// widgets: ^searchbar (toolbar containing label and SearchWidget)
-//	m_searchToolBar = new KToolBar( parentWidget, "searchBar" );
+//	m_searchToolBar = new TDEToolBar( parentWidget, "searchBar" );
 //	m_searchToolBar->boxLayout()->setSpacing( KDialog::spacingHint() );
 //	TQLabel * sLabel = new TQLabel( i18n( "&Search:" ), m_searchToolBar, "kde toolbar widget" );
 //	m_searchWidget = new SearchWidget( m_searchToolBar, m_document );
@@ -169,7 +169,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	m_splitter->setOpaqueResize( true );
 	setWidget( m_splitter );
 	
-	m_showLeftPanel = new KToggleAction( i18n( "Show &Navigation Panel"), "show_side_panel", 0, this, TQT_SLOT( slotShowLeftPanel() ), actionCollection(), "show_leftpanel" );
+	m_showLeftPanel = new TDEToggleAction( i18n( "Show &Navigation Panel"), "show_side_panel", 0, this, TQT_SLOT( slotShowLeftPanel() ), actionCollection(), "show_leftpanel" );
 	m_showLeftPanel->setCheckedState( i18n( "Hide &Navigation Panel") );
 	m_showLeftPanel->setShortcut( "CTRL+L" );
 	m_showLeftPanel->setChecked( KpdfSettings::showLeftPanel() );
@@ -245,7 +245,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	m_document->addObserver( m_miniBar );
 
 	// ACTIONS
-	KActionCollection * ac = actionCollection();
+	TDEActionCollection * ac = actionCollection();
 
 	// Page Traversal actions
 	m_gotoPage = KStdAction::gotoPage( this, TQT_SLOT( slotGoToPage() ), ac, "goto_page" );
@@ -286,15 +286,15 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 
 	m_saveAs = KStdAction::saveAs( this, TQT_SLOT( slotSaveFileAs() ), ac, "save" );
 	m_saveAs->setEnabled( false );
-	KAction * prefs = KStdAction::preferences( this, TQT_SLOT( slotPreferences() ), ac, "preferences" );
+	TDEAction * prefs = KStdAction::preferences( this, TQT_SLOT( slotPreferences() ), ac, "preferences" );
 	prefs->setText( i18n( "Configure KPDF..." ) );
 	m_printPreview = KStdAction::printPreview( this, TQT_SLOT( slotPrintPreview() ), ac );
 	m_printPreview->setEnabled( false );
 
-	m_showProperties = new KAction(i18n("&Properties"), "info", 0, this, TQT_SLOT(slotShowProperties()), ac, "properties");
+	m_showProperties = new TDEAction(i18n("&Properties"), "info", 0, this, TQT_SLOT(slotShowProperties()), ac, "properties");
 	m_showProperties->setEnabled( false );
 
-	m_showPresentation = new KAction( i18n("P&resentation"), "kpresenter_kpr", "Ctrl+Shift+P", this, TQT_SLOT(slotShowPresentation()), ac, "presentation");
+	m_showPresentation = new TDEAction( i18n("P&resentation"), "kpresenter_kpr", "Ctrl+Shift+P", this, TQT_SLOT(slotShowPresentation()), ac, "presentation");
 	m_showPresentation->setEnabled( false );
 
 	// attach the actions of the children widgets too
@@ -910,9 +910,9 @@ void Part::slotShowMenu(const KPDFPage *page, const TQPoint &point)
 	{
 		// the quest for options_show_menubar
 		KXMLGUIClient *client;
-		KActionCollection *ac;
-		KActionPtrList::const_iterator it, end, begin;
-		KActionPtrList actions;
+		TDEActionCollection *ac;
+		TDEActionPtrList::const_iterator it, end, begin;
+		TDEActionPtrList actions;
 		
 		if (factory())
 		{
@@ -927,8 +927,8 @@ void Part::slotShowMenu(const KPDFPage *page, const TQPoint &point)
 				begin = actions.begin();
 				for ( it = begin; it != end; ++it )
 				{
-					if (TQString((*it)->name()) == "options_show_menubar") m_showMenuBarAction = (KToggleAction*)(*it);
-					if (TQString((*it)->name()) == "fullscreen") m_showFullScreenAction = (KToggleAction*)(*it);
+					if (TQString((*it)->name()) == "options_show_menubar") m_showMenuBarAction = (TDEToggleAction*)(*it);
+					if (TQString((*it)->name()) == "fullscreen") m_showFullScreenAction = (TDEToggleAction*)(*it);
 				}
 			}
 		}
@@ -936,7 +936,7 @@ void Part::slotShowMenu(const KPDFPage *page, const TQPoint &point)
 	}
 	
 	
-	KPopupMenu *popup = new KPopupMenu( widget(), "rmb popup" );
+	TDEPopupMenu *popup = new TDEPopupMenu( widget(), "rmb popup" );
 	if (page)
 	{
 		popup->insertTitle( i18n( "Page %1" ).arg( page->number() + 1 ) );
diff --git a/kpdf/part.h b/kpdf/part.h
index 426c89f4..50be072f 100644
--- a/kpdf/part.h
+++ b/kpdf/part.h
@@ -28,11 +28,11 @@ class TQSplitter;
 class TQToolBox;
 
 class KURL;
-class KAction;
+class TDEAction;
 class TDEConfig;
 class KDirWatch;
-class KToggleAction;
-class KSelectAction;
+class TDEToggleAction;
+class TDESelectAction;
 class TDEAboutData;
 class KPrinter;
 
@@ -172,22 +172,22 @@ private:
 	TQString m_jobMime;
 
 	// actions
-	KAction *m_gotoPage;
-	KAction *m_prevPage;
-	KAction *m_nextPage;
-	KAction *m_firstPage;
-	KAction *m_lastPage;
-	KAction *m_historyBack;
-	KAction *m_historyNext;
-	KAction *m_find;
-	KAction *m_findNext;
-	KAction *m_saveAs;
-	KAction *m_printPreview;
-	KAction *m_showProperties;
-	KAction *m_showPresentation;
-	KToggleAction* m_showMenuBarAction;
-	KToggleAction* m_showLeftPanel;
-	KToggleAction* m_showFullScreenAction;
+	TDEAction *m_gotoPage;
+	TDEAction *m_prevPage;
+	TDEAction *m_nextPage;
+	TDEAction *m_firstPage;
+	TDEAction *m_lastPage;
+	TDEAction *m_historyBack;
+	TDEAction *m_historyNext;
+	TDEAction *m_find;
+	TDEAction *m_findNext;
+	TDEAction *m_saveAs;
+	TDEAction *m_printPreview;
+	TDEAction *m_showProperties;
+	TDEAction *m_showPresentation;
+	TDEToggleAction* m_showMenuBarAction;
+	TDEToggleAction* m_showLeftPanel;
+	TDEToggleAction* m_showFullScreenAction;
 	bool m_actionsSearched;
 	bool m_searchStarted;
 	BrowserExtension *m_bExtension;
diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp
index 8b101fa9..14baa149 100644
--- a/kpdf/shell/shell.cpp
+++ b/kpdf/shell/shell.cpp
@@ -76,7 +76,7 @@ void Shell::init()
       // and integrate the part's GUI with the shell's
       setupGUI(Keys | Save);
       createGUI(m_part);
-      m_showToolBarAction = static_cast<KToggleAction*>(toolBarMenuAction());
+      m_showToolBarAction = static_cast<TDEToggleAction*>(toolBarMenuAction());
     }
   }
   else
@@ -94,7 +94,7 @@ void Shell::init()
   readSettings();
   if (!TDEGlobal::config()->hasGroup("MainWindow"))
   {
-    KMainWindowInterface kmwi(this);
+    TDEMainWindowInterface kmwi(this);
     kmwi.maximize();
   }
   setAutoSaveSettings();
@@ -146,7 +146,7 @@ void Shell::writeSettings()
 
 void Shell::setupActions()
 {
-  KAction * openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
+  TDEAction * openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
   m_recent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( openURL( const KURL& ) ), actionCollection() );
   connect( m_recent, TQT_SIGNAL( activated() ), openAction, TQT_SLOT( activate() ) );
   m_recent->setWhatsThis( i18n( "<b>Click</b> to open a file or <b>Click and hold</b> to select a recent file" ) );
diff --git a/kpdf/shell/shell.h b/kpdf/shell/shell.h
index 6fc2a21e..560be8fd 100644
--- a/kpdf/shell/shell.h
+++ b/kpdf/shell/shell.h
@@ -97,11 +97,11 @@ namespace KPDF
 
   private:
       KParts::ReadOnlyPart* m_part;
-      KRecentFilesAction* m_recent;
-      KAction* m_printAction;
-      KToggleAction* m_fullScreenAction;
-      KToggleAction* m_showMenuBarAction;
-      KToggleAction* m_showToolBarAction;
+      TDERecentFilesAction* m_recent;
+      TDEAction* m_printAction;
+      TDEToggleAction* m_fullScreenAction;
+      TDEToggleAction* m_showMenuBarAction;
+      TDEToggleAction* m_showToolBarAction;
       bool m_menuBarWasShown, m_toolBarWasShown;
       KURL m_openUrl;
   };
diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index eec74581..262b74c7 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -403,7 +403,7 @@ HoverButton::HoverButton( TQWidget * parent )
 {
     setMouseTracking( true );
 #if KDE_IS_VERSION(3,3,90)
-    KAcceleratorManager::setNoAccel( this );
+    TDEAcceleratorManager::setNoAccel( this );
 #endif
 }
 
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index a76d03ea..a0ce66e7 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -105,16 +105,16 @@ public:
     TQTimer dragScrollTimer;
 
     // actions
-    KToggleAction * aMouseNormal;
-    KToggleAction * aMouseSelect;
-    KToggleAction * aMouseEdit;
-    KSelectAction * aZoom;
-    KToggleAction * aZoomFitWidth;
-    KToggleAction * aZoomFitPage;
-    KToggleAction * aZoomFitText;
-    KToggleAction * aViewTwoPages;
-    KToggleAction * aViewContinuous;
-    KAction * aPrevAction;
+    TDEToggleAction * aMouseNormal;
+    TDEToggleAction * aMouseSelect;
+    TDEToggleAction * aMouseEdit;
+    TDESelectAction * aZoom;
+    TDEToggleAction * aZoomFitWidth;
+    TDEToggleAction * aZoomFitPage;
+    TDEToggleAction * aZoomFitText;
+    TDEToggleAction * aViewTwoPages;
+    TDEToggleAction * aViewContinuous;
+    TDEAction * aPrevAction;
 };
 
 
@@ -242,10 +242,10 @@ PageView::~PageView()
     delete d;
 }
 
-void PageView::setupActions( KActionCollection * ac )
+void PageView::setupActions( TDEActionCollection * ac )
 {
     // Zoom actions ( higher scales takes lots of memory! )
-    d->aZoom = new KSelectAction( i18n( "Zoom" ), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotZoom() ), ac, "zoom_to" );
+    d->aZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotZoom() ), ac, "zoom_to" );
     d->aZoom->setEditable( true );
 #if KDE_IS_VERSION(3,4,89)
     d->aZoom->setMaxComboViewCount( 13 );
@@ -256,52 +256,52 @@ void PageView::setupActions( KActionCollection * ac )
 
     KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), ac, "zoom_out" );
 
-    d->aZoomFitWidth = new KToggleAction( i18n("Fit to Page &Width"), "view_fit_width", 0, ac, "zoom_fit_width" );
+    d->aZoomFitWidth = new TDEToggleAction( i18n("Fit to Page &Width"), "view_fit_width", 0, ac, "zoom_fit_width" );
     connect( d->aZoomFitWidth, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToWidthToggled( bool ) ) );
 
-    d->aZoomFitPage = new KToggleAction( i18n("Fit to &Page"), "view_fit_window", 0, ac, "zoom_fit_page" );
+    d->aZoomFitPage = new TDEToggleAction( i18n("Fit to &Page"), "view_fit_window", 0, ac, "zoom_fit_page" );
     connect( d->aZoomFitPage, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToPageToggled( bool ) ) );
 
-    d->aZoomFitText = new KToggleAction( i18n("Fit to &Text"), "viewmagfit", 0, ac, "zoom_fit_text" );
+    d->aZoomFitText = new TDEToggleAction( i18n("Fit to &Text"), "viewmagfit", 0, ac, "zoom_fit_text" );
     connect( d->aZoomFitText, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToTextToggled( bool ) ) );
 
     // rotate actions
-    KAction *action;
-    action = new KAction( i18n("Rotate Right"), "rotate_cw", KShortcut( "Ctrl+Shift++" ),
+    TDEAction *action;
+    action = new TDEAction( i18n("Rotate Right"), "rotate_cw", TDEShortcut( "Ctrl+Shift++" ),
                           TQT_TQOBJECT(this), TQT_SLOT( slotRotateRight() ), ac, "rotate_right" );
 
-    action = new KAction( i18n("Rotate Left"), "rotate_ccw", KShortcut( "Ctrl+Shift+-" ),
+    action = new TDEAction( i18n("Rotate Left"), "rotate_ccw", TDEShortcut( "Ctrl+Shift+-" ),
                           TQT_TQOBJECT(this), TQT_SLOT( slotRotateLeft() ), ac, "rotate_left" );
 
     // View-Layout actions
-    d->aViewTwoPages = new KToggleAction( i18n("&Two Pages"), "view_left_right", 0, ac, "view_twopages" );
+    d->aViewTwoPages = new TDEToggleAction( i18n("&Two Pages"), "view_left_right", 0, ac, "view_twopages" );
     connect( d->aViewTwoPages, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotTwoPagesToggled( bool ) ) );
     d->aViewTwoPages->setChecked( KpdfSettings::viewColumns() > 1 );
 
-    d->aViewContinuous = new KToggleAction( i18n("&Continuous"), "view_text", 0, ac, "view_continuous" );
+    d->aViewContinuous = new TDEToggleAction( i18n("&Continuous"), "view_text", 0, ac, "view_continuous" );
     connect( d->aViewContinuous, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotContinuousToggled( bool ) ) );
     d->aViewContinuous->setChecked( KpdfSettings::viewContinuous() );
 
     // Mouse-Mode actions
-    d->aMouseNormal = new KRadioAction( i18n("&Browse Tool"), "mouse", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseNormal() ), ac, "mouse_drag" );
+    d->aMouseNormal = new TDERadioAction( i18n("&Browse Tool"), "mouse", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseNormal() ), ac, "mouse_drag" );
     d->aMouseNormal->setExclusiveGroup( "MouseType" );
     d->aMouseNormal->setChecked( true );
 
-    KToggleAction * mz = new KRadioAction( i18n("&Zoom Tool"), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseZoom() ), ac, "mouse_zoom" );
+    TDEToggleAction * mz = new TDERadioAction( i18n("&Zoom Tool"), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseZoom() ), ac, "mouse_zoom" );
     mz->setExclusiveGroup( "MouseType" );
 
-    d->aMouseSelect = new KRadioAction( i18n("&Select Tool"), "frame_edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseSelect() ), ac, "mouse_select" );
+    d->aMouseSelect = new TDERadioAction( i18n("&Select Tool"), "frame_edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseSelect() ), ac, "mouse_select" );
     d->aMouseSelect->setExclusiveGroup( "MouseType" );
 
-/*    d->aMouseEdit = new KRadioAction( i18n("Draw"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseDraw() ), ac, "mouse_draw" );
+/*    d->aMouseEdit = new TDERadioAction( i18n("Draw"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseDraw() ), ac, "mouse_draw" );
     d->aMouseEdit->setExclusiveGroup("MouseType");
     d->aMouseEdit->setEnabled( false ); // implement feature before removing this line*/
 
     // Other actions
-    KAction * su = new KAction( i18n("Scroll Up"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollUp() ), ac, "view_scroll_up" );
+    TDEAction * su = new TDEAction( i18n("Scroll Up"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollUp() ), ac, "view_scroll_up" );
     su->setShortcut( "Shift+Up" );
 
-    KAction * sd = new KAction( i18n("Scroll Down"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollDown() ), ac, "view_scroll_down" );
+    TDEAction * sd = new TDEAction( i18n("Scroll Down"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollDown() ), ac, "view_scroll_down" );
     sd->setShortcut( "Shift+Down" );
 }
 
@@ -673,7 +673,7 @@ void PageView::keyPressEvent( TQKeyEvent * e )
             }
         }
         // F3: go to next occurrency
-        else if( e->key() == KStdAccel::findNext() )
+        else if( e->key() == TDEStdAccel::findNext() )
         {
             // part doesn't get this key event because of the keyboard grab
             d->findTimeoutTimer->stop(); // restore normal operation during possible messagebox is displayed
@@ -1121,7 +1121,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
             }
 
             // popup that ask to copy:text and copy/save:image
-            KPopupMenu menu( this );
+            TDEPopupMenu menu( this );
             if ( !selectedText.isEmpty() )
             {
                 menu.insertTitle( i18n( "Text (1 character)", "Text (%n characters)", selectedText.length() ) );
@@ -1508,7 +1508,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
     }
 
     float newFactor = d->zoomFactor;
-    KAction * checkedZoomAction = 0;
+    TDEAction * checkedZoomAction = 0;
     switch ( newZoomMode )
     {
         case ZoomFixed:{ //ZoomFixed case
diff --git a/kpdf/ui/pageview.h b/kpdf/ui/pageview.h
index 76c9607c..901ec9e6 100644
--- a/kpdf/ui/pageview.h
+++ b/kpdf/ui/pageview.h
@@ -24,7 +24,7 @@
 #include "core/observer.h"
 
 class KURL;
-class KActionCollection;
+class TDEActionCollection;
 
 class KPDFDocument;
 class PageViewItem;
@@ -53,7 +53,7 @@ class PageView : public TQScrollView, public DocumentObserver
         enum MouseMode { MouseNormal, MouseZoom, MouseSelect, MouseEdit };
 
         // create actions that interact with this widget
-        void setupActions( KActionCollection * collection );
+        void setupActions( TDEActionCollection * collection );
 
         // used from RMB menu
         bool canFitPageWidth();
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 6639dbc5..94cfdc08 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -61,7 +61,7 @@ PresentationWidget::PresentationWidget( TQWidget * parent, KPDFDocument * doc )
 
     m_width = -1;
 
-    m_accel = new KAccel( this, TQT_TQOBJECT(this), "presentationmode-accel" );
+    m_accel = new TDEAccel( this, TQT_TQOBJECT(this), "presentationmode-accel" );
 
     // show widget and take control
     showFullScreen();
@@ -98,7 +98,7 @@ PresentationWidget::~PresentationWidget()
         delete *fIt;
 }
 
-void PresentationWidget::setupActions( KActionCollection * ac )
+void PresentationWidget::setupActions( TDEActionCollection * ac )
 {
     m_accel->insert( "previous_page", ac->action( "previous_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotPrevPage() ), false, true );
     m_accel->insert( "next_page", ac->action( "next_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotNextPage() ), false, true );
@@ -304,7 +304,7 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
         m_height = d.height();
 
         // create top toolbar
-        m_topBar = new KToolBar( this, "presentationBar" );
+        m_topBar = new TDEToolBar( this, "presentationBar" );
         m_topBar->setIconSize( 32 );
         m_topBar->setMovingEnabled( false );
         m_topBar->insertButton( TQApplication::reverseLayout() ? "1rightarrow" : "1leftarrow", 2, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPrevPage() ) );
diff --git a/kpdf/ui/presentationwidget.h b/kpdf/ui/presentationwidget.h
index 413f4258..177b3da0 100644
--- a/kpdf/ui/presentationwidget.h
+++ b/kpdf/ui/presentationwidget.h
@@ -17,9 +17,9 @@
 #include "core/observer.h"
 #include "core/pagetransition.h"
 
-class KAccel;
-class KActionCollection;
-class KToolBar;
+class TDEAccel;
+class TDEActionCollection;
+class TDEToolBar;
 class TQTimer;
 
 class KPDFDocument;
@@ -40,7 +40,7 @@ class PresentationWidget : public TQDialog, public DocumentObserver
         PresentationWidget( TQWidget * parent, KPDFDocument * doc );
         ~PresentationWidget();
 
-        void setupActions( KActionCollection * ac );
+        void setupActions( TDEActionCollection * ac );
 
         // inherited from DocumentObserver
         uint observerId() const { return PRESENTATION_ID; }
@@ -94,8 +94,8 @@ class PresentationWidget : public TQDialog, public DocumentObserver
         TQValueVector< PresentationFrame * > m_frames;
         int m_frameIndex;
         TQStringList m_metaStrings;
-        KToolBar * m_topBar;
-        KAccel * m_accel;
+        TDEToolBar * m_topBar;
+        TDEAccel * m_accel;
 
     private slots:
         void slotNextPage();
diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp
index e00d8cfe..feff5eae 100644
--- a/kpdf/ui/propertiesdialog.cpp
+++ b/kpdf/ui/propertiesdialog.cpp
@@ -76,7 +76,7 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
   {
     TQFrame *page2 = addPage(i18n("Fonts"));
     page2Layout = new TQVBoxLayout(page2, 0, KDialog::spacingHint());
-    KListView *lv = new KListView(page2);
+    TDEListView *lv = new TDEListView(page2);
     page2Layout->add(lv);
     doc->putFontInfo(lv);
   }
diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp
index f21d8b73..19f77753 100644
--- a/kpdf/ui/searchwidget.cpp
+++ b/kpdf/ui/searchwidget.cpp
@@ -29,7 +29,7 @@
 #define FIND_ID     3
 
 SearchWidget::SearchWidget( TQWidget * parent, KPDFDocument * document )
-    : KToolBar( parent, "iSearchBar" ), m_document( document ),
+    : TDEToolBar( parent, "iSearchBar" ), m_document( document ),
     m_searchType( 0 ), m_caseSensitive( false )
 {
     // change toolbar appearance
@@ -55,7 +55,7 @@ SearchWidget::SearchWidget( TQWidget * parent, KPDFDocument * document )
                   i18n( "Clear filter" ), 0/*index*/ );
 
     // 3.1. create the popup menu for changing filtering features
-    m_menu = new KPopupMenu( this );
+    m_menu = new TDEPopupMenu( this );
     m_menu->insertItem( i18n("Case Sensitive"), 1 );
     m_menu->insertSeparator( 2 );
     m_menu->insertItem( i18n("Match Phrase"), 3 );
diff --git a/kpdf/ui/searchwidget.h b/kpdf/ui/searchwidget.h
index b0be5dc9..a6a9efb4 100644
--- a/kpdf/ui/searchwidget.h
+++ b/kpdf/ui/searchwidget.h
@@ -12,7 +12,7 @@
 
 #include <ktoolbar.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 class KPDFDocument;
 class m_inputDelayTimer;
 
@@ -27,7 +27,7 @@ class m_inputDelayTimer;
  * It supports case sensitive/unsensitive(default) and provieds a button
  * for switching between the 2 modes.
  */
-class SearchWidget : public KToolBar
+class SearchWidget : public TDEToolBar
 {
     Q_OBJECT
   
@@ -37,7 +37,7 @@ class SearchWidget : public KToolBar
 
     private:
         KPDFDocument * m_document;
-        KPopupMenu * m_menu;
+        TDEPopupMenu * m_menu;
         TQTimer * m_inputDelayTimer;
         int m_searchType;
         bool m_caseSensitive;
diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp
index 6c5e2b5f..14d9d2f5 100644
--- a/kpdf/ui/thumbnaillist.cpp
+++ b/kpdf/ui/thumbnaillist.cpp
@@ -553,7 +553,7 @@ void ThumbnailWidget::paintEvent( TQPaintEvent * e )
 #define FILTERB_ID  1
 
 ThumbnailController::ThumbnailController( TQWidget * parent, ThumbnailList * list )
-    : KToolBar( parent, "ThumbsControlBar" )
+    : TDEToolBar( parent, "ThumbsControlBar" )
 {
     // change toolbar appearance
     setMargin( 3 );
diff --git a/kpdf/ui/thumbnaillist.h b/kpdf/ui/thumbnaillist.h
index 5365dff0..5b1e5f94 100644
--- a/kpdf/ui/thumbnaillist.h
+++ b/kpdf/ui/thumbnaillist.h
@@ -17,7 +17,7 @@
 #include "core/observer.h"
 
 class TQTimer;
-class KActionCollection;
+class TDEActionCollection;
 
 class KPDFDocument;
 class ThumbnailWidget;
@@ -113,7 +113,7 @@ class ThumbnailsBox : public TQVBox
  * emits signals whenever a button is pressed. A click action results
  * in invoking some method (or slot) in ThumbnailList.
  */
-class ThumbnailController : public KToolBar
+class ThumbnailController : public TDEToolBar
 {
     public:
         ThumbnailController( TQWidget * parent, ThumbnailList * thumbnailList );
diff --git a/kpdf/ui/toc.cpp b/kpdf/ui/toc.cpp
index 015ba313..8e2f9531 100644
--- a/kpdf/ui/toc.cpp
+++ b/kpdf/ui/toc.cpp
@@ -22,11 +22,11 @@
 // they're slow when converted to page number. drop the 2nd column idea.
 //#define TOC_ENABLE_PAGE_COLUMN
 
-class TOCItem : public KListViewItem
+class TOCItem : public TDEListViewItem
 {
     public:
-        TOCItem( KListView *parent, TOCItem *after, const TQDomElement & e )
-            : KListViewItem( parent, after, e.tagName() ), m_element( e )
+        TOCItem( TDEListView *parent, TOCItem *after, const TQDomElement & e )
+            : TDEListViewItem( parent, after, e.tagName() ), m_element( e )
         {
 #ifdef TOC_ENABLE_PAGE_COLUMN
             if ( e.hasAttribute( "Page" ) )
@@ -35,8 +35,8 @@ class TOCItem : public KListViewItem
             setMultiLinesEnabled(true);
         }
 
-        TOCItem( KListViewItem *parent, TOCItem *after, const TQDomElement & e )
-            : KListViewItem( parent, after, e.tagName() ), m_element( e )
+        TOCItem( TDEListViewItem *parent, TOCItem *after, const TQDomElement & e )
+            : TDEListViewItem( parent, after, e.tagName() ), m_element( e )
         {
 #ifdef TOC_ENABLE_PAGE_COLUMN
             if ( e.hasAttribute( "Page" ) )
@@ -54,7 +54,7 @@ class TOCItem : public KListViewItem
         TQDomElement m_element;
 };
 
-TOC::TOC(TQWidget *parent, KPDFDocument *document) : KListView(parent), m_document(document)
+TOC::TOC(TQWidget *parent, KPDFDocument *document) : TDEListView(parent), m_document(document)
 {
     addColumn( i18n("Topic") );
 #ifdef TOC_ENABLE_PAGE_COLUMN
@@ -104,7 +104,7 @@ void TOC::notifySetup( const TQValueVector< KPDFPage * > & /*pages*/, bool docum
     emit hasTOC( true );
 }
 
-void TOC::addChildren( const TQDomNode & parentNode, KListViewItem * parentItem )
+void TOC::addChildren( const TQDomNode & parentNode, TDEListViewItem * parentItem )
 {
     // keep track of the current listViewItem
     TOCItem * currentItem = 0;
diff --git a/kpdf/ui/toc.h b/kpdf/ui/toc.h
index 6159bfd9..eef7dbb4 100644
--- a/kpdf/ui/toc.h
+++ b/kpdf/ui/toc.h
@@ -17,7 +17,7 @@
 
 class KPDFDocument;
 
-class TOC : public KListView, public DocumentObserver
+class TOC : public TDEListView, public DocumentObserver
 {
 Q_OBJECT
   
@@ -36,7 +36,7 @@ Q_OBJECT
         void slotExecuted(TQListViewItem *i);
 
     private:
-        void addChildren( const TQDomNode & parentNode, KListViewItem * parentItem = 0 );
+        void addChildren( const TQDomNode & parentNode, TDEListViewItem * parentItem = 0 );
         DocumentViewport getViewport( const TQDomElement &e ) const;
         KPDFDocument *m_document;
 };
diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp
index d44715e6..a49c2041 100644
--- a/kpovmodeler/pmactions.cpp
+++ b/kpovmodeler/pmactions.cpp
@@ -53,7 +53,7 @@ public:
 
 PMComboAction::PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member,
                               TQObject* parent, const char* name )
-      : KAction( text, accel, parent, name )
+      : TDEAction( text, accel, parent, name )
 {
    m_receiver = receiver;
    m_member = member;
@@ -67,12 +67,12 @@ PMComboAction::~PMComboAction( )
 
 int PMComboAction::plug( TQWidget* w, int index )
 {
-   if( !w->inherits( "KToolBar" ) )
+   if( !w->inherits( "TDEToolBar" ) )
       return -1;
 
-   KToolBar* toolBar = ( KToolBar* ) w;
+   TDEToolBar* toolBar = ( TDEToolBar* ) w;
 
-   int id = KAction::getToolButtonID( );
+   int id = TDEAction::getToolButtonID( );
 
    TQComboBox* comboBox = new PMComboBox( toolBar );
    if( m_minWidth > 0 )
@@ -101,10 +101,10 @@ int PMComboAction::plug( TQWidget* w, int index )
 
 void PMComboAction::unplug( TQWidget *w )
 {
-   if( !w->inherits( "KToolBar" ) )
+   if( !w->inherits( "TDEToolBar" ) )
       return;
 
-   KToolBar *toolBar = ( KToolBar* ) w;
+   TDEToolBar *toolBar = ( TDEToolBar* ) w;
 
    int idx = findContainer( w );
 
@@ -144,7 +144,7 @@ protected:
 };
 
 PMLabelAction::PMLabelAction( const TQString &text, TQObject *parent, const char *name )
-    : KAction( text, 0, parent, name )
+    : TDEAction( text, 0, parent, name )
 {
    m_button = 0;
 }
@@ -153,11 +153,11 @@ int PMLabelAction::plug( TQWidget *widget, int index )
 {
    //do not call the previous implementation here
 
-   if( widget->inherits( "KToolBar" ) )
+   if( widget->inherits( "TDEToolBar" ) )
    {
-      KToolBar* tb = ( KToolBar* ) widget;
+      TDEToolBar* tb = ( TDEToolBar* ) widget;
 
-      int id = KAction::getToolButtonID( );
+      int id = TDEAction::getToolButtonID( );
 
       m_button = new PMToolBarLabel( text( ), widget );
       tb->insertWidget( id, m_button->width( ), m_button, index );
@@ -174,9 +174,9 @@ int PMLabelAction::plug( TQWidget *widget, int index )
 
 void PMLabelAction::unplug( TQWidget *widget )
 {
-   if( widget->inherits( "KToolBar" ) )
+   if( widget->inherits( "TDEToolBar" ) )
    {
-      KToolBar* bar = ( KToolBar* ) widget;
+      TDEToolBar* bar = ( TDEToolBar* ) widget;
       
       int idx = findContainer( bar );
       
@@ -194,7 +194,7 @@ void PMLabelAction::unplug( TQWidget *widget )
 
 PMSpinBoxAction::PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member,
                                   TQObject* parent, const char* name )
-      : KAction( text, accel, parent, name )
+      : TDEAction( text, accel, parent, name )
 {
    m_receiver = receiver;
    m_member = member;
@@ -206,12 +206,12 @@ PMSpinBoxAction::~PMSpinBoxAction( )
 
 int PMSpinBoxAction::plug( TQWidget* w, int index )
 {
-   if( !w->inherits( "KToolBar" ) )
+   if( !w->inherits( "TDEToolBar" ) )
       return -1;
 
-   KToolBar* toolBar = ( KToolBar* ) w;
+   TDEToolBar* toolBar = ( TDEToolBar* ) w;
 
-   int id = KAction::getToolButtonID( );
+   int id = TDEAction::getToolButtonID( );
    
    TQSpinBox* spinBox = new TQSpinBox( -1000, 1000, 1, w );
    toolBar->insertWidget( id, 70, spinBox, index );
@@ -234,10 +234,10 @@ int PMSpinBoxAction::plug( TQWidget* w, int index )
 
 void PMSpinBoxAction::unplug( TQWidget *w )
 {
-   if( !w->inherits( "KToolBar" ) )
+   if( !w->inherits( "TDEToolBar" ) )
       return;
 
-   KToolBar *toolBar = (KToolBar *)w;
+   TDEToolBar *toolBar = (TDEToolBar *)w;
 
    int idx = findContainer( w );
 
diff --git a/kpovmodeler/pmactions.h b/kpovmodeler/pmactions.h
index 937b62a7..e5b0b4c2 100644
--- a/kpovmodeler/pmactions.h
+++ b/kpovmodeler/pmactions.h
@@ -33,7 +33,7 @@ class TQToolButton;
  *
  * Copied from konq_actions.h, author: Simon Hausmann <hausmann@kde.org>
  */
-class PMComboAction : public KAction
+class PMComboAction : public TDEAction
 {
    Q_OBJECT
   
@@ -65,7 +65,7 @@ private:
  *
  * Copied from konq_actions.h, author: Simon Hausmann <hausmann@kde.org>
  */
-class PMLabelAction : public KAction
+class PMLabelAction : public TDEAction
 {
    Q_OBJECT
   
@@ -83,7 +83,7 @@ private:
 /**
  * Spinbox action for the toolbar.
  */
-class PMSpinBoxAction : public KAction
+class PMSpinBoxAction : public TDEAction
 {
    Q_OBJECT
   
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index d92ab0bc..987f6a8c 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -126,7 +126,7 @@ public:
 
 
 /**
- * A special kind of KMainWindow that is able to have dockwidget child widgets.
+ * A special kind of TDEMainWindow that is able to have dockwidget child widgets.
  *
  * The main widget should be a dockwidget where other dockwidgets can be docked to
  * the left, right, top, bottom or to the middle.
@@ -135,7 +135,7 @@ public:
  * @author Max Judin.
 */
 PMDockMainWindow::PMDockMainWindow( TQWidget* parent, const char *name, WFlags f)
-:KMainWindow( parent, name, f )
+:TDEMainWindow( parent, name, f )
 {
   TQString new_name = TQString(name) + TQString("_DockManager");
   dockManager = new PMDockManager( this, new_name.latin1() );
@@ -260,7 +260,7 @@ void PMDockMainWindow::setView( TQWidget *view )
   }
 
 #ifndef NO_KDE2
-  KMainWindow::setCentralWidget(view);
+  TDEMainWindow::setCentralWidget(view);
 #else
   TQMainWindow::setCentralWidget(view);
 #endif
@@ -1271,7 +1271,7 @@ PMDockManager::PMDockManager( TQWidget* mainWindow , const char* name )
   menuData->setAutoDelete( true );
 
 #ifndef NO_KDE2
-  menu = new KPopupMenu();
+  menu = new TDEPopupMenu();
 #else
   menu = new TQPopupMenu();
 #endif
@@ -2540,10 +2540,10 @@ void PMDockManager::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void PMDockMainWindow::virtual_hook( int id, void* data )
-{ KMainWindow::virtual_hook( id, data ); }
+{ TDEMainWindow::virtual_hook( id, data ); }
 
 void PMDockArea::virtual_hook( int, void* )
-{ /*KMainWindow::virtual_hook( id, data );*/ }
+{ /*TDEMainWindow::virtual_hook( id, data );*/ }
 
 
 #ifndef NO_INCLUDE_MOCFILES // for TQt-only projects, because tmake doesn't take this name
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index 18aa1db6..04a43ef9 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -38,7 +38,7 @@
    - PMDockTabGroup                 - minor helper class
    - PMDockWidget                   - IMPORTANT CLASS: the one and only dockwidget class
    - PMDockManager                  - helper class
-   - PMDockMainWindow               - IMPORTANT CLASS: a special KMainWindow that can have dockwidgets
+   - PMDockMainWindow               - IMPORTANT CLASS: a special TDEMainWindow that can have dockwidgets
    - PMDockArea                     - like PMDockMainWindow but inherits just TQWidget
 
    IMPORTANT Note: This file compiles also in TQt-only mode by using the NO_KDE2 precompiler definition!
@@ -93,7 +93,7 @@ class TQHBoxLayout;
 class TQPixmap;
 
 #ifndef NO_KDE2
-class KToolBar;
+class TDEToolBar;
 class TDEConfig;
 #else
 class TQToolBar;
@@ -1170,7 +1170,7 @@ private:
 };
 
 /**
- * A special kind of @ref KMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
+ * A special kind of @ref TDEMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
  *
  * The main widget should be a @ref PMDockWidget where other @ref PMDockWidget can be docked to
  * the left, right, top, bottom or to the middle.
@@ -1212,7 +1212,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class EXPORT_DOCKCLASS PMDockMainWindow : public KMainWindow, virtual public PartBase
+class EXPORT_DOCKCLASS PMDockMainWindow : public TDEMainWindow, virtual public PartBase
 {
   Q_OBJECT
   
@@ -1414,7 +1414,7 @@ private:
 
 
 #ifdef _JOWENN_EXPERIMENTAL_
-/* Joseph Wenninger jowenn@kde.org Experimental (Just all KMainWindow references changed to TQWidget, otherwise nearly exactly the
+/* Joseph Wenninger jowenn@kde.org Experimental (Just all TDEMainWindow references changed to TQWidget, otherwise nearly exactly the
 same as PMDockMainWindow*/
 
 class EXPORT_DOCKCLASS PMDockArea : public TQWidget
diff --git a/kpovmodeler/pminsertpopup.cpp b/kpovmodeler/pminsertpopup.cpp
index 0f8ffb23..bcd24720 100644
--- a/kpovmodeler/pminsertpopup.cpp
+++ b/kpovmodeler/pminsertpopup.cpp
@@ -25,7 +25,7 @@ PMInsertPopup::PMInsertPopup( TQWidget* parent, bool multipleObjects,
                               int items, bool canInsertAllAsFirstChildren,
                               bool canInsertAllAsLastChildren,
                               bool canInsertAllAsSiblings, const char* name )
-      : KPopupMenu( parent, name )
+      : TDEPopupMenu( parent, name )
 {
    TQString itemText;
    if( multipleObjects )
diff --git a/kpovmodeler/pminsertpopup.h b/kpovmodeler/pminsertpopup.h
index 09aa796a..6f55803f 100644
--- a/kpovmodeler/pminsertpopup.h
+++ b/kpovmodeler/pminsertpopup.h
@@ -29,7 +29,7 @@
 /**
  * Popup menu. Ask the user where to insert new objects
  */
-class PMInsertPopup : public KPopupMenu
+class PMInsertPopup : public TDEPopupMenu
 {
 public:
    /**
diff --git a/kpovmodeler/pmlibraryobjectsearch.cpp b/kpovmodeler/pmlibraryobjectsearch.cpp
index 30e5be5c..fe7b4fd4 100644
--- a/kpovmodeler/pmlibraryobjectsearch.cpp
+++ b/kpovmodeler/pmlibraryobjectsearch.cpp
@@ -60,7 +60,7 @@ PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* parent ) :
    // Search results
    frame = new TQFrame( this );
    TQHBoxLayout* hl = new TQHBoxLayout( frame, KDialog::spacingHint( ) );
-   m_pFileList = new KListView( frame );
+   m_pFileList = new TDEListView( frame );
    m_pFileList->addColumn( i18n( "File" ) );
    m_pFileList->addColumn( i18n( "Path" ) );
    m_pFileList->setFullWidth( true );
diff --git a/kpovmodeler/pmlibraryobjectsearch.h b/kpovmodeler/pmlibraryobjectsearch.h
index 0e7b0426..35b29ed2 100644
--- a/kpovmodeler/pmlibraryobjectsearch.h
+++ b/kpovmodeler/pmlibraryobjectsearch.h
@@ -29,7 +29,7 @@ class TQLineEdit;
 class TQListBox;
 class TQPushButton;
 class PMLibraryEntryPreview;
-class KListView;
+class TDEListView;
 
 /**
  * Search widget for Library Objects.
@@ -49,7 +49,7 @@ private slots:
 private:
    TQLineEdit*   m_pSearch;
    TQPushButton* m_pSearchButton;
-   KListView* m_pFileList;
+   TDEListView* m_pFileList;
    PMLibraryEntryPreview* m_pPreview;
 };
 
diff --git a/kpovmodeler/pmobjectaction.h b/kpovmodeler/pmobjectaction.h
index 5397759c..d270db9f 100644
--- a/kpovmodeler/pmobjectaction.h
+++ b/kpovmodeler/pmobjectaction.h
@@ -30,7 +30,7 @@
 #include <tqptrlist.h>
 #include <tqstring.h>
 
-class KAction;
+class TDEAction;
 
 /**
  * Helper class for object action functions.
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index 7ca0a555..011a86af 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -227,7 +227,7 @@ void PMPart::initCopyPasteActions( )
    m_pPasteAction = KStdAction::paste( this, TQT_SLOT( slotEditPaste( ) ), actionCollection( ) );
 
    m_pDeleteAction =
-      new KAction( i18n( "Delete" ), "edittrash", TQt::Key_Delete,
+      new TDEAction( i18n( "Delete" ), "edittrash", TQt::Key_Delete,
                    this, TQT_SLOT( slotEditDelete( ) ),
                    actionCollection( ), "edit_delete" );
 
@@ -241,10 +241,10 @@ void PMPart::initCopyPasteActions( )
 void PMPart::initActions( )
 {
    // file menu
-   m_pImportAction = new KAction( i18n( "Import..." ), 0, this,
+   m_pImportAction = new TDEAction( i18n( "Import..." ), 0, this,
                                   TQT_SLOT( slotFileImport( ) ), actionCollection( ),
                                   "file_import" );
-   m_pExportAction = new KAction( i18n( "&Export..." ), 0, this,
+   m_pExportAction = new TDEAction( i18n( "&Export..." ), 0, this,
                                   TQT_SLOT( slotFileExport( ) ), actionCollection( ),
                                   "file_export" );
 
@@ -256,11 +256,11 @@ void PMPart::initActions( )
    m_pRenderComboAction->setMinimumWidth( 250 );
    connect( m_pRenderComboAction, TQT_SIGNAL( plugged( ) ),
             TQT_SLOT( slotRenderModeActionPlugged( ) ) );
-   m_pRenderAction = new KAction( i18n( "Render" ), "pmrender", 0, this, TQT_SLOT( slotRender( ) ),
+   m_pRenderAction = new TDEAction( i18n( "Render" ), "pmrender", 0, this, TQT_SLOT( slotRender( ) ),
                                   actionCollection( ), "view_render" );
-   m_pRenderSettingsAction = new KAction( i18n( "Render Modes..." ), "pmrendersettings", 0, this, TQT_SLOT( slotRenderSettings( ) ),
+   m_pRenderSettingsAction = new TDEAction( i18n( "Render Modes..." ), "pmrendersettings", 0, this, TQT_SLOT( slotRenderSettings( ) ),
                                           actionCollection( ), "view_render_settings" );
-   m_pViewRenderWindowAction = new KAction( i18n( "Render Window" ), 0, this, TQT_SLOT( slotViewRenderWindow( ) ),
+   m_pViewRenderWindowAction = new TDEAction( i18n( "Render Window" ), 0, this, TQT_SLOT( slotViewRenderWindow( ) ),
                                             actionCollection( ), "view_render_window" );
    m_pVisibilityLabelAction = new PMLabelAction( i18n( "Visibility level:" ) + TQString( " " ), actionCollection( ), "view_visibility_label" );
    m_pVisibilityLevelAction = new PMSpinBoxAction( i18n( "Visibility Level" ),
@@ -270,7 +270,7 @@ void PMPart::initActions( )
             TQT_SLOT( slotVisibilityActionPlugged( ) ) );
 
    m_pGlobalDetailLabelAction = new PMLabelAction( i18n( "Global detail:" ) + TQString( " " ), actionCollection( ), "global_detail_label" );
-   m_pGlobalDetailAction = new KSelectAction( i18n("Global Detail Level"), KShortcut(), actionCollection(), "global_detail_level" );
+   m_pGlobalDetailAction = new TDESelectAction( i18n("Global Detail Level"), TDEShortcut(), actionCollection(), "global_detail_level" );
    TQStringList strList;
    strList.append( i18n( "Very Low" ) );
    strList.append( i18n( "Low" ) );
@@ -283,264 +283,264 @@ void PMPart::initActions( )
    // new objects
    if( isReadWrite( ) )
    {
-      m_pNewGlobalSettingsAction = new KAction( i18n( "Global Settings" ), "pmglobalsettings", 0, this, TQT_SLOT( slotNewGlobalSettings( ) ),
+      m_pNewGlobalSettingsAction = new TDEAction( i18n( "Global Settings" ), "pmglobalsettings", 0, this, TQT_SLOT( slotNewGlobalSettings( ) ),
                                      actionCollection( ), "new_globalsettings" );
       m_readWriteActions.append( m_pNewGlobalSettingsAction );
-      m_pNewSkySphereAction = new KAction( i18n( "Sky Sphere" ), "pmskysphere", 0, this, TQT_SLOT( slotNewSkySphere( ) ),
+      m_pNewSkySphereAction = new TDEAction( i18n( "Sky Sphere" ), "pmskysphere", 0, this, TQT_SLOT( slotNewSkySphere( ) ),
                                      actionCollection( ), "new_skysphere" );
       m_readWriteActions.append( m_pNewSkySphereAction );
-      m_pNewRainbowAction = new KAction( i18n( "Rainbow" ), "pmrainbow", 0, this, TQT_SLOT( slotNewRainbow( ) ),
+      m_pNewRainbowAction = new TDEAction( i18n( "Rainbow" ), "pmrainbow", 0, this, TQT_SLOT( slotNewRainbow( ) ),
                                      actionCollection( ), "new_rainbow" );
       m_readWriteActions.append( m_pNewRainbowAction );
-      m_pNewFogAction = new KAction( i18n( "Fog" ), "pmfog", 0, this, TQT_SLOT( slotNewFog( ) ),
+      m_pNewFogAction = new TDEAction( i18n( "Fog" ), "pmfog", 0, this, TQT_SLOT( slotNewFog( ) ),
                                      actionCollection( ), "new_fog" );
       m_readWriteActions.append( m_pNewFogAction );
-      m_pNewInteriorAction = new KAction( i18n( "Interior" ), "pminterior", 0, this, TQT_SLOT( slotNewInterior( ) ),
+      m_pNewInteriorAction = new TDEAction( i18n( "Interior" ), "pminterior", 0, this, TQT_SLOT( slotNewInterior( ) ),
                                      actionCollection( ), "new_interior" );
       m_readWriteActions.append( m_pNewInteriorAction );
-      m_pNewMediaAction = new KAction( i18n( "Media" ), "pmmedia", 0, this, TQT_SLOT( slotNewMedia( ) ),
+      m_pNewMediaAction = new TDEAction( i18n( "Media" ), "pmmedia", 0, this, TQT_SLOT( slotNewMedia( ) ),
                                      actionCollection( ), "new_media" );
       m_readWriteActions.append( m_pNewMediaAction );
-      m_pNewDensityAction = new KAction( i18n( "Density" ), "pmdensity", 0, this, TQT_SLOT( slotNewDensity( ) ),
+      m_pNewDensityAction = new TDEAction( i18n( "Density" ), "pmdensity", 0, this, TQT_SLOT( slotNewDensity( ) ),
                                      actionCollection( ), "new_density" );
       m_readWriteActions.append( m_pNewDensityAction );
-      m_pNewMaterialAction = new KAction( i18n( "Material" ), "pmmaterial", 0, this, TQT_SLOT( slotNewMaterial( ) ),
+      m_pNewMaterialAction = new TDEAction( i18n( "Material" ), "pmmaterial", 0, this, TQT_SLOT( slotNewMaterial( ) ),
                                      actionCollection( ), "new_material" );
       m_readWriteActions.append( m_pNewMaterialAction );
-      m_pNewBoxAction = new KAction( i18n( "Box" ), "pmbox", 0, this, TQT_SLOT( slotNewBox( ) ),
+      m_pNewBoxAction = new TDEAction( i18n( "Box" ), "pmbox", 0, this, TQT_SLOT( slotNewBox( ) ),
                                      actionCollection( ), "new_box" );
       m_readWriteActions.append( m_pNewBoxAction );
-      m_pNewSphereAction = new KAction( i18n( "Sphere" ), "pmsphere", 0, this, TQT_SLOT( slotNewSphere( ) ),
+      m_pNewSphereAction = new TDEAction( i18n( "Sphere" ), "pmsphere", 0, this, TQT_SLOT( slotNewSphere( ) ),
                                         actionCollection( ), "new_sphere" );
       m_readWriteActions.append( m_pNewSphereAction );
-      m_pNewCylinderAction = new KAction( i18n( "Cylinder" ), "pmcylinder", 0, this, TQT_SLOT( slotNewCylinder( ) ),
+      m_pNewCylinderAction = new TDEAction( i18n( "Cylinder" ), "pmcylinder", 0, this, TQT_SLOT( slotNewCylinder( ) ),
                                           actionCollection( ), "new_cylinder" );
       m_readWriteActions.append( m_pNewCylinderAction );
-      m_pNewConeAction =  new KAction( i18n( "Cone" ), "pmcone", 0, this, TQT_SLOT( slotNewCone( ) ),
+      m_pNewConeAction =  new TDEAction( i18n( "Cone" ), "pmcone", 0, this, TQT_SLOT( slotNewCone( ) ),
                                        actionCollection( ), "new_cone" );
       m_readWriteActions.append( m_pNewConeAction );
-      m_pNewTorusAction = new KAction( i18n( "Torus" ), "pmtorus", 0, this, TQT_SLOT( slotNewTorus( ) ),
+      m_pNewTorusAction = new TDEAction( i18n( "Torus" ), "pmtorus", 0, this, TQT_SLOT( slotNewTorus( ) ),
                                        actionCollection( ), "new_torus" );
       m_readWriteActions.append( m_pNewTorusAction );
 
-      m_pNewLatheAction = new KAction( i18n( "Lathe" ), "pmlathe", 0, this, TQT_SLOT( slotNewLathe( ) ),
+      m_pNewLatheAction = new TDEAction( i18n( "Lathe" ), "pmlathe", 0, this, TQT_SLOT( slotNewLathe( ) ),
                                        actionCollection( ), "new_lathe" );
       m_readWriteActions.append( m_pNewLatheAction );
-      m_pNewPrismAction = new KAction( i18n( "Prism" ), "pmprism", 0, this, TQT_SLOT( slotNewPrism( ) ),
+      m_pNewPrismAction = new TDEAction( i18n( "Prism" ), "pmprism", 0, this, TQT_SLOT( slotNewPrism( ) ),
                                        actionCollection( ), "new_prism" );
       m_readWriteActions.append( m_pNewPrismAction );
-      m_pNewSurfaceOfRevolutionAction = new KAction( i18n( "Surface of Revolution" ), "pmsor", 0, this, TQT_SLOT( slotNewSurfaceOfRevolution( ) ),
+      m_pNewSurfaceOfRevolutionAction = new TDEAction( i18n( "Surface of Revolution" ), "pmsor", 0, this, TQT_SLOT( slotNewSurfaceOfRevolution( ) ),
                                        actionCollection( ), "new_surfaceofrevolution" );
       m_readWriteActions.append( m_pNewSurfaceOfRevolutionAction );
-      m_pNewSuperquadricEllipsoidAction = new KAction( i18n( "Superquadric Ellipsoid" ), "pmsqe", 0, this, TQT_SLOT( slotNewSuperquadricEllipsoid( ) ),
+      m_pNewSuperquadricEllipsoidAction = new TDEAction( i18n( "Superquadric Ellipsoid" ), "pmsqe", 0, this, TQT_SLOT( slotNewSuperquadricEllipsoid( ) ),
                                        actionCollection( ), "new_superquadricellipsoid" );
       m_readWriteActions.append( m_pNewSuperquadricEllipsoidAction );
 
-      m_pNewJuliaFractalAction = new KAction( i18n( "Julia Fractal" ), "pmjuliafractal", 0, this, TQT_SLOT( slotNewJuliaFractal( ) ),
+      m_pNewJuliaFractalAction = new TDEAction( i18n( "Julia Fractal" ), "pmjuliafractal", 0, this, TQT_SLOT( slotNewJuliaFractal( ) ),
                                               actionCollection( ), "new_juliafractal" );
       m_readWriteActions.append( m_pNewJuliaFractalAction );
-      m_pNewHeightFieldAction = new KAction( i18n( "Height Field" ), "pmheightfield", 0, this, TQT_SLOT( slotNewHeightField( ) ),
+      m_pNewHeightFieldAction = new TDEAction( i18n( "Height Field" ), "pmheightfield", 0, this, TQT_SLOT( slotNewHeightField( ) ),
                                              actionCollection( ), "new_heightfield" );
       m_readWriteActions.append( m_pNewHeightFieldAction );
-      m_pNewTextAction = new KAction( i18n( "Text" ), "pmtext", 0, this, TQT_SLOT( slotNewText( ) ),
+      m_pNewTextAction = new TDEAction( i18n( "Text" ), "pmtext", 0, this, TQT_SLOT( slotNewText( ) ),
                                       actionCollection( ), "new_text" );
       m_readWriteActions.append( m_pNewTextAction );
 
-      m_pNewBlobAction = new KAction( i18n( "Blob" ), "pmblob", 0, this, TQT_SLOT( slotNewBlob( ) ),
+      m_pNewBlobAction = new TDEAction( i18n( "Blob" ), "pmblob", 0, this, TQT_SLOT( slotNewBlob( ) ),
                                       actionCollection( ), "new_blob" );
       m_readWriteActions.append( m_pNewBlobAction );
-      m_pNewBlobSphereAction = new KAction( i18n( "Blob Sphere" ), "pmblobsphere", 0, this, TQT_SLOT( slotNewBlobSphere( ) ),
+      m_pNewBlobSphereAction = new TDEAction( i18n( "Blob Sphere" ), "pmblobsphere", 0, this, TQT_SLOT( slotNewBlobSphere( ) ),
                                             actionCollection( ), "new_blobsphere" );
       m_readWriteActions.append( m_pNewBlobSphereAction );
-      m_pNewBlobCylinderAction = new KAction( i18n( "Blob Cylinder" ), "pmblobcylinder", 0, this, TQT_SLOT( slotNewBlobCylinder( ) ),
+      m_pNewBlobCylinderAction = new TDEAction( i18n( "Blob Cylinder" ), "pmblobcylinder", 0, this, TQT_SLOT( slotNewBlobCylinder( ) ),
                                               actionCollection( ), "new_blobcylinder" );
       m_readWriteActions.append( m_pNewBlobCylinderAction );
 
-      m_pNewPlaneAction = new KAction( i18n( "Plane" ), "pmplane", 0, this, TQT_SLOT( slotNewPlane( ) ),
+      m_pNewPlaneAction = new TDEAction( i18n( "Plane" ), "pmplane", 0, this, TQT_SLOT( slotNewPlane( ) ),
                                        actionCollection( ), "new_plane" );
       m_readWriteActions.append( m_pNewPlaneAction );
-      m_pNewPolynomAction = new KAction( i18n( "Polynom" ), "pmpolynom", 0, this, TQT_SLOT( slotNewPolynom( ) ),
+      m_pNewPolynomAction = new TDEAction( i18n( "Polynom" ), "pmpolynom", 0, this, TQT_SLOT( slotNewPolynom( ) ),
                                          actionCollection( ), "new_polynom" );
       m_readWriteActions.append( m_pNewPolynomAction );
 
-      m_pNewDeclareAction = new KAction( i18n( "Declaration" ), "pmdeclare", 0, this, TQT_SLOT( slotNewDeclare( ) ),
+      m_pNewDeclareAction = new TDEAction( i18n( "Declaration" ), "pmdeclare", 0, this, TQT_SLOT( slotNewDeclare( ) ),
                                          actionCollection( ), "new_declare" );
       m_readWriteActions.append( m_pNewDeclareAction );
-      m_pNewObjectLinkAction = new KAction( i18n( "Object Link" ), "pmobjectlink", 0, this, TQT_SLOT( slotNewObjectLink( ) ),
+      m_pNewObjectLinkAction = new TDEAction( i18n( "Object Link" ), "pmobjectlink", 0, this, TQT_SLOT( slotNewObjectLink( ) ),
                                             actionCollection( ), "new_objectlink" );
       m_readWriteActions.append( m_pNewObjectLinkAction );
 
-      m_pNewUnionAction = new KAction( i18n( "Union" ), "pmunion", 0, this, TQT_SLOT( slotNewUnion( ) ),
+      m_pNewUnionAction = new TDEAction( i18n( "Union" ), "pmunion", 0, this, TQT_SLOT( slotNewUnion( ) ),
                                        actionCollection( ), "new_union" );
       m_readWriteActions.append( m_pNewUnionAction );
-      m_pNewIntersectionAction = new KAction( i18n( "Intersection" ), "pmintersection", 0, this, TQT_SLOT( slotNewIntersection( ) ),
+      m_pNewIntersectionAction = new TDEAction( i18n( "Intersection" ), "pmintersection", 0, this, TQT_SLOT( slotNewIntersection( ) ),
                                               actionCollection( ), "new_intersection" );
       m_readWriteActions.append( m_pNewIntersectionAction );
-      m_pNewDifferenceAction = new KAction( i18n( "Difference" ), "pmdifference", 0, this, TQT_SLOT( slotNewDifference( ) ),
+      m_pNewDifferenceAction = new TDEAction( i18n( "Difference" ), "pmdifference", 0, this, TQT_SLOT( slotNewDifference( ) ),
                                             actionCollection( ), "new_difference" );
       m_readWriteActions.append( m_pNewDifferenceAction );
-      m_pNewMergeAction = new KAction( i18n( "Merge" ), "pmmerge", 0, this, TQT_SLOT( slotNewMerge( ) ),
+      m_pNewMergeAction = new TDEAction( i18n( "Merge" ), "pmmerge", 0, this, TQT_SLOT( slotNewMerge( ) ),
                                        actionCollection( ), "new_merge" );
       m_readWriteActions.append( m_pNewMergeAction );
 
-      m_pNewBoundedByAction = new KAction( i18n( "Bounded By" ), "pmboundedby", 0, this, TQT_SLOT( slotNewBoundedBy( ) ),
+      m_pNewBoundedByAction = new TDEAction( i18n( "Bounded By" ), "pmboundedby", 0, this, TQT_SLOT( slotNewBoundedBy( ) ),
                                        actionCollection( ), "new_boundedby" );
       m_readWriteActions.append( m_pNewBoundedByAction );
-      m_pNewClippedByAction = new KAction( i18n( "Clipped By" ), "pmclippedby", 0, this, TQT_SLOT( slotNewClippedBy( ) ),
+      m_pNewClippedByAction = new TDEAction( i18n( "Clipped By" ), "pmclippedby", 0, this, TQT_SLOT( slotNewClippedBy( ) ),
                                        actionCollection( ), "new_clippedby" );
       m_readWriteActions.append( m_pNewClippedByAction );
 
-      m_pNewLightAction = new KAction( i18n( "Light" ), "pmlight", 0, this, TQT_SLOT( slotNewLight( ) ),
+      m_pNewLightAction = new TDEAction( i18n( "Light" ), "pmlight", 0, this, TQT_SLOT( slotNewLight( ) ),
                                        actionCollection( ), "new_light" );
       m_readWriteActions.append( m_pNewLightAction );
-      m_pNewLooksLikeAction = new KAction( i18n( "Looks Like" ), "pmlookslike", 0, this, TQT_SLOT( slotNewLooksLike( ) ),
+      m_pNewLooksLikeAction = new TDEAction( i18n( "Looks Like" ), "pmlookslike", 0, this, TQT_SLOT( slotNewLooksLike( ) ),
                                        actionCollection( ), "new_lookslike" );
       m_readWriteActions.append( m_pNewLooksLikeAction );
-      m_pNewProjectedThroughAction = new KAction( i18n( "Projected Through" ), "pmprojectedthrough", 0, this, TQT_SLOT( slotNewProjectedThrough( ) ),
+      m_pNewProjectedThroughAction = new TDEAction( i18n( "Projected Through" ), "pmprojectedthrough", 0, this, TQT_SLOT( slotNewProjectedThrough( ) ),
                                        actionCollection( ), "new_projectedthrough" );
       m_readWriteActions.append( m_pNewProjectedThroughAction );
 
-      m_pNewBicubicPatchAction = new KAction( i18n( "Bicubic Patch" ), "pmbicubicpatch", 0, this, TQT_SLOT( slotNewBicubicPatch( ) ),
+      m_pNewBicubicPatchAction = new TDEAction( i18n( "Bicubic Patch" ), "pmbicubicpatch", 0, this, TQT_SLOT( slotNewBicubicPatch( ) ),
                                               actionCollection( ), "new_bicubicpatch" );
       m_readWriteActions.append( m_pNewBicubicPatchAction );
-      m_pNewDiscAction = new KAction( i18n( "Disc" ), "pmdisc", 0, this, TQT_SLOT( slotNewDisc( ) ),
+      m_pNewDiscAction = new TDEAction( i18n( "Disc" ), "pmdisc", 0, this, TQT_SLOT( slotNewDisc( ) ),
                                       actionCollection( ), "new_disc" );
       m_readWriteActions.append( m_pNewDiscAction );
-      m_pNewTriangleAction = new KAction( i18n( "Triangle" ), "pmtriangle", 0, this, TQT_SLOT( slotNewTriangle( ) ),
+      m_pNewTriangleAction = new TDEAction( i18n( "Triangle" ), "pmtriangle", 0, this, TQT_SLOT( slotNewTriangle( ) ),
                                           actionCollection( ), "new_triangle" );
       m_readWriteActions.append( m_pNewTriangleAction );
 
 
-      m_pNewCameraAction = new KAction( i18n( "Camera" ), "pmcamera", 0, this, TQT_SLOT( slotNewCamera( ) ),
+      m_pNewCameraAction = new TDEAction( i18n( "Camera" ), "pmcamera", 0, this, TQT_SLOT( slotNewCamera( ) ),
                                         actionCollection( ), "new_camera" );
       m_readWriteActions.append( m_pNewCameraAction );
 
-      m_pNewTextureAction = new KAction( i18n( "Texture" ), "pmtexture", 0, this, TQT_SLOT( slotNewTexture( ) ),
+      m_pNewTextureAction = new TDEAction( i18n( "Texture" ), "pmtexture", 0, this, TQT_SLOT( slotNewTexture( ) ),
                                          actionCollection( ), "new_texture" );
       m_readWriteActions.append( m_pNewTextureAction );
 
-      m_pNewPigmentAction = new KAction( i18n( "Pigment" ), "pmpigment", 0, this, TQT_SLOT( slotNewPigment( ) ),
+      m_pNewPigmentAction = new TDEAction( i18n( "Pigment" ), "pmpigment", 0, this, TQT_SLOT( slotNewPigment( ) ),
                                          actionCollection( ), "new_pigment" );
       m_readWriteActions.append( m_pNewPigmentAction );
-      m_pNewNormalAction = new KAction( i18n( "Normal" ), "pmnormal", 0, this, TQT_SLOT( slotNewNormal( ) ),
+      m_pNewNormalAction = new TDEAction( i18n( "Normal" ), "pmnormal", 0, this, TQT_SLOT( slotNewNormal( ) ),
                                          actionCollection( ), "new_normal" );
       m_readWriteActions.append( m_pNewNormalAction );
-      m_pNewSolidColorAction = new KAction( i18n( "Solid Color" ), "pmsolidcolor", 0, this, TQT_SLOT( slotNewSolidColor( ) ),
+      m_pNewSolidColorAction = new TDEAction( i18n( "Solid Color" ), "pmsolidcolor", 0, this, TQT_SLOT( slotNewSolidColor( ) ),
                                             actionCollection( ), "new_solidcolor" );
       m_readWriteActions.append( m_pNewSolidColorAction );
 
-      m_pNewTextureListAction = new KAction( i18n( "Texture List" ), "pmtexturelist", 0, this, TQT_SLOT( slotNewTextureList( ) ),
+      m_pNewTextureListAction = new TDEAction( i18n( "Texture List" ), "pmtexturelist", 0, this, TQT_SLOT( slotNewTextureList( ) ),
                                             actionCollection( ), "new_texturelist" );
       m_readWriteActions.append( m_pNewTextureListAction );
-      m_pNewColorListAction = new KAction( i18n( "Color List" ), "pmcolorlist", 0, this, TQT_SLOT( slotNewColorList( ) ),
+      m_pNewColorListAction = new TDEAction( i18n( "Color List" ), "pmcolorlist", 0, this, TQT_SLOT( slotNewColorList( ) ),
                                             actionCollection( ), "new_colorlist" );
       m_readWriteActions.append( m_pNewColorListAction );
-      m_pNewPigmentListAction = new KAction( i18n( "Pigment List" ), "pmpigmentlist", 0, this, TQT_SLOT( slotNewPigmentList( ) ),
+      m_pNewPigmentListAction = new TDEAction( i18n( "Pigment List" ), "pmpigmentlist", 0, this, TQT_SLOT( slotNewPigmentList( ) ),
                                             actionCollection( ), "new_pigmentlist" );
       m_readWriteActions.append( m_pNewPigmentListAction );
-      m_pNewNormalListAction = new KAction( i18n( "Normal List" ), "pmnormallist", 0, this, TQT_SLOT( slotNewNormalList( ) ),
+      m_pNewNormalListAction = new TDEAction( i18n( "Normal List" ), "pmnormallist", 0, this, TQT_SLOT( slotNewNormalList( ) ),
                                             actionCollection( ), "new_normallist" );
       m_readWriteActions.append( m_pNewNormalListAction );
-      m_pNewDensityListAction = new KAction( i18n( "Density List" ), "pmdensitylist", 0, this, TQT_SLOT( slotNewDensityList( ) ),
+      m_pNewDensityListAction = new TDEAction( i18n( "Density List" ), "pmdensitylist", 0, this, TQT_SLOT( slotNewDensityList( ) ),
                                             actionCollection( ), "new_densitylist" );
       m_readWriteActions.append( m_pNewDensityListAction );
 
-      m_pNewFinishAction = new KAction( i18n( "Finish" ), "pmfinish", 0, this, TQT_SLOT( slotNewFinish( ) ),
+      m_pNewFinishAction = new TDEAction( i18n( "Finish" ), "pmfinish", 0, this, TQT_SLOT( slotNewFinish( ) ),
                                             actionCollection( ), "new_finish" );
       m_readWriteActions.append( m_pNewFinishAction );
 
-      m_pNewPatternAction = new KAction( i18n( "Pattern" ), "pmpattern", 0, this, TQT_SLOT( slotNewPattern( ) ),
+      m_pNewPatternAction = new TDEAction( i18n( "Pattern" ), "pmpattern", 0, this, TQT_SLOT( slotNewPattern( ) ),
                                          actionCollection( ), "new_pattern" );
       m_readWriteActions.append( m_pNewPatternAction );
-      m_pNewBlendMapModifiersAction = new KAction( i18n( "Blend Map Modifiers" ), "pmblendmapmodifiers", 0, this, TQT_SLOT( slotNewBlendMapModifiers( ) ),
+      m_pNewBlendMapModifiersAction = new TDEAction( i18n( "Blend Map Modifiers" ), "pmblendmapmodifiers", 0, this, TQT_SLOT( slotNewBlendMapModifiers( ) ),
                                          actionCollection( ), "new_blendmapmodifiers" );
       m_readWriteActions.append( m_pNewBlendMapModifiersAction );
-      m_pNewTextureMapAction = new KAction( i18n( "Texture Map" ), "pmtexturemap", 0, this, TQT_SLOT( slotNewTextureMap( ) ),
+      m_pNewTextureMapAction = new TDEAction( i18n( "Texture Map" ), "pmtexturemap", 0, this, TQT_SLOT( slotNewTextureMap( ) ),
                                             actionCollection( ), "new_texturemap" );
       m_readWriteActions.append( m_pNewTextureMapAction );
-      m_pNewMaterialMapAction = new KAction( i18n( "Material Map" ), "pmmaterialmap", 0, this, TQT_SLOT( slotNewMaterialMap( ) ),
+      m_pNewMaterialMapAction = new TDEAction( i18n( "Material Map" ), "pmmaterialmap", 0, this, TQT_SLOT( slotNewMaterialMap( ) ),
                                             actionCollection( ), "new_materialmap" );
       m_readWriteActions.append( m_pNewMaterialMapAction );
-      m_pNewPigmentMapAction = new KAction( i18n( "Pigment Map" ), "pmpigmentmap", 0, this, TQT_SLOT( slotNewPigmentMap( ) ),
+      m_pNewPigmentMapAction = new TDEAction( i18n( "Pigment Map" ), "pmpigmentmap", 0, this, TQT_SLOT( slotNewPigmentMap( ) ),
                                             actionCollection( ), "new_pigmentmap" );
       m_readWriteActions.append( m_pNewPigmentMapAction );
-      m_pNewColorMapAction = new KAction( i18n( "Color Map" ), "pmcolormap", 0, this, TQT_SLOT( slotNewColorMap( ) ),
+      m_pNewColorMapAction = new TDEAction( i18n( "Color Map" ), "pmcolormap", 0, this, TQT_SLOT( slotNewColorMap( ) ),
                                           actionCollection( ), "new_colormap" );
       m_readWriteActions.append( m_pNewColorMapAction );
-      m_pNewNormalMapAction = new KAction( i18n( "Normal Map" ), "pmnormalmap", 0, this, TQT_SLOT( slotNewNormalMap( ) ),
+      m_pNewNormalMapAction = new TDEAction( i18n( "Normal Map" ), "pmnormalmap", 0, this, TQT_SLOT( slotNewNormalMap( ) ),
                                            actionCollection( ), "new_normalmap" );
       m_readWriteActions.append( m_pNewNormalMapAction );
-      m_pNewBumpMapAction = new KAction( i18n( "Bump Map" ), "pmbumpmap", 0, this, TQT_SLOT( slotNewBumpMap( ) ),
+      m_pNewBumpMapAction = new TDEAction( i18n( "Bump Map" ), "pmbumpmap", 0, this, TQT_SLOT( slotNewBumpMap( ) ),
                                            actionCollection( ), "new_bumpmap" );
       m_readWriteActions.append( m_pNewBumpMapAction );
-      m_pNewSlopeMapAction = new KAction( i18n( "Slope Map" ), "pmslopemap", 0, this, TQT_SLOT( slotNewSlopeMap( ) ),
+      m_pNewSlopeMapAction = new TDEAction( i18n( "Slope Map" ), "pmslopemap", 0, this, TQT_SLOT( slotNewSlopeMap( ) ),
                                            actionCollection( ), "new_slopemap" );
       m_readWriteActions.append( m_pNewSlopeMapAction );
-      m_pNewDensityMapAction = new KAction( i18n( "Density Map" ), "pmdensitymap", 0, this, TQT_SLOT( slotNewDensityMap( ) ),
+      m_pNewDensityMapAction = new TDEAction( i18n( "Density Map" ), "pmdensitymap", 0, this, TQT_SLOT( slotNewDensityMap( ) ),
                                            actionCollection( ), "new_densitymap" );
       m_readWriteActions.append( m_pNewDensityMapAction );
-      m_pNewSlopeAction = new KAction( i18n( "Slope" ), "pmslope", 0, this, TQT_SLOT( slotNewSlope( ) ),
+      m_pNewSlopeAction = new TDEAction( i18n( "Slope" ), "pmslope", 0, this, TQT_SLOT( slotNewSlope( ) ),
                                            actionCollection( ), "new_slope" );
       m_readWriteActions.append( m_pNewSlopeAction );
 
-      m_pNewWarpAction = new KAction( i18n( "Warp" ), "pmwarp", 0, this, TQT_SLOT( slotNewWarp( ) ),
+      m_pNewWarpAction = new TDEAction( i18n( "Warp" ), "pmwarp", 0, this, TQT_SLOT( slotNewWarp( ) ),
                                             actionCollection( ), "new_warp" );
       m_readWriteActions.append( m_pNewWarpAction );
-      m_pNewImageMapAction = new KAction( i18n( "Image Map" ), "pmimagemap", 0, this, TQT_SLOT( slotNewImageMap( ) ),
+      m_pNewImageMapAction = new TDEAction( i18n( "Image Map" ), "pmimagemap", 0, this, TQT_SLOT( slotNewImageMap( ) ),
                                             actionCollection( ), "new_imagemap" );
       m_readWriteActions.append( m_pNewImageMapAction );
-      m_pNewQuickColorAction = new KAction( i18n( "QuickColor" ), "pmquickcolor", 0, this, TQT_SLOT( slotNewQuickColor( ) ),
+      m_pNewQuickColorAction = new TDEAction( i18n( "QuickColor" ), "pmquickcolor", 0, this, TQT_SLOT( slotNewQuickColor( ) ),
                                              actionCollection( ), "new_quickcolor" );
       m_readWriteActions.append( m_pNewQuickColorAction );
 
-      m_pNewTranslateAction = new KAction( i18n( "Translate" ), "pmtranslate", 0, this, TQT_SLOT( slotNewTranslate( ) ),
+      m_pNewTranslateAction = new TDEAction( i18n( "Translate" ), "pmtranslate", 0, this, TQT_SLOT( slotNewTranslate( ) ),
                                      actionCollection( ), "new_translate" );
       m_readWriteActions.append( m_pNewTranslateAction );
-      m_pNewScaleAction = new KAction( i18n( "Scale" ), "pmscale", 0, this, TQT_SLOT( slotNewScale( ) ),
+      m_pNewScaleAction = new TDEAction( i18n( "Scale" ), "pmscale", 0, this, TQT_SLOT( slotNewScale( ) ),
                                      actionCollection( ), "new_scale" );
       m_readWriteActions.append( m_pNewScaleAction );
-      m_pNewRotateAction = new KAction( i18n( "Rotate" ), "pmrotate", 0, this, TQT_SLOT( slotNewRotate( ) ),
+      m_pNewRotateAction = new TDEAction( i18n( "Rotate" ), "pmrotate", 0, this, TQT_SLOT( slotNewRotate( ) ),
                                      actionCollection( ), "new_rotate" );
       m_readWriteActions.append( m_pNewRotateAction );
-      m_pNewMatrixAction = new KAction( i18n( "Matrix" ), "pmmatrix", 0, this, TQT_SLOT( slotNewMatrix( ) ),
+      m_pNewMatrixAction = new TDEAction( i18n( "Matrix" ), "pmmatrix", 0, this, TQT_SLOT( slotNewMatrix( ) ),
                                         actionCollection( ), "new_povraymatrix" );
       m_readWriteActions.append( m_pNewMatrixAction );
 
-      m_pNewCommentAction = new KAction( i18n( "Comment" ), "pmcomment", 0, this, TQT_SLOT( slotNewComment( ) ),
+      m_pNewCommentAction = new TDEAction( i18n( "Comment" ), "pmcomment", 0, this, TQT_SLOT( slotNewComment( ) ),
                                          actionCollection( ), "new_comment" );
       m_readWriteActions.append( m_pNewCommentAction );
-      m_pNewRawAction = new KAction( i18n( "Raw Povray" ), "pmraw", 0, this, TQT_SLOT( slotNewRaw( ) ),
+      m_pNewRawAction = new TDEAction( i18n( "Raw Povray" ), "pmraw", 0, this, TQT_SLOT( slotNewRaw( ) ),
                                          actionCollection( ), "new_raw" );
       m_readWriteActions.append( m_pNewRawAction );
 
       // POV-Ray 3.5 objects
-      m_pNewIsoSurfaceAction = new KAction( i18n( "Iso Surface" ), "pmisosurface", 0, this, TQT_SLOT( slotNewIsoSurface( ) ),
+      m_pNewIsoSurfaceAction = new TDEAction( i18n( "Iso Surface" ), "pmisosurface", 0, this, TQT_SLOT( slotNewIsoSurface( ) ),
                                          actionCollection( ), "new_isosurface" );
       m_readWriteActions.append( m_pNewIsoSurfaceAction );
-      m_pNewRadiosityAction = new KAction( i18n( "Radiosity" ), "pmradiosity", 0, this, TQT_SLOT( slotNewRadiosity( ) ),
+      m_pNewRadiosityAction = new TDEAction( i18n( "Radiosity" ), "pmradiosity", 0, this, TQT_SLOT( slotNewRadiosity( ) ),
                                          actionCollection( ), "new_radiosity" );
       m_readWriteActions.append( m_pNewRadiosityAction );
-      m_pNewGlobalPhotonsAction = new KAction( i18n( "Global Photons" ), "pmglobalphotons", 0, this, TQT_SLOT( slotNewGlobalPhotons( ) ),
+      m_pNewGlobalPhotonsAction = new TDEAction( i18n( "Global Photons" ), "pmglobalphotons", 0, this, TQT_SLOT( slotNewGlobalPhotons( ) ),
                                          actionCollection( ), "new_globalphotons" );
       m_readWriteActions.append( m_pNewGlobalPhotonsAction );
-      m_pNewPhotonsAction = new KAction( i18n( "Photons" ), "pmphotons", 0, this, TQT_SLOT( slotNewPhotons( ) ),
+      m_pNewPhotonsAction = new TDEAction( i18n( "Photons" ), "pmphotons", 0, this, TQT_SLOT( slotNewPhotons( ) ),
                                          actionCollection( ), "new_photons" );
       m_readWriteActions.append( m_pNewPhotonsAction );
-      m_pNewLightGroupAction = new KAction( i18n( "Light Group" ), "pmlightgroup", 0, this, TQT_SLOT( slotNewLightGroup( ) ),
+      m_pNewLightGroupAction = new TDEAction( i18n( "Light Group" ), "pmlightgroup", 0, this, TQT_SLOT( slotNewLightGroup( ) ),
                                          actionCollection( ), "new_lightgroup" );
       m_readWriteActions.append( m_pNewLightGroupAction );
-      m_pNewInteriorTextureAction = new KAction( i18n( "Interior Texture" ), "pminteriortexture", 0, this, TQT_SLOT( slotNewInteriorTexture( ) ),
+      m_pNewInteriorTextureAction = new TDEAction( i18n( "Interior Texture" ), "pminteriortexture", 0, this, TQT_SLOT( slotNewInteriorTexture( ) ),
                                          actionCollection( ), "new_interiortexture" );
       m_readWriteActions.append( m_pNewInteriorTextureAction );
-      m_pNewSphereSweepAction = new KAction( i18n( "Sphere Sweep" ), "pmspheresweep", 0, this, TQT_SLOT( slotNewSphereSweep( ) ),
+      m_pNewSphereSweepAction = new TDEAction( i18n( "Sphere Sweep" ), "pmspheresweep", 0, this, TQT_SLOT( slotNewSphereSweep( ) ),
                                          actionCollection( ), "new_spheresweep" );
       m_readWriteActions.append( m_pNewSphereSweepAction );
-      m_pNewMeshAction = new KAction( i18n( "Mesh" ), "pmmesh", 0, this, TQT_SLOT( slotNewMesh( ) ),
+      m_pNewMeshAction = new TDEAction( i18n( "Mesh" ), "pmmesh", 0, this, TQT_SLOT( slotNewMesh( ) ),
                                          actionCollection( ), "new_mesh" );
       m_readWriteActions.append( m_pNewMeshAction );
 
 #ifdef KPM_WITH_OBJECT_LIBRARY
-      m_pSearchLibraryObjectAction = new KAction( i18n( "Search Object" ), "pmsearchlibrary", 0, this, TQT_SLOT( slotSearchLibraryObject( ) ),
+      m_pSearchLibraryObjectAction = new TDEAction( i18n( "Search Object" ), "pmsearchlibrary", 0, this, TQT_SLOT( slotSearchLibraryObject( ) ),
                                          actionCollection( ), "search_library_object" );
       m_readWriteActions.append( m_pSearchLibraryObjectAction );
 #endif
@@ -657,7 +657,7 @@ void PMPart::updateNewObjectActions( )
    {
       TQPtrListIterator<PMMetaObject> it =
          m_pPrototypeManager->prototypeIterator( );
-      KAction* action;
+      TDEAction* action;
       bool enable;
       bool readWriteParent = false;
 
@@ -715,7 +715,7 @@ void PMPart::updateNewObjectActions( )
 
 void PMPart::disableReadWriteActions( )
 {
-   TQPtrListIterator<KAction> it( m_readWriteActions);
+   TQPtrListIterator<TDEAction> it( m_readWriteActions);
    for( ; it.current( ); ++it )
       it.current( )->setEnabled( false );
 }
diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h
index 9a4444bd..4758d51c 100644
--- a/kpovmodeler/pmpart.h
+++ b/kpovmodeler/pmpart.h
@@ -57,8 +57,8 @@ class PMInsertRuleSystem;
 class PMIOManager;
 
 class TQMimeSource;
-class KAction;
-class KSelectAction;
+class TDEAction;
+class TDESelectAction;
 class PMComboAction;
 class PMSpinBoxAction;
 class PMLabelAction;
@@ -903,120 +903,120 @@ private:
    bool m_onlyCopyPaste;
 
    // the actions
-   KAction* m_pImportAction;
-   KAction* m_pExportAction;
-
-   KAction* m_pCutAction;
-   KAction* m_pCopyAction;
-   KAction* m_pPasteAction;
-   KAction* m_pUndoAction;
-   KAction* m_pRedoAction;
-   KAction* m_pDeleteAction;
-
-   KAction* m_pNewGlobalSettingsAction;
-   KAction* m_pNewSkySphereAction;
-   KAction* m_pNewRainbowAction;
-   KAction* m_pNewFogAction;
-   KAction* m_pNewInteriorAction;
-   KAction* m_pNewMediaAction;
-   KAction* m_pNewDensityAction;
-   KAction* m_pNewMaterialAction;
-   KAction* m_pNewBoxAction;
-   KAction* m_pNewSphereAction;
-   KAction* m_pNewCylinderAction;
-   KAction* m_pNewConeAction;
-   KAction* m_pNewTorusAction;
-   KAction* m_pNewLatheAction;
-   KAction* m_pNewPrismAction;
-   KAction* m_pNewSurfaceOfRevolutionAction;
-   KAction* m_pNewSuperquadricEllipsoidAction;
-   KAction* m_pNewJuliaFractalAction;
-   KAction* m_pNewHeightFieldAction;
-   KAction* m_pNewTextAction;
-
-   KAction* m_pNewBlobAction;
-   KAction* m_pNewBlobSphereAction;
-   KAction* m_pNewBlobCylinderAction;
-
-   KAction* m_pNewPlaneAction;
-   KAction* m_pNewPolynomAction;
-
-   KAction* m_pNewDeclareAction;
-   KAction* m_pNewObjectLinkAction;
-
-   KAction* m_pNewUnionAction;
-   KAction* m_pNewDifferenceAction;
-   KAction* m_pNewIntersectionAction;
-   KAction* m_pNewMergeAction;
-
-   KAction* m_pNewBoundedByAction;
-   KAction* m_pNewClippedByAction;
-
-   KAction* m_pNewBicubicPatchAction;
-   KAction* m_pNewDiscAction;
-   KAction* m_pNewTriangleAction;
-
-   KAction* m_pNewLightAction;
-   KAction* m_pNewLooksLikeAction;
-   KAction* m_pNewProjectedThroughAction;
-
-   KAction* m_pNewCameraAction;
-
-   KAction* m_pNewTextureAction;
-   KAction* m_pNewPigmentAction;
-   KAction* m_pNewNormalAction;
-   KAction* m_pNewSolidColorAction;
-   KAction* m_pNewTextureListAction;
-   KAction* m_pNewColorListAction;
-   KAction* m_pNewPigmentListAction;
-   KAction* m_pNewNormalListAction;
-   KAction* m_pNewDensityListAction;
-   KAction* m_pNewFinishAction;
-   KAction* m_pNewPatternAction;
-   KAction* m_pNewBlendMapModifiersAction;
-   KAction* m_pNewTextureMapAction;
-   KAction* m_pNewMaterialMapAction;
-   KAction* m_pNewPigmentMapAction;
-   KAction* m_pNewColorMapAction;
-   KAction* m_pNewNormalMapAction;
-   KAction* m_pNewBumpMapAction;
-   KAction* m_pNewSlopeMapAction;
-   KAction* m_pNewDensityMapAction;
-   KAction* m_pNewSlopeAction;
-   KAction* m_pNewWarpAction;
-   KAction* m_pNewImageMapAction;
-   KAction* m_pNewQuickColorAction;
-
-   KAction* m_pNewTranslateAction;
-   KAction* m_pNewScaleAction;
-   KAction* m_pNewRotateAction;
-   KAction* m_pNewMatrixAction;
-
-   KAction* m_pNewCommentAction;
-   KAction* m_pNewRawAction;
+   TDEAction* m_pImportAction;
+   TDEAction* m_pExportAction;
+
+   TDEAction* m_pCutAction;
+   TDEAction* m_pCopyAction;
+   TDEAction* m_pPasteAction;
+   TDEAction* m_pUndoAction;
+   TDEAction* m_pRedoAction;
+   TDEAction* m_pDeleteAction;
+
+   TDEAction* m_pNewGlobalSettingsAction;
+   TDEAction* m_pNewSkySphereAction;
+   TDEAction* m_pNewRainbowAction;
+   TDEAction* m_pNewFogAction;
+   TDEAction* m_pNewInteriorAction;
+   TDEAction* m_pNewMediaAction;
+   TDEAction* m_pNewDensityAction;
+   TDEAction* m_pNewMaterialAction;
+   TDEAction* m_pNewBoxAction;
+   TDEAction* m_pNewSphereAction;
+   TDEAction* m_pNewCylinderAction;
+   TDEAction* m_pNewConeAction;
+   TDEAction* m_pNewTorusAction;
+   TDEAction* m_pNewLatheAction;
+   TDEAction* m_pNewPrismAction;
+   TDEAction* m_pNewSurfaceOfRevolutionAction;
+   TDEAction* m_pNewSuperquadricEllipsoidAction;
+   TDEAction* m_pNewJuliaFractalAction;
+   TDEAction* m_pNewHeightFieldAction;
+   TDEAction* m_pNewTextAction;
+
+   TDEAction* m_pNewBlobAction;
+   TDEAction* m_pNewBlobSphereAction;
+   TDEAction* m_pNewBlobCylinderAction;
+
+   TDEAction* m_pNewPlaneAction;
+   TDEAction* m_pNewPolynomAction;
+
+   TDEAction* m_pNewDeclareAction;
+   TDEAction* m_pNewObjectLinkAction;
+
+   TDEAction* m_pNewUnionAction;
+   TDEAction* m_pNewDifferenceAction;
+   TDEAction* m_pNewIntersectionAction;
+   TDEAction* m_pNewMergeAction;
+
+   TDEAction* m_pNewBoundedByAction;
+   TDEAction* m_pNewClippedByAction;
+
+   TDEAction* m_pNewBicubicPatchAction;
+   TDEAction* m_pNewDiscAction;
+   TDEAction* m_pNewTriangleAction;
+
+   TDEAction* m_pNewLightAction;
+   TDEAction* m_pNewLooksLikeAction;
+   TDEAction* m_pNewProjectedThroughAction;
+
+   TDEAction* m_pNewCameraAction;
+
+   TDEAction* m_pNewTextureAction;
+   TDEAction* m_pNewPigmentAction;
+   TDEAction* m_pNewNormalAction;
+   TDEAction* m_pNewSolidColorAction;
+   TDEAction* m_pNewTextureListAction;
+   TDEAction* m_pNewColorListAction;
+   TDEAction* m_pNewPigmentListAction;
+   TDEAction* m_pNewNormalListAction;
+   TDEAction* m_pNewDensityListAction;
+   TDEAction* m_pNewFinishAction;
+   TDEAction* m_pNewPatternAction;
+   TDEAction* m_pNewBlendMapModifiersAction;
+   TDEAction* m_pNewTextureMapAction;
+   TDEAction* m_pNewMaterialMapAction;
+   TDEAction* m_pNewPigmentMapAction;
+   TDEAction* m_pNewColorMapAction;
+   TDEAction* m_pNewNormalMapAction;
+   TDEAction* m_pNewBumpMapAction;
+   TDEAction* m_pNewSlopeMapAction;
+   TDEAction* m_pNewDensityMapAction;
+   TDEAction* m_pNewSlopeAction;
+   TDEAction* m_pNewWarpAction;
+   TDEAction* m_pNewImageMapAction;
+   TDEAction* m_pNewQuickColorAction;
+
+   TDEAction* m_pNewTranslateAction;
+   TDEAction* m_pNewScaleAction;
+   TDEAction* m_pNewRotateAction;
+   TDEAction* m_pNewMatrixAction;
+
+   TDEAction* m_pNewCommentAction;
+   TDEAction* m_pNewRawAction;
 
    // POV-Ray 3.5 objects
-   KAction* m_pNewIsoSurfaceAction;
-   KAction* m_pNewRadiosityAction;
-   KAction* m_pNewGlobalPhotonsAction;
-   KAction* m_pNewPhotonsAction;
-   KAction* m_pNewLightGroupAction;
-   KAction* m_pNewInteriorTextureAction;
-   KAction* m_pNewSphereSweepAction;
-   KAction* m_pNewMeshAction;
+   TDEAction* m_pNewIsoSurfaceAction;
+   TDEAction* m_pNewRadiosityAction;
+   TDEAction* m_pNewGlobalPhotonsAction;
+   TDEAction* m_pNewPhotonsAction;
+   TDEAction* m_pNewLightGroupAction;
+   TDEAction* m_pNewInteriorTextureAction;
+   TDEAction* m_pNewSphereSweepAction;
+   TDEAction* m_pNewMeshAction;
 
-   KAction* m_pSearchLibraryObjectAction;
+   TDEAction* m_pSearchLibraryObjectAction;
 
    PMComboAction* m_pRenderComboAction;
-   KAction* m_pRenderSettingsAction;
-   KAction* m_pViewRenderWindowAction;
-   KAction* m_pRenderAction;
+   TDEAction* m_pRenderSettingsAction;
+   TDEAction* m_pViewRenderWindowAction;
+   TDEAction* m_pRenderAction;
    PMSpinBoxAction* m_pVisibilityLevelAction;
    PMLabelAction* m_pVisibilityLabelAction;
-   KSelectAction* m_pGlobalDetailAction;
+   TDESelectAction* m_pGlobalDetailAction;
    PMLabelAction* m_pGlobalDetailLabelAction;
 
-   TQPtrList<KAction> m_readWriteActions;
+   TQPtrList<TDEAction> m_readWriteActions;
 
    PMPrototypeManager* m_pPrototypeManager;
    PMInsertRuleSystem* m_pInsertRuleSystem;
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 35cd78cf..86dea89b 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -108,7 +108,7 @@ void PMShell::setupActions( )
    KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose( ) ), actionCollection( ) );
    KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close( ) ), actionCollection( ) );
 
-   m_pPathAction = new KToggleAction( i18n( "Show &Path" ), 0, TQT_TQOBJECT(this),
+   m_pPathAction = new TDEToggleAction( i18n( "Show &Path" ), 0, TQT_TQOBJECT(this),
                                TQT_SLOT( slotShowPath( ) ), actionCollection( ),
                                "options_show_path" );
    m_pPathAction->setCheckedState(i18n("Hide &Path"));
@@ -124,50 +124,50 @@ void PMShell::setupActions( )
                                   actionCollection( ) );
    KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotSettings( ) ), actionCollection( ) );
 
-   m_pNewTopViewAction = new KAction( i18n( "New Top View" ), 0, TQT_TQOBJECT(this),
+   m_pNewTopViewAction = new TDEAction( i18n( "New Top View" ), 0, TQT_TQOBJECT(this),
                                       TQT_SLOT( slotNewTopView( ) ),
                                       actionCollection( ), "view_new_topview" );
-   m_pNewBottomViewAction = new KAction( i18n( "New Bottom View" ), 0, TQT_TQOBJECT(this),
+   m_pNewBottomViewAction = new TDEAction( i18n( "New Bottom View" ), 0, TQT_TQOBJECT(this),
                                          TQT_SLOT( slotNewBottomView( ) ),
                                          actionCollection( ), "view_new_bottomview" );
-   m_pNewLeftViewAction = new KAction( i18n( "New Left View" ), 0, TQT_TQOBJECT(this),
+   m_pNewLeftViewAction = new TDEAction( i18n( "New Left View" ), 0, TQT_TQOBJECT(this),
                                        TQT_SLOT( slotNewLeftView( ) ),
                                        actionCollection( ), "view_new_leftview" );
-   m_pNewRightViewAction = new KAction( i18n( "New Right View" ), 0, TQT_TQOBJECT(this),
+   m_pNewRightViewAction = new TDEAction( i18n( "New Right View" ), 0, TQT_TQOBJECT(this),
                                         TQT_SLOT( slotNewRightView( ) ),
                                         actionCollection( ), "view_new_rightview" );
-   m_pNewFrontViewAction = new KAction( i18n( "New Front View" ), 0, TQT_TQOBJECT(this),
+   m_pNewFrontViewAction = new TDEAction( i18n( "New Front View" ), 0, TQT_TQOBJECT(this),
                                         TQT_SLOT( slotNewFrontView( ) ),
                                         actionCollection( ), "view_new_frontview" );
-   m_pNewBackViewAction = new KAction( i18n( "New Back View" ), 0, TQT_TQOBJECT(this),
+   m_pNewBackViewAction = new TDEAction( i18n( "New Back View" ), 0, TQT_TQOBJECT(this),
                                        TQT_SLOT( slotNewBackView( ) ),
                                        actionCollection( ), "view_new_back_view" );
-   m_pNewCameraViewAction = new KAction( i18n( "New Camera View" ), 0, TQT_TQOBJECT(this),
+   m_pNewCameraViewAction = new TDEAction( i18n( "New Camera View" ), 0, TQT_TQOBJECT(this),
                                          TQT_SLOT( slotNewCameraView( ) ),
                                          actionCollection( ), "view_new_cameraview" );
 
-   m_pNewTreeViewAction = new KAction( i18n( "New Object Tree" ), 0, TQT_TQOBJECT(this),
+   m_pNewTreeViewAction = new TDEAction( i18n( "New Object Tree" ), 0, TQT_TQOBJECT(this),
                               TQT_SLOT( slotNewTreeView( ) ), actionCollection( ),
                               "view_new_treeview" );
-   m_pNewDialogViewAction = new KAction( i18n( "New Properties View" ), 0, TQT_TQOBJECT(this),
+   m_pNewDialogViewAction = new TDEAction( i18n( "New Properties View" ), 0, TQT_TQOBJECT(this),
                              TQT_SLOT( slotNewDialogView( ) ), actionCollection( ),
                              "view_new_dialogview" );
 
 #ifdef KPM_WITH_OBJECT_LIBRARY
-   m_pNewLibraryBrowserAction = new KAction( i18n( "New Library Browser" ), 0, TQT_TQOBJECT(this),
+   m_pNewLibraryBrowserAction = new TDEAction( i18n( "New Library Browser" ), 0, TQT_TQOBJECT(this),
                                     TQT_SLOT( slotNewLibraryBrowserView( ) ), actionCollection( ),
                                     "view_new_librarybrowser" );
 #endif
 
    // Creating the view layouts menu
-   m_pViewLayoutsAction = new KActionMenu( i18n( "View Layouts" ),
+   m_pViewLayoutsAction = new TDEActionMenu( i18n( "View Layouts" ),
                                            actionCollection( ), "view_layouts_menu" );
-   KPopupMenu* menu = m_pViewLayoutsAction->popupMenu( );
+   TDEPopupMenu* menu = m_pViewLayoutsAction->popupMenu( );
    connect( menu, TQT_SIGNAL( aboutToShow( ) ), TQT_SLOT( slotViewsMenuAboutToShow( ) ) );
    PMViewLayoutManager::theManager( )->fillPopupMenu( menu );
    connect( menu, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotSelectedLayout( int ) ) );
 
-   m_pSaveViewLayoutAction = new KAction( i18n( "Save View Layout..." ), 0, TQT_TQOBJECT(this),
+   m_pSaveViewLayoutAction = new TDEAction( i18n( "Save View Layout..." ), 0, TQT_TQOBJECT(this),
                                           TQT_SLOT( slotSaveViewLayout( ) ),
                                           actionCollection( ), "save_view_layout" );
 }
@@ -607,7 +607,7 @@ void PMShell::setCaption( const TQString& caption )
          tmp = caption;
    }
 
-   KMainWindow::setCaption( tmp, m_pPart->isModified( ) );
+   TDEMainWindow::setCaption( tmp, m_pPart->isModified( ) );
 }
 
 void PMShell::statusMsg( const TQString& text )
@@ -668,7 +668,7 @@ void PMShell::slotSaveViewLayout( )
 
 void PMShell::slotViewsMenuAboutToShow( )
 {
-   KPopupMenu* menu = m_pViewLayoutsAction->popupMenu( );
+   TDEPopupMenu* menu = m_pViewLayoutsAction->popupMenu( );
 
    PMViewLayoutManager::theManager( )->fillPopupMenu( menu );
 }
diff --git a/kpovmodeler/pmshell.h b/kpovmodeler/pmshell.h
index 1192a76d..8e354706 100644
--- a/kpovmodeler/pmshell.h
+++ b/kpovmodeler/pmshell.h
@@ -30,11 +30,11 @@
 
 //class KHelpMenu;
 class KStatusBar;
-class KListAction;
-class KToggleAction;
-class KSelectAction;
-class KRecentFilesAction;
-class KActionMenu;
+class TDEListAction;
+class TDEToggleAction;
+class TDESelectAction;
+class TDERecentFilesAction;
+class TDEActionMenu;
 class PMViewOptions;
 
 /**
@@ -143,24 +143,24 @@ public:
    //PMDockWidget* create3DView( PMGLView::PMViewType );
 
 private:
-   KRecentFilesAction* m_pRecent;
-   KToggleAction* m_pToolbarAction;
-   KToggleAction* m_pStatusbarAction;
-   KToggleAction* m_pPathAction;
-
-   KAction* m_pNewTreeViewAction;
-   KAction* m_pNewDialogViewAction;
-   KAction* m_pNewTopViewAction;
-   KAction* m_pNewBottomViewAction;
-   KAction* m_pNewLeftViewAction;
-   KAction* m_pNewRightViewAction;
-   KAction* m_pNewFrontViewAction;
-   KAction* m_pNewBackViewAction;
-   KAction* m_pNewCameraViewAction;
-   KAction* m_pNewLibraryBrowserAction;
-
-   KActionMenu* m_pViewLayoutsAction;
-   KAction* m_pSaveViewLayoutAction;
+   TDERecentFilesAction* m_pRecent;
+   TDEToggleAction* m_pToolbarAction;
+   TDEToggleAction* m_pStatusbarAction;
+   TDEToggleAction* m_pPathAction;
+
+   TDEAction* m_pNewTreeViewAction;
+   TDEAction* m_pNewDialogViewAction;
+   TDEAction* m_pNewTopViewAction;
+   TDEAction* m_pNewBottomViewAction;
+   TDEAction* m_pNewLeftViewAction;
+   TDEAction* m_pNewRightViewAction;
+   TDEAction* m_pNewFrontViewAction;
+   TDEAction* m_pNewBackViewAction;
+   TDEAction* m_pNewCameraViewAction;
+   TDEAction* m_pNewLibraryBrowserAction;
+
+   TDEActionMenu* m_pViewLayoutsAction;
+   TDEAction* m_pSaveViewLayoutAction;
 
    KStatusBar* m_pStatusBar;
    PMPart* m_pPart;
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp
index b6d72b3c..f8e1c968 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -832,7 +832,7 @@ PMViewLayout* PMViewLayoutManager::findLayout( const TQString& name )
    return &( *it );
 }
 
-void PMViewLayoutManager::fillPopupMenu( KPopupMenu* pMenu )
+void PMViewLayoutManager::fillPopupMenu( TDEPopupMenu* pMenu )
 {
    TQStringList lst = availableLayouts( );
    TQStringList::ConstIterator it = lst.begin( );
diff --git a/kpovmodeler/pmviewlayoutmanager.h b/kpovmodeler/pmviewlayoutmanager.h
index 9cfdee67..bef34168 100644
--- a/kpovmodeler/pmviewlayoutmanager.h
+++ b/kpovmodeler/pmviewlayoutmanager.h
@@ -271,7 +271,7 @@ public:
    /**
     * Fill the available layouts menu
     */
-   void fillPopupMenu( KPopupMenu* pMenu );
+   void fillPopupMenu( TDEPopupMenu* pMenu );
 private:
    /**
     * Constructor
diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp
index 686af2e5..6c81272a 100644
--- a/kruler/klineal.cpp
+++ b/kruler/klineal.cpp
@@ -67,7 +67,7 @@ static const uchar cursorBits[] = {
 * create the thingy with no borders and set up
 * its members
 */
-KLineal::KLineal(TQWidget*parent,const char* name):KMainWindow(parent,name){
+KLineal::KLineal(TQWidget*parent,const char* name):TDEMainWindow(parent,name){
 	if (!name) {
 		name = "klineal";
 	}
@@ -143,9 +143,9 @@ KLineal::KLineal(TQWidget*parent,const char* name):KMainWindow(parent,name){
   _clicked = false;
   setOrientation(South);
   // setMediumLength();
-  mMenu = new KPopupMenu(this);
+  mMenu = new TDEPopupMenu(this);
   mMenu->insertTitle(i18n("KRuler"));
-  KPopupMenu *oriMenu = new KPopupMenu(this);
+  TDEPopupMenu *oriMenu = new TDEPopupMenu(this);
   oriMenu->insertItem(UserIconSet("kruler-north"), i18n("&North"), this, TQT_SLOT(setNorth()), Key_N);
   oriMenu->insertItem(UserIconSet("kruler-east"), i18n("&East"), this, TQT_SLOT(setEast()), Key_E);
   oriMenu->insertItem(UserIconSet("kruler-south"), i18n("&South"), this, TQT_SLOT(setSouth()), Key_S);
@@ -153,7 +153,7 @@ KLineal::KLineal(TQWidget*parent,const char* name):KMainWindow(parent,name){
   oriMenu->insertItem(i18n("&Turn Right"), this, TQT_SLOT(turnRight()), Key_R);
   oriMenu->insertItem(i18n("Turn &Left"), this, TQT_SLOT(turnLeft()), Key_L);
   mMenu->insertItem(i18n("&Orientation"), oriMenu);
-  mLenMenu = new KPopupMenu(this);
+  mLenMenu = new TDEPopupMenu(this);
   mLenMenu->insertItem(i18n("&Short"), this, TQT_SLOT(setShortLength()), CTRL+Key_S);
   mLenMenu->insertItem(i18n("&Medium"), this, TQT_SLOT(setMediumLength()), CTRL+Key_M);
   mLenMenu->insertItem(i18n("&Tall"), this, TQT_SLOT(setTallLength()), CTRL+Key_T);
@@ -382,8 +382,8 @@ void KLineal::choseColor() {
 */
 void KLineal::choseFont() {
   TQFont font = mScaleFont;
-  int result = KFontDialog::getFont(font, false, this);
-  if (result == KFontDialog::Accepted) {
+  int result = TDEFontDialog::getFont(font, false, this);
+  if (result == TDEFontDialog::Accepted) {
     setFont(font);
   }
 }
@@ -515,7 +515,7 @@ void KLineal::keyPressEvent(TQKeyEvent *e) {
     	dist.setY(1);
  			break;
   	default:
-    	KMainWindow::keyPressEvent(e);
+    	TDEMainWindow::keyPressEvent(e);
       return;
  	}
 	if (e->state() & ShiftButton) {
diff --git a/kruler/klineal.h b/kruler/klineal.h
index b2622e0a..1ec5f747 100644
--- a/kruler/klineal.h
+++ b/kruler/klineal.h
@@ -30,7 +30,7 @@
 #include <tqwidget.h>
 #include <tqcursor.h>
 
-class KLineal : public KMainWindow {
+class KLineal : public TDEMainWindow {
   Q_OBJECT
   
 public:
@@ -72,8 +72,8 @@ private:
   int mOrientation;
   int mLongEdgeLen;
   int mShortEdgeLen;
-  KPopupMenu *mMenu;
-  KPopupMenu *mLenMenu;
+  TDEPopupMenu *mMenu;
+  TDEPopupMenu *mLenMenu;
   TQColor mColor;
   TQColor mStoredColor;
   TQCursor mCurrentCursor;
diff --git a/kruler/main.cpp b/kruler/main.cpp
index b11b2b56..89096993 100644
--- a/kruler/main.cpp
+++ b/kruler/main.cpp
@@ -11,7 +11,7 @@
 
 #define RESTORE_RULERS(type) {				\
 	int n = 1;					\
-	while (KMainWindow::canBeRestored(n)) {		\
+	while (TDEMainWindow::canBeRestored(n)) {		\
 		type* ruler = new type;			\
 		ruler->restore(n);			\
 		a.setMainWidget(ruler);			\
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index 2e802bc7..eaa38dc0 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -115,19 +115,19 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent)
     TQPushButton *helpButton = actionButton( Help );
     helpButton->setPopup(helpMenu->menu());
 
-    KAccel* accel = new KAccel(this);
-    accel->insert(KStdAccel::Quit, TQT_TQOBJECT(kapp), TQT_SLOT(quit()));
+    TDEAccel* accel = new TDEAccel(this);
+    accel->insert(TDEStdAccel::Quit, TQT_TQOBJECT(kapp), TQT_SLOT(quit()));
     accel->insert( "QuickSave", i18n("Quick Save Snapshot &As..."),
 		   i18n("Save the snapshot to the file specified by the user without showing the file dialog."),
 		   CTRL+SHIFT+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSave()));
-    accel->insert(KStdAccel::Save, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()));
-//    accel->insert(KShortcut(CTRL+Key_A), TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()));
+    accel->insert(TDEStdAccel::Save, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()));
+//    accel->insert(TDEShortcut(CTRL+Key_A), TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()));
     accel->insert( "SaveAs", i18n("Save Snapshot &As..."),
 		   i18n("Save the snapshot to the file specified by the user."),
 		   CTRL+Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()));
-    accel->insert(KStdAccel::Print, TQT_TQOBJECT(this), TQT_SLOT(slotPrint()));
-    accel->insert(KStdAccel::New, TQT_TQOBJECT(this), TQT_SLOT(slotGrab()));
-    accel->insert(KStdAccel::Copy, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()));
+    accel->insert(TDEStdAccel::Print, TQT_TQOBJECT(this), TQT_SLOT(slotPrint()));
+    accel->insert(TDEStdAccel::New, TQT_TQOBJECT(this), TQT_SLOT(slotGrab()));
+    accel->insert(TDEStdAccel::Copy, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()));
 
     accel->insert( "Quit2", Key_Q, TQT_TQOBJECT(this), TQT_SLOT(slotSave()));
     accel->insert( "Save2", Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()));
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 46e301fd..36ff7992 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -55,17 +55,17 @@ struct KSVGPlugin::Private
 	KSVGWidget *window;
 	KSVGPluginBrowserExtension *extension;
 
-	KAction *zoomInAction;
-	KAction *zoomOutAction;
-	KAction *zoomResetAction;
-	KAction *stopAnimationsAction;
-	KAction *viewSourceAction;
-	KAction *viewMemoryAction;
-	KAction *aboutApp;
-	KAction *saveToPNG;
-	KToggleAction *fontKerningAction;
-	KToggleAction *progressiveAction;
-	KSelectAction *renderingBackendAction;
+	TDEAction *zoomInAction;
+	TDEAction *zoomOutAction;
+	TDEAction *zoomResetAction;
+	TDEAction *stopAnimationsAction;
+	TDEAction *viewSourceAction;
+	TDEAction *viewMemoryAction;
+	TDEAction *aboutApp;
+	TDEAction *saveToPNG;
+	TDEToggleAction *fontKerningAction;
+	TDEToggleAction *progressiveAction;
+	TDESelectAction *renderingBackendAction;
 
 	TQString description;
 
@@ -114,22 +114,22 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const
 
 	ksvgd->zoomInAction = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection());
 	ksvgd->zoomOutAction = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection());
-	ksvgd->zoomResetAction =  new KAction(i18n("Zoom &Reset"), "viewmag", this, TQT_SLOT(slotZoomReset()), actionCollection(), "zoom_reset");
-	ksvgd->stopAnimationsAction = new KAction(i18n("&Stop Animations"), "stop", Key_Escape, this, TQT_SLOT(slotStop()), actionCollection(), "stop_anims");
-	ksvgd->viewSourceAction = new KAction(i18n("View &Source"), "document2", Key_F6, this, TQT_SLOT(slotViewSource()), actionCollection(), "view_source");
-	ksvgd->viewMemoryAction = new KAction(i18n("View &Memory"), "document2", Key_F7, this, TQT_SLOT(slotViewMemory()), actionCollection(), "view_memory");
-	ksvgd->saveToPNG = new KAction(i18n("Save to PNG..."), "save", 0, this, TQT_SLOT(slotSaveToPNG()), actionCollection(), "save_to_png");
+	ksvgd->zoomResetAction =  new TDEAction(i18n("Zoom &Reset"), "viewmag", this, TQT_SLOT(slotZoomReset()), actionCollection(), "zoom_reset");
+	ksvgd->stopAnimationsAction = new TDEAction(i18n("&Stop Animations"), "stop", Key_Escape, this, TQT_SLOT(slotStop()), actionCollection(), "stop_anims");
+	ksvgd->viewSourceAction = new TDEAction(i18n("View &Source"), "document2", Key_F6, this, TQT_SLOT(slotViewSource()), actionCollection(), "view_source");
+	ksvgd->viewMemoryAction = new TDEAction(i18n("View &Memory"), "document2", Key_F7, this, TQT_SLOT(slotViewMemory()), actionCollection(), "view_memory");
+	ksvgd->saveToPNG = new TDEAction(i18n("Save to PNG..."), "save", 0, this, TQT_SLOT(slotSaveToPNG()), actionCollection(), "save_to_png");
 //	ksvgd->aboutApp = KStdAction::aboutApp(this, TQT_SLOT(slotAboutKSVG()), actionCollection());//, "KSVG");
-	ksvgd->aboutApp = new KAction(i18n("About KSVG"), "vectorgfx", 0, this, TQT_SLOT(slotAboutKSVG()), actionCollection(), "help_about_app");
-	ksvgd->fontKerningAction = new KToggleAction(i18n("Use Font &Kerning"), "viewmagfit", Key_F8, this, TQT_SLOT(slotFontKerning()), actionCollection(), "font_kerning");
-	ksvgd->progressiveAction = new KToggleAction(i18n("Use &Progressive Rendering"), "", Key_F9, this, TQT_SLOT(slotProgressiveRendering()), actionCollection(), "progressive");
+	ksvgd->aboutApp = new TDEAction(i18n("About KSVG"), "vectorgfx", 0, this, TQT_SLOT(slotAboutKSVG()), actionCollection(), "help_about_app");
+	ksvgd->fontKerningAction = new TDEToggleAction(i18n("Use Font &Kerning"), "viewmagfit", Key_F8, this, TQT_SLOT(slotFontKerning()), actionCollection(), "font_kerning");
+	ksvgd->progressiveAction = new TDEToggleAction(i18n("Use &Progressive Rendering"), "", Key_F9, this, TQT_SLOT(slotProgressiveRendering()), actionCollection(), "progressive");
 
 	KSimpleConfig config("ksvgpluginrc", true);
 	config.setGroup("Rendering");
 	ksvgd->fontKerningAction->setChecked(config.readBoolEntry("FontKerning", true));
 	ksvgd->progressiveAction->setChecked(config.readBoolEntry("ProgressiveRendering", true));
 
-	ksvgd->renderingBackendAction = new KSelectAction(i18n("Rendering &Backend"), 0, this, TQT_SLOT(slotRenderingBackend()), actionCollection(), "rendering_backend");
+	ksvgd->renderingBackendAction = new TDESelectAction(i18n("Rendering &Backend"), 0, this, TQT_SLOT(slotRenderingBackend()), actionCollection(), "rendering_backend");
 
 	TQStringList items;
 	TQPtrList<KSVG::CanvasInfo> canvasList = KSVG::CanvasFactory::self()->canvasList();
diff --git a/ksvg/scripts/OPENREF b/ksvg/scripts/OPENREF
index f8fbecb0..b245877f 100755
--- a/ksvg/scripts/OPENREF
+++ b/ksvg/scripts/OPENREF
@@ -4,6 +4,6 @@ loc=`pwd`/$1
 sleep 1
 dcop $pid konqueror-mainwindow#1 openURL ${loc}svg
 sleep 1
-dcop $pid qt/KXMLGUILClient-KActionCollection/splitviewh activate
+dcop $pid qt/KXMLGUILClient-TDEActionCollection/splitviewh activate
 sleep 1
 dcop $pid konqueror-mainwindow#1 openURL ${loc}png
diff --git a/kuickshow/ChangeLog b/kuickshow/ChangeLog
index eda22bb8..4609a122 100644
--- a/kuickshow/ChangeLog
+++ b/kuickshow/ChangeLog
@@ -80,7 +80,7 @@ Sat Aug 25 02:58:31 2001  Carsten Pfeiffer  <pfeiffer@kde.org>
 	mouse-wheel can switch between images now, per request of
 	Bill Benken <bilben1@home.com>
 
-	* also fixed the KStdAccel::save() and close() accels not working
+	* also fixed the TDEStdAccel::save() and close() accels not working
 	in the image window
 
 Sat Aug  4 03:37:50 2001  Carsten Pfeiffer  <pfeiffer@kde.org>
@@ -242,7 +242,7 @@ Wed Mar  7 01:39:34 2001  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 	* src/imagewindow.cpp:
 	update the accelerators when applying new configuration
-	(delete the old and create a new KAccel, setKeyDict() doesn't
+	(delete the old and create a new TDEAccel, setKeyDict() doesn't
 	work in our case
 
 	* use QWidget::x11Display() for later multihead support)
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
index bc931794..525397e5 100644
--- a/kuickshow/src/filewidget.cpp
+++ b/kuickshow/src/filewidget.cpp
@@ -80,9 +80,9 @@ FileWidget::~FileWidget()
 void FileWidget::initActions()
 {
     int index = 0;
-    KActionCollection *coll = actionCollection();
-    KActionSeparator *sep = new KActionSeparator( coll, "kuicksep" );
-    KActionMenu *menu = static_cast<KActionMenu*>( coll->action("popupMenu") );
+    TDEActionCollection *coll = actionCollection();
+    TDEActionSeparator *sep = new TDEActionSeparator( coll, "kuicksep" );
+    TDEActionMenu *menu = static_cast<TDEActionMenu*>( coll->action("popupMenu") );
 
     menu->insert( coll->action("kuick_showInOtherWindow"), index++ );
     menu->insert( coll->action("kuick_showInSameWindow"), index++ );
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 97aae529..0fcbde11 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -111,7 +111,7 @@ void ImageWindow::init()
     contrastMenu = 0L;
 
 
-    m_actions = new KActionCollection( this );
+    m_actions = new TDEActionCollection( this );
 
     if ( !s_handCursor ) {
         TQString file = locate( "appdata", "pics/handcursor.png" );
@@ -145,51 +145,51 @@ void ImageWindow::updateActions()
 
 void ImageWindow::setupActions()
 {
-    new KAction( i18n("Show Next Image"), KStdAccel::next(),
+    new TDEAction( i18n("Show Next Image"), TDEStdAccel::next(),
                  TQT_TQOBJECT(this), TQT_SLOT( slotRequestNext() ),
                  m_actions, "next_image" );
-    new KAction( i18n("Show Previous Image"), KStdAccel::prior(),
+    new TDEAction( i18n("Show Previous Image"), TDEStdAccel::prior(),
                  TQT_TQOBJECT(this), TQT_SLOT( slotRequestPrevious() ),
                  m_actions, "previous_image" );
 
-    new KAction( i18n("Delete Image"), SHIFT + Key_Delete,
+    new TDEAction( i18n("Delete Image"), SHIFT + Key_Delete,
                  TQT_TQOBJECT(this), TQT_SLOT( imageDelete() ),
                  m_actions, "delete_image" );
-    new KAction( i18n("Move Image to Trash"), Key_Delete,
+    new TDEAction( i18n("Move Image to Trash"), Key_Delete,
                  TQT_TQOBJECT(this), TQT_SLOT( imageTrash() ),
                  m_actions, "trash_image" );
 
-    new KAction( i18n("Zoom In"), Key_Plus,
+    new TDEAction( i18n("Zoom In"), Key_Plus,
                  TQT_TQOBJECT(this), TQT_SLOT( zoomIn() ),
                  m_actions, "zoom_in" );
-    new KAction( i18n("Zoom Out"), Key_Minus,
+    new TDEAction( i18n("Zoom Out"), Key_Minus,
                  TQT_TQOBJECT(this), TQT_SLOT( zoomOut() ),
                  m_actions, "zoom_out" );
-    new KAction( i18n("Restore Original Size"), Key_O,
+    new TDEAction( i18n("Restore Original Size"), Key_O,
                  TQT_TQOBJECT(this), TQT_SLOT( showImageOriginalSize() ),
                  m_actions, "original_size" );
-    new KAction( i18n("Maximize"), Key_M,
+    new TDEAction( i18n("Maximize"), Key_M,
                  TQT_TQOBJECT(this), TQT_SLOT( maximize() ),
                  m_actions, "maximize" );
 
-    new KAction( i18n("Rotate 90 Degrees"), Key_9,
+    new TDEAction( i18n("Rotate 90 Degrees"), Key_9,
                  TQT_TQOBJECT(this), TQT_SLOT( rotate90() ),
                  m_actions, "rotate90" );
-    new KAction( i18n("Rotate 180 Degrees"), Key_8,
+    new TDEAction( i18n("Rotate 180 Degrees"), Key_8,
                  TQT_TQOBJECT(this), TQT_SLOT( rotate180() ),
                  m_actions, "rotate180" );
-    new KAction( i18n("Rotate 270 Degrees"), Key_7,
+    new TDEAction( i18n("Rotate 270 Degrees"), Key_7,
                  TQT_TQOBJECT(this), TQT_SLOT( rotate270() ),
                  m_actions, "rotate270" );
 
-    new KAction( i18n("Flip Horizontally"), Key_Asterisk,
+    new TDEAction( i18n("Flip Horizontally"), Key_Asterisk,
                  TQT_TQOBJECT(this), TQT_SLOT( flipHoriz() ),
                  m_actions, "flip_horicontally" );
-    new KAction( i18n("Flip Vertically"), Key_Slash,
+    new TDEAction( i18n("Flip Vertically"), Key_Slash,
                  TQT_TQOBJECT(this), TQT_SLOT( flipVert() ),
                  m_actions, "flip_vertically" );
 
-    new KAction( i18n("Print Image..."), KStdAccel::print(),
+    new TDEAction( i18n("Print Image..."), TDEStdAccel::print(),
                  TQT_TQOBJECT(this), TQT_SLOT( printImage() ),
                  m_actions, "print_image" );
     KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( saveImage() ),
@@ -198,64 +198,64 @@ void ImageWindow::setupActions()
     KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ),
                  m_actions, "close_image" );
     // --------
-    new KAction( i18n("More Brightness"), Key_B,
+    new TDEAction( i18n("More Brightness"), Key_B,
                  TQT_TQOBJECT(this), TQT_SLOT( moreBrightness() ),
                  m_actions, "more_brightness" );
-    new KAction( i18n("Less Brightness"), SHIFT + Key_B,
+    new TDEAction( i18n("Less Brightness"), SHIFT + Key_B,
                  TQT_TQOBJECT(this), TQT_SLOT( lessBrightness() ),
                  m_actions, "less_brightness" );
-    new KAction( i18n("More Contrast"), Key_C,
+    new TDEAction( i18n("More Contrast"), Key_C,
                  TQT_TQOBJECT(this), TQT_SLOT( moreContrast() ),
                  m_actions, "more_contrast" );
-    new KAction( i18n("Less Contrast"), SHIFT + Key_C,
+    new TDEAction( i18n("Less Contrast"), SHIFT + Key_C,
                  TQT_TQOBJECT(this), TQT_SLOT( lessContrast() ),
                  m_actions, "less_contrast" );
-    new KAction( i18n("More Gamma"), Key_G,
+    new TDEAction( i18n("More Gamma"), Key_G,
                  TQT_TQOBJECT(this), TQT_SLOT( moreGamma() ),
                  m_actions, "more_gamma" );
-    new KAction( i18n("Less Gamma"), SHIFT + Key_G,
+    new TDEAction( i18n("Less Gamma"), SHIFT + Key_G,
                  TQT_TQOBJECT(this), TQT_SLOT( lessGamma() ),
                  m_actions, "less_gamma" );
 
     // --------
-    new KAction( i18n("Scroll Up"), Key_Up,
+    new TDEAction( i18n("Scroll Up"), Key_Up,
                  TQT_TQOBJECT(this), TQT_SLOT( scrollUp() ),
                  m_actions, "scroll_up" );
-    new KAction( i18n("Scroll Down"), Key_Down,
+    new TDEAction( i18n("Scroll Down"), Key_Down,
                  TQT_TQOBJECT(this), TQT_SLOT( scrollDown() ),
                  m_actions, "scroll_down" );
-    new KAction( i18n("Scroll Left"), Key_Left,
+    new TDEAction( i18n("Scroll Left"), Key_Left,
                  TQT_TQOBJECT(this), TQT_SLOT( scrollLeft() ),
                  m_actions, "scroll_left" );
-    new KAction( i18n("Scroll Right"), Key_Right,
+    new TDEAction( i18n("Scroll Right"), Key_Right,
                  TQT_TQOBJECT(this), TQT_SLOT( scrollRight() ),
                  m_actions, "scroll_right" );
     // --------
-    new KAction( i18n("Pause Slideshow"), Key_P,
+    new TDEAction( i18n("Pause Slideshow"), Key_P,
                  TQT_TQOBJECT(this), TQT_SLOT( pauseSlideShow() ),
                  m_actions, "kuick_slideshow_pause" );
 
-    KAction *fullscreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT( toggleFullscreen() ), m_actions, 0 );
+    TDEAction *fullscreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT( toggleFullscreen() ), m_actions, 0 );
 
-    KAction *reloadAction = new KAction( i18n("Reload Image"), KStdAccel::shortcut(KStdAccel::Reload),
+    TDEAction *reloadAction = new TDEAction( i18n("Reload Image"), TDEStdAccel::shortcut(TDEStdAccel::Reload),
                                          TQT_TQOBJECT(this), TQT_SLOT( reload() ),
                                          m_actions, "reload_image" );
 
-    new KAction( i18n("Properties"), ALT + Key_Return,
+    new TDEAction( i18n("Properties"), ALT + Key_Return,
                  TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ),
                  m_actions, "properties" );
 
     m_actions->readShortcutSettings();
 
-    // Unfortunately there is no KAction::setShortcutDefault() :-/
+    // Unfortunately there is no TDEAction::setShortcutDefault() :-/
     // so add Key_Return as fullscreen shortcut _after_ readShortcutSettings()
     addAlternativeShortcut(fullscreenAction, Key_Return);
     addAlternativeShortcut(reloadAction, Key_Enter);
 }
 
-void ImageWindow::addAlternativeShortcut(KAction *action, int key)
+void ImageWindow::addAlternativeShortcut(TDEAction *action, int key)
 {
-    KShortcut cut( action->shortcut() );
+    TDEShortcut cut( action->shortcut() );
     if (cut == action->shortcutDefault()) {
         cut.append(KKey(key));
         action->setShortcut(cut);
@@ -593,9 +593,9 @@ void ImageWindow::keyPressEvent( TQKeyEvent *e )
     if ( key == Key_Shift )
         updateCursor( ZoomCursor );
 	
-    if ( key == Key_Escape || KStdAccel::close().contains( KKey( e ) ) )
+    if ( key == Key_Escape || TDEStdAccel::close().contains( KKey( e ) ) )
         close( true );
-    else if ( KStdAccel::save().contains( KKey( e ) ) )
+    else if ( TDEStdAccel::save().contains( KKey( e ) ) )
         saveImage();
 
     else {
diff --git a/kuickshow/src/imagewindow.h b/kuickshow/src/imagewindow.h
index 54dd5fb6..bf5427a8 100644
--- a/kuickshow/src/imagewindow.h
+++ b/kuickshow/src/imagewindow.h
@@ -57,7 +57,7 @@ public:
 
   void 		updateActions();
 
-  KActionCollection * actionCollection() const { return m_actions; }
+  TDEActionCollection * actionCollection() const { return m_actions; }
 
   /**
    * Resizes image to @p w, @p h, but takes into account the workarea, so
@@ -100,7 +100,7 @@ protected:
 
   void 		init();
   void 		centerImage();
-  void          addAlternativeShortcut( KAction *action, int key );
+  void          addAlternativeShortcut( TDEAction *action, int key );
   virtual void	updateGeometry( int imWidth, int imHeight );
   virtual void  loaded( KuickImage * );
   virtual bool  canZoomTo( int newWidth, int newHeight );
@@ -168,7 +168,7 @@ private:
   int           m_numHeads;
   TQString   m_saveDirectory;
 
-  KActionCollection *m_actions;
+  TDEActionCollection *m_actions;
 
   static TQCursor * s_handCursor;
 };
diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp
index e72062a8..09951e54 100644
--- a/kuickshow/src/kuickconfigdlg.cpp
+++ b/kuickshow/src/kuickconfigdlg.cpp
@@ -38,7 +38,7 @@
 #include "kuickdata.h"
 
 
-KuickConfigDialog::KuickConfigDialog( KActionCollection *_coll, TQWidget *parent,
+KuickConfigDialog::KuickConfigDialog( TDEActionCollection *_coll, TQWidget *parent,
 				      const char *name, bool modal )
     : KDialogBase( Tabbed, i18n("Configure"),
 		     Help | Default | Ok | Apply | Cancel, Ok,
diff --git a/kuickshow/src/kuickconfigdlg.h b/kuickshow/src/kuickconfigdlg.h
index 2505e110..c9261b8f 100644
--- a/kuickshow/src/kuickconfigdlg.h
+++ b/kuickshow/src/kuickconfigdlg.h
@@ -36,7 +36,7 @@ class KuickConfigDialog : public KDialogBase
   
 
 public:
-    KuickConfigDialog( KActionCollection *coll, TQWidget *parent=0,
+    KuickConfigDialog( TDEActionCollection *coll, TQWidget *parent=0,
 		       const char *name=0, bool modal=true);
     ~KuickConfigDialog();
 
@@ -50,7 +50,7 @@ private:
     GeneralWidget    *generalWidget;
     SlideShowWidget  *slideshowWidget;
     KKeyChooser      *imageKeyChooser, *browserKeyChooser;
-    KActionCollection *coll;
+    TDEActionCollection *coll;
 
     ImageWindow      *imageWindow;
 
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 2c7d90ba..ebd03b81 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -92,7 +92,7 @@ static const int META_ITEM = 1;
 TQValueList<ImageWindow*> KuickShow::s_viewers;
 
 KuickShow::KuickShow( const char *name )
-    : KMainWindow( 0L, name ),
+    : TDEMainWindow( 0L, name ),
       m_slideshowCycle( 1 ),
       fileWidget( 0L ),
       dialog( 0L ),
@@ -227,7 +227,7 @@ void KuickShow::initGUI( const KURL& startDir )
     fileWidget = new FileWidget( startURL, this, "MainWidget" );
     setFocusProxy( fileWidget );
 
-    KActionCollection *coll = fileWidget->actionCollection();
+    TDEActionCollection *coll = fileWidget->actionCollection();
 
     redirectDeleteAndTrashActions(coll);
 
@@ -246,47 +246,47 @@ void KuickShow::initGUI( const KURL& startDir )
              this, TQT_SLOT( slotDropped( const KFileItem *, TQDropEvent *, const KURL::List &)) );
 
     // setup actions
-    KAction *open = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenURL() ),
+    TDEAction *open = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenURL() ),
                                       coll, "openURL" );
 
-    KAction *print = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ),
+    TDEAction *print = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ),
                                         coll, "kuick_print" );
     print->setText( i18n("Print Image...") );
 
-    KAction *configure = new KAction( i18n("Configure %1...").arg( TDEGlobal::instance()->aboutData()->programName() ), "configure",
-                                      KShortcut(),
+    TDEAction *configure = new TDEAction( i18n("Configure %1...").arg( TDEGlobal::instance()->aboutData()->programName() ), "configure",
+                                      TDEShortcut(),
                                       TQT_TQOBJECT(this), TQT_SLOT( configuration() ),
                                       coll, "kuick_configure" );
-    KAction *slide = new KAction( i18n("Start Slideshow" ), "ksslide",
-                                  KShortcut( Key_F2 ),
+    TDEAction *slide = new TDEAction( i18n("Start Slideshow" ), "ksslide",
+                                  TDEShortcut( Key_F2 ),
                                   TQT_TQOBJECT(this), TQT_SLOT( startSlideShow() ),
                                   coll, "kuick_slideshow" );
-    KAction *about = new KAction( i18n( "About KuickShow" ), "about",
-                                  KShortcut(),
+    TDEAction *about = new TDEAction( i18n( "About KuickShow" ), "about",
+                                  TDEShortcut(),
                                   TQT_TQOBJECT(this), TQT_SLOT( about() ), coll, "about" );
 
-    oneWindowAction = new KToggleAction( i18n("Open Only One Image Window"),
+    oneWindowAction = new TDEToggleAction( i18n("Open Only One Image Window"),
                                          "window_new",
-                                         KShortcut( CTRL+Key_N ), coll,
+                                         TDEShortcut( CTRL+Key_N ), coll,
                                          "kuick_one window" );
 
-    m_toggleBrowserAction = new KToggleAction( i18n("Show File Browser"), KShortcut( Key_Space ), coll, "toggleBrowser" );
+    m_toggleBrowserAction = new TDEToggleAction( i18n("Show File Browser"), TDEShortcut( Key_Space ), coll, "toggleBrowser" );
     m_toggleBrowserAction->setCheckedState(i18n("Hide File Browser"));
     connect( m_toggleBrowserAction, TQT_SIGNAL( toggled( bool ) ),
              TQT_SLOT( toggleBrowser() ));
 
-    KAction *showInOther = new KAction( i18n("Show Image"), KShortcut(),
+    TDEAction *showInOther = new TDEAction( i18n("Show Image"), TDEShortcut(),
                                         TQT_TQOBJECT(this), TQT_SLOT( slotShowInOtherWindow() ),
                                         coll, "kuick_showInOtherWindow" );
-    KAction *showInSame = new KAction( i18n("Show Image in Active Window"),
-                                       KShortcut(),
+    TDEAction *showInSame = new TDEAction( i18n("Show Image in Active Window"),
+                                       TDEShortcut(),
                                        TQT_TQOBJECT(this), TQT_SLOT( slotShowInSameWindow() ),
                                        coll, "kuick_showInSameWindow" );
-    KAction *showFullscreen = new KAction( i18n("Show Image in Fullscreen Mode"),
-					   KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotShowFullscreen() ),
+    TDEAction *showFullscreen = new TDEAction( i18n("Show Image in Fullscreen Mode"),
+					   TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotShowFullscreen() ),
 					   coll, "kuick_showFullscreen" );
 
-    KAction *quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), coll, "quit");
+    TDEAction *quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), coll, "quit");
 
     // remove TQString() parameter -- ellis
     coll->readShortcutSettings( TQString() );
@@ -314,8 +314,8 @@ void KuickShow::initGUI( const KURL& startDir )
 
     // remove the Sorting submenu (and the separator below)
     // from the main contextmenu
-    KActionMenu *sortingMenu = static_cast<KActionMenu*>( coll->action("sorting menu"));
-    KActionMenu *mainActionMenu = static_cast<KActionMenu*>( coll->action("popupMenu"));
+    TDEActionMenu *sortingMenu = static_cast<TDEActionMenu*>( coll->action("sorting menu"));
+    TDEActionMenu *mainActionMenu = static_cast<TDEActionMenu*>( coll->action("popupMenu"));
     TQPopupMenu *mainPopup = mainActionMenu->popupMenu();
     int sortingIndex = mainPopup->indexOf( sortingMenu->itemId( 0 ) );
     int separatorId = mainPopup->idAt( sortingIndex + 1 );
@@ -325,7 +325,7 @@ void KuickShow::initGUI( const KURL& startDir )
     mainActionMenu->remove( sortingMenu );
 
     // add the sorting menu and a separator into the View menu
-    KActionMenu *viewActionMenu = static_cast<KActionMenu*>( coll->action("view menu"));
+    TDEActionMenu *viewActionMenu = static_cast<TDEActionMenu*>( coll->action("view menu"));
     viewActionMenu->popupMenu()->insertSeparator( 0 );
     sortingMenu->plug( viewActionMenu->popupMenu(), 0 ); // on top of the menu
 
@@ -339,7 +339,7 @@ void KuickShow::initGUI( const KURL& startDir )
     mBar->insertItem( i18n("&Settings"), settingsMenu );
 
     // toolbar
-    KToolBar *tBar = toolBar();
+    TDEToolBar *tBar = toolBar();
     tBar->setText( i18n( "Main Toolbar" ) );
 
     coll->action("up")->plug( tBar );
@@ -382,7 +382,7 @@ void KuickShow::initGUI( const KURL& startDir )
     tBar->show();
 
     // Address box in address tool bar
-    KToolBar *addressToolBar = toolBar( "address_bar" );
+    TDEToolBar *addressToolBar = toolBar( "address_bar" );
     const int ID_ADDRESSBAR = 1;
 
     cmbPath = new KURLComboBox( KURLComboBox::Directories,
@@ -405,9 +405,9 @@ void KuickShow::initGUI( const KURL& startDir )
     dirSelected( fileWidget->url() );
 
     setCentralWidget( fileWidget );
-    setupGUI( KMainWindow::Save );
+    setupGUI( TDEMainWindow::Save );
 
-    coll->action( "reload" )->setShortcut( KStdAccel::reload() );
+    coll->action( "reload" )->setShortcut( TDEStdAccel::reload() );
     coll->action( "short view" )->setShortcut(Key_F6);
     coll->action( "detailed view" )->setShortcut(Key_F7);
     coll->action( "show hidden" )->setShortcut(Key_F8);
@@ -416,9 +416,9 @@ void KuickShow::initGUI( const KURL& startDir )
     coll->action( "separate dirs" )->setShortcut(Key_F12);
 }
 
-void KuickShow::redirectDeleteAndTrashActions(KActionCollection *coll)
+void KuickShow::redirectDeleteAndTrashActions(TDEActionCollection *coll)
 {
-    KAction *action = coll->action("delete");
+    TDEAction *action = coll->action("delete");
     if (action)
     {
         action->disconnect(fileWidget);
@@ -821,7 +821,7 @@ void KuickShow::slotDropped( const KFileItem *, TQDropEvent *, const KURL::List
 // try to init the WM border as it is 0,0 when the window is not shown yet.
 void KuickShow::show()
 {
-    KMainWindow::show();
+    TDEMainWindow::show();
     (void) Kuick::frameSize( winId() );
 }
 
@@ -883,13 +883,13 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e )
         k = TQT_TQKEYEVENT( e );
 
     if ( k ) {
-        if ( KStdAccel::quit().contains( KKey( k ) ) ) {
+        if ( TDEStdAccel::quit().contains( KKey( k ) ) ) {
             saveSettings();
             deleteAllViewers();
             FileCache::shutdown();
             ::exit(0);
         }
-        else if ( KStdAccel::help().contains( KKey( k ) ) ) {
+        else if ( TDEStdAccel::help().contains( KKey( k ) ) ) {
             appHelpActivated();
             return true;
         }
@@ -969,19 +969,19 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e )
                     return true;
                 }
 
-                return KMainWindow::eventFilter( o, e );
+                return TDEMainWindow::eventFilter( o, e );
             }
 
             // we definitely have a fileWidget here!
 
             KKey kkey( k );
-            if ( key == Key_Home || KStdAccel::home().contains( kkey ) )
+            if ( key == Key_Home || TDEStdAccel::home().contains( kkey ) )
             {
                 item = fileWidget->gotoFirstImage();
                 item_next = fileWidget->getNext( false );
             }
 
-            else if ( key == Key_End || KStdAccel::end().contains( kkey ) )
+            else if ( key == Key_End || TDEStdAccel::end().contains( kkey ) )
             {
                 item = fileWidget->gotoLastImage();
                 item_next = fileWidget->getPrevious( false );
@@ -1065,7 +1065,7 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e )
     if ( ret )
         return true;
 
-    return KMainWindow::eventFilter( o, e );
+    return TDEMainWindow::eventFilter( o, e );
 }
 
 void KuickShow::configuration()
@@ -1432,12 +1432,12 @@ void KuickShow::deleteAllViewers()
     m_viewer = 0L;
 }
 
-KActionCollection * KuickShow::actionCollection() const
+TDEActionCollection * KuickShow::actionCollection() const
 {
     if ( fileWidget )
         return fileWidget->actionCollection();
 
-    return KMainWindow::actionCollection();
+    return TDEMainWindow::actionCollection();
 }
 
 #include "kuickshow.moc"
diff --git a/kuickshow/src/kuickshow.h b/kuickshow/src/kuickshow.h
index baba06a3..33f5a9f5 100644
--- a/kuickshow/src/kuickshow.h
+++ b/kuickshow/src/kuickshow.h
@@ -37,9 +37,9 @@ class ImageWindow;
 class ImData;
 class KuickConfigDialog;
 
-class KAccel;
+class TDEAccel;
 class TDEConfig;
-class KToggleAction;
+class TDEToggleAction;
 class AboutWidget;
 
 class KURL;
@@ -79,7 +79,7 @@ public:
 };
 
 
-class KuickShow : public KMainWindow
+class KuickShow : public TDEMainWindow
 {
     Q_OBJECT
   
@@ -93,7 +93,7 @@ public:
 
     // overridden to make KDCOPActionProxy work -- all our actions are not
     // in the mainwindow's collection, but in the filewidget's.
-    virtual KActionCollection* actionCollection() const;
+    virtual TDEActionCollection* actionCollection() const;
 
 
 protected:
@@ -151,7 +151,7 @@ private:
     void 		delayedRepeatEvent( ImageWindow *, TQKeyEvent * );
     void		abortDelayedEvent();
     void                deleteAllViewers();
-    void                redirectDeleteAndTrashActions(KActionCollection *coll);
+    void                redirectDeleteAndTrashActions(TDEActionCollection *coll);
 
     void                delayAction(DelayedRepeatEvent *event);
     void                replayAdvance(DelayedRepeatEvent *event);
@@ -167,12 +167,12 @@ private:
     KuickConfigDialog 	*dialog;
     ImlibData           *id;
     ImageWindow 	*m_viewer;
-    KToggleAction 	*oneWindowAction;
-    KAccel 		*m_accel;
+    TDEToggleAction 	*oneWindowAction;
+    TDEAccel 		*m_accel;
     DelayedRepeatEvent  *m_delayedRepeatItem;
     TQTimer              *m_slideTimer;
     bool                m_slideShowStopped;
-    KToggleAction       *m_toggleBrowserAction;
+    TDEToggleAction       *m_toggleBrowserAction;
     TQGuardedPtr<AboutWidget> aboutWidget;
 };
 
diff --git a/kview/kview.cpp b/kview/kview.cpp
index 21b851c3..f03b6a07 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -163,7 +163,7 @@ void KView::load( const KURL & url )
 		if( url.isLocalFile() )
 		{
 			// XXX: this code is what
-			//KRecentDirs::add( TQString::fromLatin1( ":load_image" ), url.directory() );
+			//TDERecentDirs::add( TQString::fromLatin1( ":load_image" ), url.directory() );
 			// would do:
 			TQString directory = url.directory();
 			TQString key = TQString::fromLatin1( "load_image" );
@@ -403,7 +403,7 @@ void KView::reloadConfig()
 
 void KView::enableAction( const char * name, bool b )
 {
-	KAction * a = actionCollection()->action( name );
+	TDEAction * a = actionCollection()->action( name );
 	if( a )
 		a->setEnabled( b );
 	else
@@ -491,7 +491,7 @@ void KView::setupActions( TQObject * partobject )
 	// File
 	KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenFile() ), actionCollection() );
 	m_paRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotOpenRecent( const KURL & ) ), actionCollection() );
-	KAction * aClose = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection() );
+	TDEAction * aClose = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection() );
 	aClose->setEnabled( false );
 	connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aClose, TQT_SLOT( setEnabled( bool ) ) );
 
@@ -502,22 +502,22 @@ void KView::setupActions( TQObject * partobject )
 		if( slotNames.contains( "print()" ) )
 			KStdAction::print( extension, TQT_SLOT( print() ), actionCollection(), "print" );
 		if( slotNames.contains( "del()" ) )
-			( void )new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete,
+			( void )new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete,
 								 extension, TQT_SLOT( del() ), actionCollection(), "del" );
 		connect( extension, TQT_SIGNAL( enableAction( const char *, bool ) ), TQT_SLOT( enableAction( const char *, bool ) ) );
 	}
 	KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
 
 	// Edit
-	KAction * aCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() );
+	TDEAction * aCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() );
 	aCopy->setEnabled( false );
 	connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aCopy, TQT_SLOT( setEnabled( bool ) ) );
 	m_paPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), actionCollection() );
 	clipboardDataChanged(); //enable or disable paste
-	KAction * aCrop = new KAction( i18n( "Cr&op" ), Key_C, TQT_TQOBJECT(this), TQT_SLOT( slotCrop() ), actionCollection(), "crop" );
+	TDEAction * aCrop = new TDEAction( i18n( "Cr&op" ), Key_C, TQT_TQOBJECT(this), TQT_SLOT( slotCrop() ), actionCollection(), "crop" );
 	aCrop->setEnabled( false );
 
-	KAction * aReload = new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut( KStdAccel::Reload ), partobject,
+	TDEAction * aReload = new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), partobject,
 			TQT_SLOT( reload() ), actionCollection(), "reload" );
 	aReload->setEnabled( false );
 	connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aReload, TQT_SLOT( setEnabled( bool ) ) );
@@ -525,7 +525,7 @@ void KView::setupActions( TQObject * partobject )
 	// Settings
 	m_paShowMenubar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() );
 	createStandardStatusBarAction();
-	m_paShowStatusBar = ::tqqt_cast<KToggleAction*>( action( "options_show_statusbar" ) );
+	m_paShowStatusBar = ::tqqt_cast<TDEToggleAction*>( action( "options_show_statusbar" ) );
 	if( m_paShowStatusBar )
 		connect( m_paShowStatusBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( statusbarToggled( bool ) ) );
 	m_paShowFullScreen = KStdAction::fullScreen( 0, 0, actionCollection(), this );
@@ -644,20 +644,20 @@ TQSize KView::barSize( int mainwinwidth, BarSizeFrom from )
 	{
 		switch( toolBar()->barPos() )
 		{
-			case KToolBar::Top:
-			case KToolBar::Bottom:
+			case TDEToolBar::Top:
+			case TDEToolBar::Bottom:
 				height += toolBar()->height();
 				break;
-			case KToolBar::Left:
-			case KToolBar::Right:
+			case TDEToolBar::Left:
+			case TDEToolBar::Right:
 				width += toolBar()->width();
 				break;
-			case KToolBar::Flat:
+			case TDEToolBar::Flat:
 				height += kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent );
 				break;
-			case KToolBar::Floating:
+			case TDEToolBar::Floating:
 				break;
-			case KToolBar::Unmanaged:
+			case TDEToolBar::Unmanaged:
 				break;
 		}
 	}
diff --git a/kview/kview.h b/kview/kview.h
index dd5bacd7..2a024026 100644
--- a/kview/kview.h
+++ b/kview/kview.h
@@ -33,9 +33,9 @@ namespace KImageViewer {
 }
 class TQSize;
 class TQRect;
-class KAction;
-class KToggleAction;
-class KRecentFilesAction;
+class TDEAction;
+class TDEToggleAction;
+class TDERecentFilesAction;
 class KWinModule;
 class TQStringList;
 class KProgress;
@@ -105,13 +105,13 @@ class KView : public KParts::MainWindow
 		KWinModule * m_pWinModule;
 
 		// Actions:
-		KAction * m_paOpenFile;
-		KAction * m_paPaste;
-		KRecentFilesAction * m_paRecent;
-		KAction * m_paQuit;
-		KToggleFullScreenAction * m_paShowFullScreen;
-		KToggleAction * m_paShowMenubar;
-		KToggleAction * m_paShowStatusBar;
+		TDEAction * m_paOpenFile;
+		TDEAction * m_paPaste;
+		TDERecentFilesAction * m_paRecent;
+		TDEAction * m_paQuit;
+		TDEToggleFullScreenAction * m_paShowFullScreen;
+		TDEToggleAction * m_paShowMenubar;
+		TDEToggleAction * m_paShowStatusBar;
 
 		int m_nResizeMode;
 		bool m_bImageSizeChangedBlocked;
diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui
index 108ed82e..37d4b0f5 100644
--- a/kview/kviewcanvas/config/generalconfigwidget.ui
+++ b/kview/kviewcanvas/config/generalconfigwidget.ui
@@ -152,7 +152,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
                         <string>Choose which blend effects should be used:</string>
                     </property>
                 </widget>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string>Effect</string>
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 4e318342..3495adbf 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -465,33 +465,33 @@ bool KViewViewer::saveFile()
 
 void KViewViewer::setupActions()
 {
-	m_paZoomIn = new KAction( i18n( "Zoom In" ), "viewmag+", KStdAccel::shortcut( KStdAccel::ZoomIn ), this,
+	m_paZoomIn = new TDEAction( i18n( "Zoom In" ), "viewmag+", TDEStdAccel::shortcut( TDEStdAccel::ZoomIn ), this,
 			TQT_SLOT( slotZoomIn() ), actionCollection(), "zoomin" );
-	m_paZoomOut = new KAction( i18n( "Zoom Out" ), "viewmag-", KStdAccel::shortcut( KStdAccel::ZoomOut ), this,
+	m_paZoomOut = new TDEAction( i18n( "Zoom Out" ), "viewmag-", TDEStdAccel::shortcut( TDEStdAccel::ZoomOut ), this,
 			TQT_SLOT( slotZoomOut() ), actionCollection(), "zoomout" );
 
-	m_paZoom = new KSelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" );
+	m_paZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" );
 	connect( m_paZoom, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( setZoom( const TQString & ) ) );
 	m_paZoom->setEditable( true );
 	m_paZoom->clear();
 	m_paZoom->setItems( TQStringList::split( '|', "20%|25%|33%|50%|75%|100%|125%|150%|200%|250%|300%|350%|400%|450%|500%" ) );
 	m_paZoom->setCurrentItem( 5 );
 
-	m_paFlipMenu = new KActionMenu( i18n( "&Flip" ), actionCollection(), "flip" );
-	m_paFlipV = new KAction( i18n( "&Vertical" ), Key_V, this, TQT_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" );
-	m_paFlipH = new KAction( i18n( "&Horizontal" ), Key_H, this, TQT_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" );
+	m_paFlipMenu = new TDEActionMenu( i18n( "&Flip" ), actionCollection(), "flip" );
+	m_paFlipV = new TDEAction( i18n( "&Vertical" ), Key_V, this, TQT_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" );
+	m_paFlipH = new TDEAction( i18n( "&Horizontal" ), Key_H, this, TQT_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" );
 	m_paFlipMenu->insert( m_paFlipV );
 	m_paFlipMenu->insert( m_paFlipH );
 
-	m_paRotateCCW = new KAction( i18n( "Ro&tate Counter-Clockwise" ), "rotate_ccw", 0, this,
+	m_paRotateCCW = new TDEAction( i18n( "Ro&tate Counter-Clockwise" ), "rotate_ccw", 0, this,
 			TQT_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" );
-	m_paRotateCW = new KAction( i18n( "Rotate Clockwise" ), "rotate_cw", 0, this,
+	m_paRotateCW = new TDEAction( i18n( "Rotate Clockwise" ), "rotate_cw", 0, this,
 			TQT_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" );
 	m_paSave = KStdAction::save( this, TQT_SLOT( slotSave() ), actionCollection() );
 	m_paSave->setEnabled( false );
 	m_paSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotSaveAs() ), actionCollection() );
 
-	m_paFitToWin = new KAction( i18n( "Fit Image to Window" ), 0, 0, this,
+	m_paFitToWin = new TDEAction( i18n( "Fit Image to Window" ), 0, 0, this,
 			TQT_SLOT( slotFitToWin() ), actionCollection(), "fittowin" );
 	m_paZoomIn->setEnabled( false );
 	m_paZoomOut->setEnabled( false );
@@ -514,7 +514,7 @@ void KViewViewer::setupActions()
 	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipV, TQT_SLOT( setEnabled( bool ) ) );
 	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipH, TQT_SLOT( setEnabled( bool ) ) );
 
-	m_paShowScrollbars = new KToggleAction( i18n( "Show Scrollbars" ), 0, this, TQT_SLOT( slotToggleScrollbars() ),
+	m_paShowScrollbars = new TDEToggleAction( i18n( "Show Scrollbars" ), 0, this, TQT_SLOT( slotToggleScrollbars() ),
 	 actionCollection(), "show_scrollbars" );
 	m_paShowScrollbars->setCheckedState(i18n("Hide Scrollbars"));
 }
@@ -622,7 +622,7 @@ void KViewViewer::slotSaveAs()
 		m_newMimeType = KImageIO::mimeType( url.path() );
 	kdDebug( 4610 ) << k_funcinfo << "m_newMimeType = " << m_newMimeType << endl;
 	if( url.isValid() )
-		KRecentDocument::add( url );
+		TDERecentDocument::add( url );
 	saveAs( url );
 }
 
@@ -754,7 +754,7 @@ void KViewViewer::slotPopupMenu( const TQPoint &pos )
 {
 	KXMLGUIClient *popupGUIClient = new PopupGUIClient( instance(), m_popupDoc );
 
-	(void) new KAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveAs() ),
+	(void) new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveAs() ),
 						popupGUIClient->actionCollection(), "saveimageas" );
 
 	// ### HACK treat the image as dir to get the back/fwd/reload buttons (Simon)
diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h
index 54f08e88..58cb1c1c 100644
--- a/kview/kviewviewer/kviewviewer.h
+++ b/kview/kviewviewer/kviewviewer.h
@@ -31,10 +31,10 @@ namespace KImageViewer { class Canvas; }
 namespace TDEIO { class Job; }
 
 class KTempFile;
-class KAction;
-class KActionMenu;
-class KToggleAction;
-class KSelectAction;
+class TDEAction;
+class TDEActionMenu;
+class TDEToggleAction;
+class TDESelectAction;
 class TDEAboutData;
 class TQBuffer;
 class TQSize;
@@ -120,18 +120,18 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf
 		KDirWatch * m_pFileWatch;
 
 		// Actions:
-		KAction * m_paZoomIn;
-		KAction * m_paZoomOut;
-		KSelectAction * m_paZoom;
-		KActionMenu * m_paFlipMenu;
-		KAction * m_paFlipH;
-		KAction * m_paFlipV;
-		KAction * m_paRotateCCW;
-		KAction * m_paRotateCW;
-		KAction * m_paSave;
-		KAction * m_paSaveAs;
-		KAction * m_paFitToWin;
-		KToggleAction * m_paShowScrollbars;
+		TDEAction * m_paZoomIn;
+		TDEAction * m_paZoomOut;
+		TDESelectAction * m_paZoom;
+		TDEActionMenu * m_paFlipMenu;
+		TDEAction * m_paFlipH;
+		TDEAction * m_paFlipV;
+		TDEAction * m_paRotateCCW;
+		TDEAction * m_paRotateCW;
+		TDEAction * m_paSave;
+		TDEAction * m_paSaveAs;
+		TDEAction * m_paFitToWin;
+		TDEToggleAction * m_paShowScrollbars;
 
 		TQString m_popupDoc;
 		TQString m_mimeType;
diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h
index a26b90c1..198c53af 100644
--- a/kview/modules/browser/kviewbrowser.h
+++ b/kview/modules/browser/kviewbrowser.h
@@ -26,7 +26,7 @@
 namespace KImageViewer { class Viewer; }
 
 namespace KParts { class BrowserExtension; }
-class KAction;
+class TDEAction;
 class KDirLister;
 class KMyFileItemList;
 
@@ -55,8 +55,8 @@ private:
 	KParts::BrowserExtension * m_pExtension;
 	bool m_bShowCurrent;
 
-	KAction * m_paBack;
-	KAction * m_paForward;
+	TDEAction * m_paBack;
+	TDEAction * m_paForward;
 };
 
 // vim:sw=4:ts=4:cindent
diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp
index a2e57327..4b717da7 100644
--- a/kview/modules/effects/kvieweffects.cpp
+++ b/kview/modules/effects/kvieweffects.cpp
@@ -37,13 +37,13 @@ KViewEffects::KViewEffects( TQObject* parent, const char* name, const TQStringLi
 	delete viewerList;
 	if( m_pViewer )
 	{
-		KAction * gammaaction = new KAction( i18n( "&Gamma Correction..." ), 0, 0,
+		TDEAction * gammaaction = new TDEAction( i18n( "&Gamma Correction..." ), 0, 0,
 				this, TQT_SLOT( gamma() ),
 				actionCollection(), "plugin_effects_gamma" );
-		KAction * blendaction = new KAction( i18n( "&Blend Color..." ), 0, 0,
+		TDEAction * blendaction = new TDEAction( i18n( "&Blend Color..." ), 0, 0,
 				this, TQT_SLOT( blend() ),
 				actionCollection(), "plugin_effects_blend" );
-		KAction * intensityaction = new KAction( i18n( "Change &Intensity (Brightness)..." ), 0, 0,
+		TDEAction * intensityaction = new TDEAction( i18n( "Change &Intensity (Brightness)..." ), 0, 0,
 				this, TQT_SLOT( intensity() ),
 				actionCollection(), "plugin_effects_intensity" );
 		gammaaction->setEnabled( m_pViewer->canvas()->image() != 0 );
diff --git a/kview/modules/presenter/DESIGN b/kview/modules/presenter/DESIGN
index 11d77121..3b187e78 100644
--- a/kview/modules/presenter/DESIGN
+++ b/kview/modules/presenter/DESIGN
@@ -20,9 +20,9 @@ Presenter Plugin:
 
 - Implementation:
 	- Playlist:
-		- KListView
+		- TDEListView
 		- Items:
-			- derived from KListViewItem
+			- derived from TDEListViewItem
 			- load Info in the background
 			- keep local copy of downloaded files
 			- delete local copy on destruction
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index 8878eab6..b9a21da4 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -23,7 +23,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <column>
                 <property name="text">
                     <string>URL</string>
diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp
index 313cd75b..74e82bea 100644
--- a/kview/modules/presenter/imagelistitem.cpp
+++ b/kview/modules/presenter/imagelistitem.cpp
@@ -24,8 +24,8 @@
 
 #include <klistview.h>
 
-ImageListItem::ImageListItem( KListView * parent, const KURL & url )
-	: KListViewItem( parent, parent->lastItem(), url.prettyURL() )
+ImageListItem::ImageListItem( TDEListView * parent, const KURL & url )
+	: TDEListViewItem( parent, parent->lastItem(), url.prettyURL() )
 	, m_pImage( 0 )
 	, m_filename( TQString() )
 	, m_url( url )
diff --git a/kview/modules/presenter/imagelistitem.h b/kview/modules/presenter/imagelistitem.h
index ee143a90..4eabcb39 100644
--- a/kview/modules/presenter/imagelistitem.h
+++ b/kview/modules/presenter/imagelistitem.h
@@ -27,10 +27,10 @@
 
 class TQImage;
 
-class ImageListItem : public KListViewItem
+class ImageListItem : public TDEListViewItem
 {
 	public:
-		ImageListItem( KListView * parent, const KURL & url );
+		ImageListItem( TDEListView * parent, const KURL & url );
 		~ImageListItem();
 
 		const TQImage * image() const;
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index b7aef984..c554e446 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -67,14 +67,14 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri
 	delete viewerList;
 	if( m_pViewer )
 	{
-		( void ) new KAction( i18n( "&Image List..." ), 0, 0,
+		( void ) new TDEAction( i18n( "&Image List..." ), 0, 0,
 							this, TQT_SLOT( slotImageList() ),
 							actionCollection(), "plugin_presenter_imageList" );
-		m_paSlideshow = new KToggleAction( i18n( "Start &Slideshow" ), Key_S, actionCollection(), "plugin_presenter_slideshow" );
-		( void ) new KAction( i18n( "&Previous Image in List" ), "previous", ALT+Key_Left,
+		m_paSlideshow = new TDEToggleAction( i18n( "Start &Slideshow" ), Key_S, actionCollection(), "plugin_presenter_slideshow" );
+		( void ) new TDEAction( i18n( "&Previous Image in List" ), "previous", ALT+Key_Left,
 							  this, TQT_SLOT( prev() ),
 							  actionCollection(), "plugin_presenter_prev" );
-		( void ) new KAction( i18n( "&Next Image in List" ), "next", ALT+Key_Right,
+		( void ) new TDEAction( i18n( "&Next Image in List" ), "next", ALT+Key_Right,
 							  this, TQT_SLOT( next() ),
 							  actionCollection(), "plugin_presenter_next" );
 
@@ -97,7 +97,7 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri
 		}
 		else
 		{
-			(void) new KAction( i18n( "Open &Multiple Files..." ), "queue", CTRL+SHIFT+Key_O,
+			(void) new TDEAction( i18n( "Open &Multiple Files..." ), "queue", CTRL+SHIFT+Key_O,
 							this, TQT_SLOT( slotOpenFiles() ),
 							actionCollection(), "plugin_presenter_openFiles" );
 		}
@@ -383,7 +383,7 @@ void KViewPresenter::setSlideshowInterval( int msec )
 void KViewPresenter::shuffle()
 {
 	m_pImageList->noSort();
-	KListView * listview = m_pImageList->m_pListView;
+	TDEListView * listview = m_pImageList->m_pListView;
 	TQPtrList<TQListViewItem> items;
 	for( TQListViewItem * item = listview->firstChild(); item; item = listview->firstChild() )
 	{
diff --git a/kview/modules/presenter/kviewpresenter.h b/kview/modules/presenter/kviewpresenter.h
index 2fff82c1..94b9fa65 100644
--- a/kview/modules/presenter/kviewpresenter.h
+++ b/kview/modules/presenter/kviewpresenter.h
@@ -32,8 +32,8 @@ class ImageListDialog;
 class ImageListItem;
 class TQListViewItem;
 class TQTimer;
-class KToggleAction;
-class KAction;
+class TDEToggleAction;
+class TDEAction;
 
 class KViewPresenter : public KParts::Plugin
 {
@@ -90,9 +90,9 @@ private:
 
 	KImageViewer::Viewer * m_pViewer;
 	ImageListDialog * m_pImageList;
-	KToggleAction * m_paSlideshow;
-	KAction * m_paFileOpen;
-	KAction * m_paFileClose;
+	TDEToggleAction * m_paSlideshow;
+	TDEAction * m_paFileOpen;
+	TDEAction * m_paFileClose;
 
 	TQSortedList<ImageInfo> m_imagelist;
 	bool m_bDontAdd;
diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp
index f5138f55..4dbdbd92 100644
--- a/kview/modules/scale/kview_scale.cpp
+++ b/kview/modules/scale/kview_scale.cpp
@@ -46,7 +46,7 @@ KViewScale::KViewScale( TQObject* parent, const char* name, const TQStringList &
 		kdDebug( 4630 ) << "m_pViewer->canvas() = " << m_pViewer->canvas() << endl;
 		m_pCanvas = m_pViewer->canvas();
 
-		(void) new KAction( i18n( "&Scale Image..." ), 0, 0,
+		(void) new TDEAction( i18n( "&Scale Image..." ), 0, 0,
 							this, TQT_SLOT( slotScaleDlg() ),
 							actionCollection(), "plugin_scale" );
 	}
diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp
index bf99e282..010296e5 100644
--- a/kview/modules/scanner/kviewscanner.cpp
+++ b/kview/modules/scanner/kviewscanner.cpp
@@ -46,7 +46,7 @@ KViewScanner::KViewScanner( TQObject* parent, const char* name,
 	delete viewerList;
 	if( m_pViewer )
 	{
-		(void) new KAction( i18n( "&Scan Image..." ), "scanner", 0,
+		(void) new TDEAction( i18n( "&Scan Image..." ), "scanner", 0,
 							this, TQT_SLOT( slotScan() ),
 							actionCollection(), "plugin_scan" );
 	}
diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp
index f8277162..78e10595 100644
--- a/kview/modules/template/kviewtemplate.cpp
+++ b/kview/modules/template/kviewtemplate.cpp
@@ -23,7 +23,7 @@ KViewTemplate::KViewTemplate( TQObject* parent, const char* name, const TQString
 	delete viewerList;
 	if( m_pViewer )
 	{
-		(void) new KAction( /*i18n(*/ "&Do Something" /*)*/, 0, 0,
+		(void) new TDEAction( /*i18n(*/ "&Do Something" /*)*/, 0, 0,
 							this, TQT_SLOT( yourSlot() ),
 							actionCollection(), "plugin_template" );
 	}
diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h
index e19abe36..e931ecf8 100644
--- a/kview/photobook/photobook.h
+++ b/kview/photobook/photobook.h
@@ -55,7 +55,7 @@ class PhotoBook : public TQSplitter
 Q_OBJECT
 
 	Previews *mList;
-	KAction *mFit;
+	TDEAction *mFit;
 	KParts::ReadOnlyPart *mViewer;
 
 public:
@@ -110,8 +110,8 @@ class PhotoBookPart : public KParts::ReadOnlyPart
 Q_OBJECT
   
 	PhotoBook *bv;
-	KAction *m_pPreviousAction;
-	KAction *m_pNextAction;
+	TDEAction *m_pPreviousAction;
+	TDEAction *m_pNextAction;
 
 public:
 	PhotoBookPart(
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index 85a27558..d165fc38 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -170,7 +170,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   // Add the multipage to the GUI.
   partManager->addPart(multiPage);
 
-  exportTextAction = new KAction(i18n("Text..."), 0, this, TQT_SLOT(mp_exportText()), actionCollection(), "export_text");
+  exportTextAction = new TDEAction(i18n("Text..."), 0, this, TQT_SLOT(mp_exportText()), actionCollection(), "export_text");
 
   // edit menu
   findTextAction = KStdAction::find(this, TQT_SLOT(mp_showFindTextDialog()), actionCollection(), "find");
@@ -190,11 +190,11 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   saveAction = KStdAction::save(this, TQT_SLOT(mp_slotSave_defaultFilename()), actionCollection());
 
   // settings menu
-  showSidebar = new KToggleAction (i18n("Show &Sidebar"), "show_side_panel", 0, this,
+  showSidebar = new TDEToggleAction (i18n("Show &Sidebar"), "show_side_panel", 0, this,
                                    TQT_SLOT(slotShowSidebar()), actionCollection(), "show_sidebar");
   showSidebar->setCheckedState(i18n("Hide &Sidebar"));
-  watchAct = new KToggleAction(i18n("&Watch File"), 0, 0, 0, actionCollection(), "watch_file");
-  scrollbarHandling = new KToggleAction (i18n("Show Scrollbars"), 0, 0, 0, actionCollection(), "scrollbarHandling");
+  watchAct = new TDEToggleAction(i18n("&Watch File"), 0, 0, 0, actionCollection(), "watch_file");
+  scrollbarHandling = new TDEToggleAction (i18n("Show Scrollbars"), 0, 0, 0, actionCollection(), "scrollbarHandling");
   scrollbarHandling->setCheckedState(i18n("Hide Scrollbars"));
 
   // View modes
@@ -203,19 +203,19 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   viewModes.append(i18n("Continuous"));
   viewModes.append(i18n("Continuous - Facing"));
   viewModes.append(i18n("Overview"));
-  viewModeAction = new KSelectAction (i18n("View Mode"), 0, 0, 0, actionCollection(), "viewmode");
+  viewModeAction = new TDESelectAction (i18n("View Mode"), 0, 0, 0, actionCollection(), "viewmode");
   viewModeAction->setItems(viewModes);
 
   // Qt::Orientation menu
   TQStringList orientations;
   orientations.append(i18n("Portrait"));
   orientations.append(i18n("Landscape"));
-  orientation = new KSelectAction (i18n("Preferred &Orientation"), 0, 0, 0, actionCollection(), "view_orientation");
+  orientation = new TDESelectAction (i18n("Preferred &Orientation"), 0, 0, 0, actionCollection(), "view_orientation");
   orientation->setItems(orientations);
   connect(orientation, TQT_SIGNAL(activated (int)), &userRequestedPaperSize, TQT_SLOT(setOrientation(int)));
 
   // Zoom Menu
-  zoom_action = new KSelectAction (i18n("&Zoom"), 0, 0, 0, actionCollection(), "view_zoom");
+  zoom_action = new TDESelectAction (i18n("&Zoom"), 0, 0, 0, actionCollection(), "view_zoom");
   zoom_action->setEditable(true);
   zoom_action->setItems(_zoomVal.zoomNames());
 
@@ -227,24 +227,24 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   emit(zoomChanged("100%"));
 
   // Paper Size Menu
-  media = new KSelectAction (i18n("Preferred Paper &Size"), 0, 0, 0, actionCollection(), "view_media");
+  media = new TDESelectAction (i18n("Preferred Paper &Size"), 0, 0, 0, actionCollection(), "view_media");
   TQStringList items = userRequestedPaperSize.pageSizeNames();
   items.prepend(i18n("Custom Size..."));
   media->setItems(items);
   connect (media, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMedia(int)));
 
-  useDocumentSpecifiedSize = new KToggleAction(i18n("&Use Document Specified Paper Size"), 0, this, TQT_SLOT(slotShowSidebar()),
+  useDocumentSpecifiedSize = new TDEToggleAction(i18n("&Use Document Specified Paper Size"), 0, this, TQT_SLOT(slotShowSidebar()),
 					       actionCollection(), "view_use_document_specified_size");
 
   // Zoom Actions
   zoomInAct = KStdAction::zoomIn (this, TQT_SLOT(zoomIn()), actionCollection());
   zoomOutAct = KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection());
 
-  fitPageAct = new KToggleAction(i18n("&Fit to Page"), "view_fit_window", Key_P,
+  fitPageAct = new TDEToggleAction(i18n("&Fit to Page"), "view_fit_window", Key_P,
                                  actionCollection(), "view_fit_to_page");
-  fitWidthAct = new KToggleAction(i18n("Fit to Page &Width"), "view_fit_width", Key_W,
+  fitWidthAct = new TDEToggleAction(i18n("Fit to Page &Width"), "view_fit_width", Key_W,
                                   actionCollection(), "view_fit_to_width");
-  fitHeightAct = new KToggleAction(i18n("Fit to Page &Height"), "view_fit_height", Key_H,
+  fitHeightAct = new TDEToggleAction(i18n("Fit to Page &Height"), "view_fit_height", Key_H,
                                    actionCollection(), "view_fit_to_height");
 
   fitPageAct -> setExclusiveGroup("view_fit");
@@ -263,16 +263,16 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   gotoAct = KStdAction::gotoPage(this, TQT_SLOT(goToPage()), actionCollection());
   gotoAct->setShortcut("CTRL+G");
 
-  readUpAct = new KAction(i18n("Read Up Document"), "up", SHIFT+Key_Space, this, TQT_SLOT(mp_readUp()), actionCollection(), "go_read_up");
-  readDownAct = new KAction(i18n("Read Down Document"), "down", Key_Space, this, TQT_SLOT(mp_readDown()), actionCollection(), "go_read_down");
+  readUpAct = new TDEAction(i18n("Read Up Document"), "up", SHIFT+Key_Space, this, TQT_SLOT(mp_readUp()), actionCollection(), "go_read_up");
+  readDownAct = new TDEAction(i18n("Read Down Document"), "down", Key_Space, this, TQT_SLOT(mp_readDown()), actionCollection(), "go_read_down");
 
   printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection());
 
   saveAsAction = KStdAction::saveAs(this, TQT_SLOT(mp_slotSave()), actionCollection());
 
   // mode action
-  moveModeAction = new KRadioAction(i18n("&Move Tool"), "movetool", Key_F4, actionCollection(), "move_tool");
-  selectionModeAction = new KRadioAction(i18n("&Selection Tool"), "selectiontool", Key_F5, actionCollection(), "selection_tool");
+  moveModeAction = new TDERadioAction(i18n("&Move Tool"), "movetool", Key_F4, actionCollection(), "move_tool");
+  selectionModeAction = new TDERadioAction(i18n("&Selection Tool"), "selectiontool", Key_F5, actionCollection(), "selection_tool");
 
   moveModeAction->setExclusiveGroup("tools");
   selectionModeAction->setExclusiveGroup("tools");
@@ -283,9 +283,9 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   //connect(selectionModeAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSelectionTool(bool)));
 
   // history action
-  backAction = new KAction(i18n("&Back"), "1leftarrow", 0,
+  backAction = new TDEAction(i18n("&Back"), "1leftarrow", 0,
                    this, TQT_SLOT(mp_doGoBack()), actionCollection(), "go_back");
-  forwardAction = new KAction(i18n("&Forward"), "1rightarrow", 0,
+  forwardAction = new TDEAction(i18n("&Forward"), "1rightarrow", 0,
                       this, TQT_SLOT(mp_doGoForward()), actionCollection(), "go_forward");
 
   backAction->setEnabled(false);
@@ -299,12 +299,12 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   // additional about information.
   if (!args.isEmpty())
   {
-    aboutAction = new KAction(i18n("About KViewShell"), "kviewshell", 0, this,
+    aboutAction = new TDEAction(i18n("About KViewShell"), "kviewshell", 0, this,
                             TQT_SLOT(aboutKViewShell()), actionCollection(), "help_about_kviewshell");
   }
 
   // keyboard accelerators
-  accel = new KAccel(mainWidget);
+  accel = new TDEAccel(mainWidget);
   accel->insert(I18N_NOOP("Scroll Up"), Key_Up, this, TQT_SLOT(mp_scrollUp()));
   accel->insert(I18N_NOOP("Scroll Down"), Key_Down, this, TQT_SLOT(mp_scrollDown()));
   accel->insert(I18N_NOOP("Scroll Left"), Key_Left, this, TQT_SLOT(mp_scrollLeft()));
diff --git a/kviewshell/kviewpart.h b/kviewshell/kviewpart.h
index cf66e69d..4af55fc7 100644
--- a/kviewshell/kviewpart.h
+++ b/kviewshell/kviewpart.h
@@ -11,16 +11,16 @@
 
 class TDEAboutData;
 class KAboutDialog;
-class KAccel;
-class KAction;
+class TDEAccel;
+class TDEAction;
 class TDEConfig;
 class KDirWatch;
 class TDEInstance;
 class KMultiPage;
-class KRadioAction;
-class KSelectAction;
+class TDERadioAction;
+class TDESelectAction;
 class KTempFile;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class KViewPartExtension;
 class TQHBoxLayout;
@@ -106,8 +106,8 @@ protected slots:
 
 
 protected:
-  KToggleAction *showSidebar, *scrollbarHandling;
-  KSelectAction *orientation, *media, *zoom_action;
+  TDEToggleAction *showSidebar, *scrollbarHandling;
+  TDESelectAction *orientation, *media, *zoom_action;
 
   virtual bool openFile();
 
@@ -181,30 +181,30 @@ private:
   KTempFile *tmpUnzipped;
 
   KDirWatch *watch;
-  KAccel *accel;
-  KAction *zoomInAct, *zoomOutAct, *backAct, *forwardAct,
+  TDEAccel *accel;
+  TDEAction *zoomInAct, *zoomOutAct, *backAct, *forwardAct,
     *startAct, *endAct, *gotoAct,
     *saveAction, *saveAsAction, *printAction, *readUpAct, *readDownAct;
-  KAction *backAction;
-  KAction *forwardAction;
-  KAction *settingsAction;
-  KAction* aboutAction;
-  KToggleAction *watchAct,*useDocumentSpecifiedSize,
+  TDEAction *backAction;
+  TDEAction *forwardAction;
+  TDEAction *settingsAction;
+  TDEAction* aboutAction;
+  TDEToggleAction *watchAct,*useDocumentSpecifiedSize,
     *fitPageAct, *fitHeightAct, *fitWidthAct;
-  KSelectAction* viewModeAction;
+  TDESelectAction* viewModeAction;
 
-  KRadioAction* moveModeAction;
-  KRadioAction* selectionModeAction;
+  TDERadioAction* moveModeAction;
+  TDERadioAction* selectionModeAction;
 
-  KAction* exportTextAction;
+  TDEAction* exportTextAction;
 
-  KAction* copyTextAction;
-  KAction* selectAllAction;
-  KAction* deselectAction;
-  KAction* findTextAction;
-  KAction* findNextTextAction;
-  KAction* findPrevAction;
-  KAction* findNextAction;
+  TDEAction* copyTextAction;
+  TDEAction* selectAllAction;
+  TDEAction* deselectAction;
+  TDEAction* findTextAction;
+  TDEAction* findNextTextAction;
+  TDEAction* findPrevAction;
+  TDEAction* findNextAction;
 
   KParts::PartManager* partManager;
 
diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp
index a45563c3..93a39b7f 100644
--- a/kviewshell/kviewshell.cpp
+++ b/kviewshell/kviewshell.cpp
@@ -75,7 +75,7 @@ KViewShell::KViewShell(const TQString& defaultMimeType)
   // file menu
   KStdAction::open(TQT_TQOBJECT(view), TQT_SLOT(slotFileOpen()), actionCollection());
   recent = KStdAction::openRecent (TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL &)), actionCollection());
-  reloadAction = new KAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQT_SLOT(reload()), actionCollection(), "reload");
+  reloadAction = new TDEAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQT_SLOT(reload()), actionCollection(), "reload");
   closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection());
   KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
 
diff --git a/kviewshell/kviewshell.h b/kviewshell/kviewshell.h
index 40cf3244..e4c45ee7 100644
--- a/kviewshell/kviewshell.h
+++ b/kviewshell/kviewshell.h
@@ -6,7 +6,7 @@
 
 #include <tdeparts/mainwindow.h>
 
-class KRecentFilesAction;
+class TDERecentFilesAction;
 class KURL;
 class KViewPart_Iface;
 
@@ -72,11 +72,11 @@ protected:
 private:
   KViewPart_Iface *view;
 
-  KRecentFilesAction *recent;
+  TDERecentFilesAction *recent;
   TQString cwd;
 
-  KAction *closeAction, *reloadAction;
-  KToggleAction *fullScreenAction;
+  TDEAction *closeAction, *reloadAction;
+  TDEToggleAction *fullScreenAction;
 
   // In the attribute, the status of the statusbar (shown of hidden)
   // is saved when the kviewshell switches to fullscreen mode. The
diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp
index 31b257f2..1cbf6581 100644
--- a/kviewshell/marklist.cpp
+++ b/kviewshell/marklist.cpp
@@ -558,7 +558,7 @@ void MarkList::showPopupMenu(const PageNumber& pageNumber, const TQPoint& positi
   if (contextMenu == 0)
   {
     // Initialize Contextmenu
-    contextMenu = new KPopupMenu(this, "markListContext");
+    contextMenu = new TDEPopupMenu(this, "markListContext");
 
     contextMenu->insertItem(i18n("Select &Current Page"), 0);
     contextMenu->insertItem(i18n("Select &All Pages"), 1);
diff --git a/kviewshell/marklist.h b/kviewshell/marklist.h
index 6fb46ac2..0ee15758 100644
--- a/kviewshell/marklist.h
+++ b/kviewshell/marklist.h
@@ -29,7 +29,7 @@
 
 class TQCheckBox;
 class TQLabel;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class DocumentPageCache;
 
@@ -183,7 +183,7 @@ private:
 
   bool showThumbnails;
 
-  KPopupMenu* contextMenu;
+  TDEPopupMenu* contextMenu;
 };
 
 #endif
diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index c60c7c9c..0a8cdd78 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -62,12 +62,12 @@ DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQO
   renderModes.append(i18n("Black and White"));
   renderModes.append(i18n("Show foreground only"));
   renderModes.append(i18n("Show background only"));
-  renderModeAction = new KSelectAction (i18n("Render Mode"), 0, 0, 0, actionCollection(), "render_mode");
+  renderModeAction = new TDESelectAction (i18n("Render Mode"), 0, 0, 0, actionCollection(), "render_mode");
   renderModeAction->setItems(renderModes);
 
   renderModeAction->setCurrentItem(Prefs::renderMode());
 
-  deletePagesAction = new KAction(i18n("Delete Pages..."), 0, this, TQT_SLOT(slotDeletePages()), actionCollection(), "delete_pages");
+  deletePagesAction = new TDEAction(i18n("Delete Pages..."), 0, this, TQT_SLOT(slotDeletePages()), actionCollection(), "delete_pages");
 
   // change the rendermode
   connect(renderModeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setRenderMode(int)));
diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h
index e6c47b14..2bbc6f4a 100644
--- a/kviewshell/plugins/djvu/djvumultipage.h
+++ b/kviewshell/plugins/djvu/djvumultipage.h
@@ -31,7 +31,7 @@
 
 #include "DjVuToPS.h"
 
-class KSelectAction;
+class TDESelectAction;
 
 /*! \mainpage DjVuMultiPage
   
@@ -143,8 +143,8 @@ public:
       implementation */
   DjVuRenderer     djvuRenderer;
 
-  KSelectAction* renderModeAction;
-  KAction* deletePagesAction;
+  TDESelectAction* renderModeAction;
+  TDEAction* deletePagesAction;
 };
 
 #endif
diff --git a/kviewshell/tableOfContents.cpp b/kviewshell/tableOfContents.cpp
index 51618d9a..e2ae9a02 100644
--- a/kviewshell/tableOfContents.cpp
+++ b/kviewshell/tableOfContents.cpp
@@ -29,18 +29,18 @@
 
 
 TocItem::TocItem(TocItem* parent)
-  : KListViewItem(parent)
+  : TDEListViewItem(parent)
 {
 }
 
 TocItem::TocItem(TQListView* parent)
-  : KListViewItem(parent)
+  : TDEListViewItem(parent)
 {
 }
 
 
 TableOfContents::TableOfContents(TQWidget* parent)
-  : KListView(parent)
+  : TDEListView(parent)
 {
   addColumn(i18n("Topic"));
   addColumn(i18n("Page"));
diff --git a/kviewshell/tableOfContents.h b/kviewshell/tableOfContents.h
index 8e8c4983..ccd106e8 100644
--- a/kviewshell/tableOfContents.h
+++ b/kviewshell/tableOfContents.h
@@ -29,7 +29,7 @@
 class Bookmark;
 
 
-class TocItem : public KListViewItem
+class TocItem : public TDEListViewItem
 {
 public:
   TocItem(TocItem* parent);
@@ -43,7 +43,7 @@ private:
 };
 
 
-class TableOfContents : public KListView
+class TableOfContents : public TDEListView
 {
 Q_OBJECT
   
diff --git a/kviewshell/tdemultipage.h b/kviewshell/tdemultipage.h
index ac3e6b02..1e0910ee 100644
--- a/kviewshell/tdemultipage.h
+++ b/kviewshell/tdemultipage.h
@@ -343,7 +343,7 @@ protected:
      place to connect to signals emitted by DocumentWidget. */
   virtual DocumentWidget* createDocumentWidget();
 
-  /* Used to enable/disable KActions of multiPage implementations.
+  /* Used to enable/disable TDEActions of multiPage implementations.
      enableActions(true) should be called whenever a file is
      successfully loaded.  enableActions(false) is called when the
      file is closed. */
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index edd21412..9618b47b 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -242,7 +242,7 @@ void ImageCanvas::enableContextMenu( bool wantContextMenu )
    {
       if( ! m_contextMenu )
       {
-	 m_contextMenu = new KPopupMenu(this, "IMG_CANVAS");
+	 m_contextMenu = new TDEPopupMenu(this, "IMG_CANVAS");
 
 	 KContextMenuManager::insert( viewport(), m_contextMenu );
       }
diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp
index c13e45e3..5aba1b04 100644
--- a/libkscan/previewer.cpp
+++ b/libkscan/previewer.cpp
@@ -145,12 +145,12 @@ Previewer::Previewer(TQWidget *parent, const char *name )
     layout->addWidget( img_canvas, 6 );
 
     /* Actions for the previewer zoom */
-    KAction *act;
-    act =  new KAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I,
+    TDEAction *act;
+    act =  new TDEAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I,
 		       TQT_TQOBJECT(this), TQT_SLOT( slScaleToWidth()), TQT_TQOBJECT(this), "preview_scaletowidth" );
     act->plug( img_canvas->contextMenu());
 
-    act = new KAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H,
+    act = new TDEAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H,
 		      TQT_TQOBJECT(this), TQT_SLOT( slScaleToHeight()), TQT_TQOBJECT(this), "preview_scaletoheight" );
     act->plug( img_canvas->contextMenu());