Rename a number of classes to enhance compatibility with KDE4

81 files changed, 310 insertions, 310 deletions

diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index 4ac60e3e..be27d0c2 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -42,8 +42,8 @@ BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStr
 	setInstance(BashSupportFactory::instance());
 	setXMLFile("kdevbashsupport.rc");
 
-	KAction *action;
-	action = new KAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
+	TDEAction *action;
+	action = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
     action->setToolTip(i18n("Run"));
     action->setWhatsThis(i18n("<b>Run</b><p>Starts an application."));
 
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index cefcc605..f4c4cba2 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -26,14 +26,14 @@
 #include <kstdaction.h>
 
 %{APPNAME}::%{APPNAME}()
-    : KMainWindow( 0, "%{APPNAME}" ),
+    : TDEMainWindow( 0, "%{APPNAME}" ),
       m_view(new %{APPNAME}View(this)),
       m_printer(0)
 {
     // accept dnd
     setAcceptDrops(true);
 
-    // tell the KMainWindow that this is indeed the main widget
+    // tell the TDEMainWindow that this is indeed the main widget
     setCentralWidget(m_view);
 
     // then, setup our actions
@@ -99,7 +99,7 @@ void %{APPNAME}::setupActions()
 
     // this doesn't do anything useful.  it's just here to illustrate
     // how to insert a custom menu and menu item
-    KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0,
+    TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0,
                                   this, TQT_SLOT(optionsPreferences()),
                                   actionCollection(), "custom_action");
 }
diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h
index 2085e6e6..007a5db0 100644
--- a/languages/cpp/app_templates/kapp/app.h
+++ b/languages/cpp/app_templates/kapp/app.h
@@ -23,7 +23,7 @@ class KURL;
  * @author %{AUTHOR} <%{EMAIL}>
  * @version %{VERSION}
  */
-class %{APPNAME} : public KMainWindow
+class %{APPNAME} : public TDEMainWindow
 {
     Q_OBJECT
   
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
index 9ef7ccc7..b9d5a9b4 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
@@ -54,7 +54,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win)
     /// @todo doesn't this have to be deleted?
     PluginView *view = new PluginView ();
 
-     (void) new KAction ( i18n("Insert Hello World"), 0, this,
+     (void) new TDEAction ( i18n("Insert Hello World"), 0, this,
                       TQT_SLOT( slotInsertHello() ), view->actionCollection(),
                       "edit_insert_%{APPNAMELC}" );
 
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 008db5a8..269a6b9e 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -58,7 +58,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win)
     /// @todo doesn't this have to be deleted?
     PluginView *view = new PluginView ();
 
-    (void) new KAction ( i18n("Insert Hello World"), 0, this,
+    (void) new TDEAction ( i18n("Insert Hello World"), 0, this,
                          TQT_SLOT( slotInsertHello() ), view->actionCollection(),
                          "edit_insert_%{APPNAMELC}" );
 
diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp
index b6a93a2b..0cbd25ed 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4.cpp
@@ -53,7 +53,7 @@ void %{APPNAME}::setupActions()
     TDEStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
 
     // custom menu and menu item - the slot is in the class %{APPNAME}View
-    KAction *custom = new KAction(KIcon("colorize"), i18n("Swi&tch Colors"), this);
+    TDEAction *custom = new TDEAction(KIcon("colorize"), i18n("Swi&tch Colors"), this);
     actionCollection()->addAction( TQLatin1String("switch_action"), custom );
     connect(custom, TQT_SIGNAL(triggered(bool)), m_view, TQT_SLOT(switchColors()));
 }
diff --git a/languages/cpp/app_templates/kde4app/kapp4.h b/languages/cpp/app_templates/kde4app/kapp4.h
index 68799e3c..3c209de2 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.h
+++ b/languages/cpp/app_templates/kde4app/kapp4.h
@@ -9,7 +9,7 @@
 
 class %{APPNAME}View;
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KUrl;
 
 /**
@@ -47,8 +47,8 @@ private:
     %{APPNAME}View *m_view;
 
     KPrinter   *m_printer;
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;
 };
 
 #endif // _%{APPNAMELC}_H_
diff --git a/languages/cpp/app_templates/kdedcop/app.cpp b/languages/cpp/app_templates/kdedcop/app.cpp
index e4fa554f..0548f6bd 100644
--- a/languages/cpp/app_templates/kdedcop/app.cpp
+++ b/languages/cpp/app_templates/kdedcop/app.cpp
@@ -8,7 +8,7 @@
 #include <klocale.h>
 
 %{APPNAME}::%{APPNAME}()
-    : KMainWindow( 0, "%{APPNAME}" )
+    : TDEMainWindow( 0, "%{APPNAME}" )
 {
     m_mainClass = new MainClass();
 }
diff --git a/languages/cpp/app_templates/kdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h
index 19489d45..5e533c50 100644
--- a/languages/cpp/app_templates/kdedcop/app.h
+++ b/languages/cpp/app_templates/kdedcop/app.h
@@ -16,7 +16,7 @@
  * @author %{AUTHOR} <%{EMAIL}>
  * @version 0.1
  */
-class %{APPNAME} : public KMainWindow
+class %{APPNAME} : public TDEMainWindow
 {
     Q_OBJECT
   
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index 364ec0d7..ce011498 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -28,7 +28,7 @@ static const KDevPluginInfo data("kdev%{APPNAMELC}");
 	setXMLFile("kdevlang_%{APPNAMELC}.rc");
 
 
-	m_build = new KAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
+	m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
 
 	kdDebug() << "Creating %{APPNAMELC} Part" << endl;
 
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h
index f6439768..1cce0fa6 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h
@@ -10,7 +10,7 @@
 #include <tqstringlist.h>
 #include <kdialogbase.h>
 
-class KAction;
+class TDEAction;
 
 /*
  Please read the README.dox file for more info about this part
@@ -37,7 +37,7 @@ class %{APPNAME}Part : public KDevLanguageSupport
 		void parse();
 		void slotActivePartChanged(KParts::Part *part);
 	private:
-		KAction *m_build;
+		TDEAction *m_build;
 };
 
 
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
index 082549c4..62ab3d94 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
@@ -91,7 +91,7 @@ void %{APPNAME}Part::init()
 void %{APPNAME}Part::setupActions()
 {
 // create XMLGUI actions here
-    action = new KAction(i18n("&Do Something..."), 0,
+    action = new TDEAction(i18n("&Do Something..."), 0,
         this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" );
     action->setToolTip(i18n("Do something"));
     action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do."));
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h
index 482df00f..9414d448 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h
@@ -7,7 +7,7 @@
 #include <tqguardedptr.h>
 
 class TQPopupMenu;
-class KAction;
+class TDEAction;
 class KDialogBase;
 class Context;
 class ConfigWidgetProxy;
@@ -37,7 +37,7 @@ private slots:
 private:
     void setupActions();
     
-    KAction *action;
+    TDEAction *action;
     
     TQGuardedPtr<%{APPNAME}Widget> m_widget;
     ConfigWidgetProxy *m_configProxy;
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
index 082549c4..62ab3d94 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
@@ -91,7 +91,7 @@ void %{APPNAME}Part::init()
 void %{APPNAME}Part::setupActions()
 {
 // create XMLGUI actions here
-    action = new KAction(i18n("&Do Something..."), 0,
+    action = new TDEAction(i18n("&Do Something..."), 0,
         this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" );
     action->setToolTip(i18n("Do something"));
     action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do."));
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h
index 482df00f..9414d448 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h
@@ -7,7 +7,7 @@
 #include <tqguardedptr.h>
 
 class TQPopupMenu;
-class KAction;
+class TDEAction;
 class KDialogBase;
 class Context;
 class ConfigWidgetProxy;
@@ -37,7 +37,7 @@ private slots:
 private:
     void setupActions();
     
-    KAction *action;
+    TDEAction *action;
     
     TQGuardedPtr<%{APPNAME}Widget> m_widget;
     ConfigWidgetProxy *m_configProxy;
diff --git a/languages/cpp/app_templates/khello/app.cpp b/languages/cpp/app_templates/khello/app.cpp
index 811f9337..72b9e2dc 100644
--- a/languages/cpp/app_templates/khello/app.cpp
+++ b/languages/cpp/app_templates/khello/app.cpp
@@ -8,7 +8,7 @@
 #include <klocale.h>
 
 %{APPNAME}::%{APPNAME}()
-    : KMainWindow( 0, "%{APPNAME}" )
+    : TDEMainWindow( 0, "%{APPNAME}" )
 {
     // set the shell's ui resource file
     setXMLFile("%{APPNAMELC}ui.rc");
diff --git a/languages/cpp/app_templates/khello/app.h b/languages/cpp/app_templates/khello/app.h
index f8617bab..a3e4bd31 100644
--- a/languages/cpp/app_templates/khello/app.h
+++ b/languages/cpp/app_templates/khello/app.h
@@ -14,7 +14,7 @@
  * @author %{AUTHOR} <%{EMAIL}>
  * @version %{VERSION}
  */
-class %{APPNAME} : public KMainWindow
+class %{APPNAME} : public TDEMainWindow
 {
     Q_OBJECT
   
diff --git a/languages/cpp/app_templates/khello2/app.cpp b/languages/cpp/app_templates/khello2/app.cpp
index 948a98fc..e506490b 100644
--- a/languages/cpp/app_templates/khello2/app.cpp
+++ b/languages/cpp/app_templates/khello2/app.cpp
@@ -7,7 +7,7 @@
 #include "%{APPNAMELC}widget.h"
 
 %{APPNAME}::%{APPNAME}()
-    : KMainWindow( 0, "%{APPNAME}" )
+    : TDEMainWindow( 0, "%{APPNAME}" )
 {
     setCentralWidget( new %{APPNAME}Widget( this ) );
 }
diff --git a/languages/cpp/app_templates/khello2/app.h b/languages/cpp/app_templates/khello2/app.h
index f8617bab..a3e4bd31 100644
--- a/languages/cpp/app_templates/khello2/app.h
+++ b/languages/cpp/app_templates/khello2/app.h
@@ -14,7 +14,7 @@
  * @author %{AUTHOR} <%{EMAIL}>
  * @version %{VERSION}
  */
-class %{APPNAME} : public KMainWindow
+class %{APPNAME} : public TDEMainWindow
 {
     Q_OBJECT
   
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
index f32707a8..26b70e3d 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
@@ -20,7 +20,7 @@
     setXMLFile( "%{APPNAMELC}.rc" );
     KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" );
     // Note: Prefer KStdAction::* to any custom action if possible.
-    //m_cut = new KAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ),
+    //m_cut = new TDEAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ),
     //                   actionCollection(), "cut");
 }
 
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h
index c6853333..a7e0fd50 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.h
@@ -8,7 +8,7 @@
 
 #include <koView.h>
 
-class KAction;
+class TDEAction;
 class TQPaintEvent;
 
 class %{APPNAME}Part;
@@ -29,7 +29,7 @@ protected:
     virtual void updateReadWrite( bool readwrite );
 
 private:
-    //KAction* m_cut;
+    //TDEAction* m_cut;
 };
 
 #endif
diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h
index 6b470b92..c64525c6 100644
--- a/languages/cpp/app_templates/kpartapp/app.h
+++ b/languages/cpp/app_templates/kpartapp/app.h
@@ -9,7 +9,7 @@
 #include <kapplication.h>
 #include <tdeparts/mainwindow.h>
 
-class KToggleAction;
+class TDEToggleAction;
 
 /**
  * This is the application "Shell".  It has a menubar, toolbar, and
@@ -70,8 +70,8 @@ private:
 private:
     KParts::ReadWritePart *m_part;
 
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;
 };
 
 #endif // _%{APPNAMEUC}_H_
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 518d4514..0187646e 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -63,7 +63,7 @@ void %{APPNAME}Part::setReadWrite(bool rw)
 void %{APPNAME}Part::setModified(bool modified)
 {
     // get a handle on our Save action and make sure it is valid
-    KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
+    TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
     if (!save)
         return;
 
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index b6297139..3941fa56 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -13,7 +13,7 @@ Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name )
 {
     // Instantiate all of your actions here.  These will appear in
     // Konqueror's menu and toolbars.
-    (void) new KAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0,
+    (void) new TDEAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0,
                         this, TQT_SLOT(slotAction()),
                         actionCollection(), "plugin_action" );
 }
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index 2895fb0a..6b37401d 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -26,14 +26,14 @@
 #include <kstdaction.h>
 
 %{APPNAME}::%{APPNAME}()
-    : KMainWindow( 0, "%{APPNAME}" ),
+    : TDEMainWindow( 0, "%{APPNAME}" ),
       m_view(new %{APPNAME}View(this)),
       m_printer(0)
 {
     // accept dnd
     setAcceptDrops(true);
 
-    // tell the KMainWindow that this is indeed the main widget
+    // tell the TDEMainWindow that this is indeed the main widget
     setCentralWidget(m_view);
 
     // then, setup our actions
@@ -76,7 +76,7 @@ void %{APPNAME}::setupActions()
     KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
 
     // custom menu and menu item - the slot is in the class %{APPNAME}View
-    KAction *custom = new KAction(i18n("Swi&tch Colors"), 0,
+    TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0,
                                   m_view, TQT_SLOT(switchColors()),
                                   actionCollection(), "switch_action");
 
diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h
index 6ac2acb8..fd0e7fa1 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.h
+++ b/languages/cpp/app_templates/kscons_kxt/app.h
@@ -14,7 +14,7 @@
 #include "%{APPNAMELC}view.h"
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 
 /**
@@ -25,7 +25,7 @@ class KURL;
  * @author %{AUTHOR} <%{EMAIL}>
  * @version %{VERSION}
  */
-class %{APPNAME} : public KMainWindow, public DCOPObject
+class %{APPNAME} : public TDEMainWindow, public DCOPObject
 {
     K_DCOP
     Q_OBJECT
@@ -66,8 +66,8 @@ private:
     %{APPNAME}View *m_view;
 
     KPrinter   *m_printer;
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;
 };
 
 #endif // _%{APPNAMEUC}_H_
diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
index 5ea5d069..87c66b54 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
@@ -77,7 +77,7 @@ void %{APPNAMELC}Part::setReadWrite(bool rw)
 void %{APPNAMELC}Part::setModified(bool modified)
 {
     // get a handle on our Save action and make sure it is valid
-    KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
+    TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
     if (!save)
         return;
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index 7ea17587..bc36931c 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -138,7 +138,7 @@ void %{APPNAMELC}tdemdi::setupActions()
 	KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
 	KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
 
-	KAction* action = KStdAction::configureToolbars(this, 
+	TDEAction* action = KStdAction::configureToolbars(this, 
 	         TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 
 	createGUI( NULL );
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
index 02d26d0c..6819937d 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
@@ -9,8 +9,8 @@
 #include <tdemdimainfrm.h>
 #include <kurl.h>
 
-class KToggleAction;
-class KRecentFilesAction;
+class TDEToggleAction;
+class TDERecentFilesAction;
 
 class tdemdikonsole;
 class KMdiChildView;
@@ -71,8 +71,8 @@ class %{APPNAMELC}tdemdi : public KMdiMainFrm
 
 		TQValueList<%{APPNAMELC}tdemdiView*> m_views;
 
-		KToggleAction *m_toolbarAction;
-		KToggleAction *m_statusbarAction;
+		TDEToggleAction *m_toolbarAction;
+		TDEToggleAction *m_statusbarAction;
 
 		KParts::PartManager *m_manager;
 
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index 6f3e19fb..183841ad 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -25,14 +25,14 @@
 #include <kstdaction.h>
 
 %{APPNAMELC}::%{APPNAMELC}()
-    : KMainWindow( 0, "%{APPNAMELC}" ),
+    : TDEMainWindow( 0, "%{APPNAMELC}" ),
       m_view(new %{APPNAMELC}View(this)),
       m_printer(0)
 {
     // accept dnd
     setAcceptDrops(true);
 
-    // tell the KMainWindow that this is indeed the main widget
+    // tell the TDEMainWindow that this is indeed the main widget
     setCentralWidget(m_view);
 
     // then, setup our actions
@@ -71,7 +71,7 @@ void %{APPNAMELC}::setupActions()
     KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
 
     // custom menu and menu item - the slot is in the class %{APPNAMELC}View
-    KAction *custom = new KAction(i18n("Swi&tch Colors"), 0,
+    TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0,
                                   m_view, TQT_SLOT(switchColors()),
                                   actionCollection(), "switch_action");
 
diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h
index 76d48c70..b56f3ae9 100644
--- a/languages/cpp/app_templates/kxt/app.h
+++ b/languages/cpp/app_templates/kxt/app.h
@@ -13,7 +13,7 @@
 #include "%{APPNAMELC}view.h"
 
 class KPrinter;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 
 /**
@@ -24,7 +24,7 @@ class KURL;
  * @author %{AUTHOR} <%{EMAIL}>
  * @version %{VERSION}
  */
-class %{APPNAMELC} : public KMainWindow
+class %{APPNAMELC} : public TDEMainWindow
 {
     Q_OBJECT
   
@@ -59,8 +59,8 @@ private:
     %{APPNAMELC}View *m_view;
 
     KPrinter   *m_printer;
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;
 };
 
 #endif // _%{APPNAMEUC}_H_
diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp
index d158e45f..41e30220 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/app.cpp
@@ -14,14 +14,14 @@
 #include <kstatusbar.h>
 
 %{APPNAMELC}::%{APPNAMELC}()
-    : KMainWindow( 0, "%{APPNAMELC}" ),
+    : TDEMainWindow( 0, "%{APPNAMELC}" ),
       m_view(new %{APPNAMELC}View(this)),
       m_printer(0)
 {
     // accept dnd
     setAcceptDrops(true);
 
-    // tell the KMainWindow that this is indeed the main widget
+    // tell the TDEMainWindow that this is indeed the main widget
     setCentralWidget(m_view);
     // and a status bar
     statusBar()->show();
@@ -53,7 +53,7 @@ void %{APPNAMELC}::setupActions()
     KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
 
     // custom menu and menu item 
-    KAction *custom = new KAction(i18n("Swi&tch Colors"), 0,
+    TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0,
                                   m_view, TQT_SLOT(switchColors()),
                                   actionCollection(), "switch_action");
 
diff --git a/languages/cpp/app_templates/tdeconfig35/app.h b/languages/cpp/app_templates/tdeconfig35/app.h
index c1aac7e4..67073ea3 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.h
+++ b/languages/cpp/app_templates/tdeconfig35/app.h
@@ -23,7 +23,7 @@ class KURL;
  * @author %{AUTHOR} <%{EMAIL}>
  * @version %{VERSION}
  */
-class %{APPNAMELC} : public KMainWindow
+class %{APPNAMELC} : public TDEMainWindow
 {
     Q_OBJECT
   
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index aaad17c1..c6ee9db7 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -954,11 +954,11 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) {
   connect( part, TQT_SIGNAL( codeModelUpdated( const TQString& ) ),
            this, TQT_SLOT( slotCodeModelUpdated( const TQString& ) ) );
 
-  KAction * action = new KAction( i18n("Jump to declaration under cursor"), 0, CTRL + Key_Comma,
+  TDEAction * action = new TDEAction( i18n("Jump to declaration under cursor"), 0, CTRL + Key_Comma,
     this, TQT_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" );
   action->plug( &m_DummyActionWidget );
 
-  action = new KAction( i18n("Jump to definition under cursor"), 0, CTRL + Key_Period, 
+  action = new TDEAction( i18n("Jump to definition under cursor"), 0, CTRL + Key_Period, 
     this, TQT_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" );
   action->plug( &m_DummyActionWidget );
 }
diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h
index 48f73144..c0536c92 100644
--- a/languages/cpp/cppimplementationwidget.h
+++ b/languages/cpp/cppimplementationwidget.h
@@ -24,7 +24,7 @@
 
 #include <codemodel.h>
 
-class KListViewItem;
+class TDEListViewItem;
 class CppSupportPart;
 
 class CppImplementationWidget : public ImplementationWidget
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 75d6b918..ca2f082e 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -251,7 +251,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 	connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ),
 	         this, TQT_SLOT( configWidget( KDialogBase* ) ) );
 
-	m_switchHeaderSourceAction = new KAction( i18n( "Switch Header/Implementation" ), SHIFT + Key_F12,
+	m_switchHeaderSourceAction = new TDEAction( i18n( "Switch Header/Implementation" ), SHIFT + Key_F12,
 	                      this, TQT_SLOT( slotSwitchHeader() ),
 	                      actionCollection(), "edit_switchheader" );
 	m_switchHeaderSourceAction->setToolTip( i18n( "Switch between header and implementation files" ) );
@@ -262,9 +262,9 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 	                            "this brings you to the corresponding header file." ) );
 	m_switchHeaderSourceAction->setEnabled( false );
 
-	KAction *action;
+	TDEAction *action;
 
-	action = new KAction( i18n( "Complete Text" ), CTRL + Key_Space,
+	action = new TDEAction( i18n( "Complete Text" ), CTRL + Key_Space,
 	                      this, TQT_SLOT( slotCompleteText() ),
 	                      actionCollection(), "edit_complete_text" );
 	action->setToolTip( i18n( "Complete current expression" ) );
@@ -273,11 +273,11 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 	                            "for external libraries." ) );
 	action->setEnabled( false );
 
-	m_createGetterSetterAction = new KAction( i18n( "Create Accessor Methods" ), 0,
+	m_createGetterSetterAction = new TDEAction( i18n( "Create Accessor Methods" ), 0,
 	                                          this, TQT_SLOT( slotCreateAccessMethods() ), actionCollection(),
 	                                          "edit_create_getter_setter" );
 
-	action = new KAction( i18n( "Make Member" ), 0, Key_F2,
+	action = new TDEAction( i18n( "Make Member" ), 0, Key_F2,
 	                      this, TQT_SLOT( slotMakeMember() ),
 	                      actionCollection(), "edit_make_member" );
 	action->setToolTip( i18n( "Make member" ) );
@@ -285,7 +285,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 	                            "based on the member declaration at the current line." ) );
 	action->plug( &m_DummyActionWidget );
 
-	action = new KAction( i18n( "Navigation Menu" ), 0, CTRL + ALT + Key_Space,
+	action = new TDEAction( i18n( "Navigation Menu" ), 0, CTRL + ALT + Key_Space,
 	                      this, TQT_SLOT( slotNavigate() ),
 	                      actionCollection(), "edit_navigate" );
 	action->setToolTip( i18n( "Show the navigation-menu" ) );
@@ -293,7 +293,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 	action->plug( &m_DummyActionWidget );
 
 
-	action = new KAction( i18n( "New Class..." ), "classnew", 0,
+	action = new TDEAction( i18n( "New Class..." ), "classnew", 0,
 	                      this, TQT_SLOT( slotNewClass() ),
 	                      actionCollection(), "project_newclass" );
 	action->setToolTip( i18n( "Generate a new class" ) );
@@ -641,9 +641,9 @@ void CppSupportPart::slotNavigate() {
 		unsigned int curLine = 0, curCol = 0;
 		m_activeViewCursor->cursorPositionReal( &curLine, &curCol );
 
-		if( m_navigationMenu ) delete (KPopupMenu*)m_navigationMenu;
+		if( m_navigationMenu ) delete (TDEPopupMenu*)m_navigationMenu;
 
-		m_navigationMenu = new KPopupMenu( m_activeView );
+		m_navigationMenu = new TDEPopupMenu( m_activeView );
 
 		codeCompletion()->contextEvaluationMenus( m_navigationMenu, 0, curLine, curCol );
 
diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h
index b7ac8267..d858d274 100644
--- a/languages/cpp/cppsupportpart.h
+++ b/languages/cpp/cppsupportpart.h
@@ -85,11 +85,11 @@ class TQStringList;
 class TQListViewItem;
 class TranslationUnitAST;
 class TQTimer;
-class KListView;
+class TDEListView;
 class Driver;
-class KPopupMenu;
+class TDEPopupMenu;
 class BackgroundParserConfig;
-class KAction;
+class TDEAction;
 
 namespace KParts
 {
@@ -414,8 +414,8 @@ private:
     CppSplitHeaderSourceConfig* m_pSplitHeaderSourceConfig;
 
 	CreateGetterSetterConfiguration* m_pCreateGetterSetterConfiguration;
-	KAction * m_createGetterSetterAction;
-	KAction * m_switchHeaderSourceAction;
+	TDEAction * m_createGetterSetterAction;
+	TDEAction * m_switchHeaderSourceAction;
 	
 	QtBuildConfig* m_qtBuildConfig;
 
@@ -455,7 +455,7 @@ private:
 	FunctionDom m_activeFunction;
 	VariableDom m_activeVariable;
 
-	TQGuardedPtr<KPopupMenu> m_navigationMenu;
+	TQGuardedPtr<TDEPopupMenu> m_navigationMenu;
 
 // 	TQTimer* m_functionHintTimer;
 // 	TQTimer* m_deleteParserStoreTimer;
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index afc910b8..21b3c55a 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -129,16 +129,16 @@ private:
 };
 
 
-class PCSListViewItem: public KListViewItem
+class PCSListViewItem: public TDEListViewItem
 {
 public:
 	PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* parent )
-			: KListViewItem( parent ), m_importer( importer )
+			: TDEListViewItem( parent ), m_importer( importer )
 	{
 		init( ptr );
 	}
 	PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* parent )
-			: KListViewItem( parent ), m_importer( importer )
+			: TDEListViewItem( parent ), m_importer( importer )
 	{
 		init( ptr );
 	}
diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui
index d75dde96..bb99e12a 100644
--- a/languages/cpp/createpcsdialogbase.ui
+++ b/languages/cpp/createpcsdialogbase.ui
@@ -26,7 +26,7 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="KListView">
+            <widget class="TDEListView">
                 <column>
                     <property name="text">
                         <string></string>
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index 8033a993..22104794 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -53,7 +53,7 @@ namespace GDBDebugger
 Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
     : KDialog(parent, name, true),      // modal
       psProc_(0),
-      pids_(new KListView(this)),
+      pids_(new TDEListView(this)),
       pidLines_(TQString())
 {
     setCaption(i18n("Attach to Process"));
@@ -67,7 +67,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
 
     TQBoxLayout *topLayout = new TQVBoxLayout(this, 5);
 
-    searchLineWidget_ = new KListViewSearchLineWidget(pids_, this);
+    searchLineWidget_ = new TDEListViewSearchLineWidget(pids_, this);
     topLayout->addWidget(searchLineWidget_);
 
     topLayout->addWidget(pids_);
@@ -187,7 +187,7 @@ void Dbg_PS_Dialog::slotProcessExited()
 
         start = pos+1;    
     }
-    // Need to set focus here too, as KListView will
+    // Need to set focus here too, as TDEListView will
     // 'steal' it otherwise.
     searchLineWidget_->searchLine()->setFocus();
 }
diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h
index 0bf445dc..f9dbbab0 100644
--- a/languages/cpp/debugger/dbgpsdlg.h
+++ b/languages/cpp/debugger/dbgpsdlg.h
@@ -20,8 +20,8 @@
 
 class TQListBox;
 class TDEProcess;
-class KListView;
-class KListViewSearchLineWidget;
+class TDEListView;
+class TDEListViewSearchLineWidget;
 
 namespace GDBDebugger
 {
@@ -49,8 +49,8 @@ protected:
 
 private:
     TDEProcess* psProc_;
-    KListView* pids_;
-    KListViewSearchLineWidget* searchLineWidget_;
+    TDEListView* pids_;
+    TDEListViewSearchLineWidget* searchLineWidget_;
     TQString   pidLines_;
     TQString   pidCmd_;
 };
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index 8933ea12..16fe3b53 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -40,7 +40,7 @@
 
 // Implements a floating toolbar for the debugger.
 
-// Unfortunately, I couldn't get the KToolBar to work nicely when it
+// Unfortunately, I couldn't get the TDEToolBar to work nicely when it
 // was floating, so I was forced to write these classes. I'm not sure whether
 // I didn't try hard enough or ... and I've forgotten what the problems were
 // now.
@@ -48,7 +48,7 @@
 // The problem with using this is that it will not dock as a normal toolbar.
 // I'm not convince that this is a real problem though.
 
-// So, if you can get it to work as a KToolBar, and it works well when the
+// So, if you can get it to work as a TDEToolBar, and it works well when the
 // app is running, then all these classes can be removed.
 
 // This code is very specific to the internal debugger in tdevelop.
@@ -64,7 +64,7 @@ namespace GDBDebugger
 // I would have preferred to use normal decoration on the toolbar and removed
 // the iconify, close, etc buttons from the window title but again I kept running
 // into problems. Instead, I used no decoration and this class. Also this looks
-// similar to the KToolBar floating style.
+// similar to the TDEToolBar floating style.
 class DbgMoveHandle : public TQFrame
 {
 public:
@@ -108,7 +108,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
         return;
 
     if (e->button() == Qt::RightButton) {
-        KPopupMenu *menu = new KPopupMenu(this);
+        TDEPopupMenu *menu = new TDEPopupMenu(this);
 	menu->insertTitle(i18n("Debug Toolbar"));
         menu->insertItem(i18n("Dock to Panel"),
                          parent(), TQT_SLOT(slotDock()));
@@ -241,7 +241,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e)
         }
     case Qt::RightButton:
         {
-            KPopupMenu* menu = new KPopupMenu(this);
+            TDEPopupMenu* menu = new TDEPopupMenu(this);
 	    menu->insertTitle(i18n("Debug Toolbar"));
             menu->insertItem(i18n("Activate"),                        toolBar_, TQT_SLOT(slotUndock()));
             menu->insertItem(i18n("Activate (TDevelop gets focus)"),  toolBar_, TQT_SLOT(slotActivateAndUndock()));
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index c18d581d..29280d4e 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -183,10 +183,10 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
             this, TQT_SLOT(slotShowView(bool)));
 
     // Now setup the actions
-    KAction *action;
+    TDEAction *action;
 
-//    action = new KAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9,
-    action = new KAction(i18n("&Start"), "dbgrun", Key_F9,
+//    action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9,
+    action = new TDEAction(i18n("&Start"), "dbgrun", Key_F9,
                          this, TQT_SLOT(slotRun()),
                          actionCollection(), "debug_run");
     action->setToolTip( i18n("Start in debugger") );
@@ -197,7 +197,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
                                "while it is running, in order to get information "
                                "about variables, frame stack, and so on.") );
 
-    action = new KAction(i18n("&Restart"), "dbgrestart", 0,
+    action = new TDEAction(i18n("&Restart"), "dbgrestart", 0,
                          this, TQT_SLOT(slotRestart()),
                          actionCollection(), "debug_restart");
     action->setToolTip( i18n("Restart program") );
@@ -207,33 +207,33 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
     action->setEnabled(false);
 
 
-    action = new KAction(i18n("Sto&p"), "stop", 0,
+    action = new TDEAction(i18n("Sto&p"), "stop", 0,
                          this, TQT_SLOT(slotStop()),
                          actionCollection(), "debug_stop");
     action->setToolTip( i18n("Stop debugger") );
     action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger."));
 
-    action = new KAction(i18n("Interrupt"), "player_pause", 0,
+    action = new TDEAction(i18n("Interrupt"), "player_pause", 0,
                          this, TQT_SLOT(slotPause()),
                          actionCollection(), "debug_pause");
     action->setToolTip( i18n("Interrupt application") );
     action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current GDB command."));
 
-    action = new KAction(i18n("Run to &Cursor"), "dbgrunto", 0,
+    action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0,
                          this, TQT_SLOT(slotRunToCursor()),
                          actionCollection(), "debug_runtocursor");
     action->setToolTip( i18n("Run to cursor") );
     action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached."));
 
 
-    action = new KAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0,
+    action = new TDEAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0,
                          this, TQT_SLOT(slotJumpToCursor()),
                          actionCollection(), "debug_jumptocursor");
     action->setToolTip( i18n("Jump to cursor") );
     action->setWhatsThis(i18n("<b>Set Execution Position </b><p>Set the execution pointer to the current cursor position."));
 
 
-    action = new KAction(i18n("Step &Over"), "dbgnext", Key_F10,
+    action = new TDEAction(i18n("Step &Over"), "dbgnext", Key_F10,
                          this, TQT_SLOT(slotStepOver()),
                          actionCollection(), "debug_stepover");
     action->setToolTip( i18n("Step over the next line") );
@@ -244,14 +244,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
                                "following the function call.") );
 
 
-    action = new KAction(i18n("Step over Ins&truction"), "dbgnextinst", 0,
+    action = new TDEAction(i18n("Step over Ins&truction"), "dbgnextinst", 0,
                          this, TQT_SLOT(slotStepOverInstruction()),
                          actionCollection(), "debug_stepoverinst");
     action->setToolTip( i18n("Step over instruction") );
     action->setWhatsThis(i18n("<b>Step over instruction</b><p>Steps over the next assembly instruction."));
 
 
-    action = new KAction(i18n("Step &Into"), "dbgstep", Key_F11,
+    action = new TDEAction(i18n("Step &Into"), "dbgstep", Key_F11,
                          this, TQT_SLOT(slotStepInto()),
                          actionCollection(), "debug_stepinto");
     action->setToolTip( i18n("Step into the next statement") );
@@ -261,14 +261,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
                                "the function has been entered.") );
 
 
-    action = new KAction(i18n("Step into I&nstruction"), "dbgstepinst", 0,
+    action = new TDEAction(i18n("Step into I&nstruction"), "dbgstepinst", 0,
                          this, TQT_SLOT(slotStepIntoInstruction()),
                          actionCollection(), "debug_stepintoinst");
     action->setToolTip( i18n("Step into instruction") );
     action->setWhatsThis(i18n("<b>Step into instruction</b><p>Steps into the next assembly instruction."));
 
 
-    action = new KAction(i18n("Step O&ut"), "dbgstepout", Key_F12,
+    action = new TDEAction(i18n("Step O&ut"), "dbgstepout", Key_F12,
                          this, TQT_SLOT(slotStepOut()),
                          actionCollection(), "debug_stepout");
     action->setToolTip( i18n("Steps out of the current function") );
@@ -280,7 +280,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
                                "main()) then this operation has no effect.") );
 
 
-    action = new KAction(i18n("Viewers"), "dbgmemview", 0,
+    action = new TDEAction(i18n("Viewers"), "dbgmemview", 0,
                          this, TQT_SLOT(slotMemoryView()),
                          actionCollection(), "debug_memview");
     action->setToolTip( i18n("Debugger viewers") );
@@ -291,7 +291,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
         "<b>Libraries</b>"));
 
 
-    action = new KAction(i18n("Examine Core File..."), "core", 0,
+    action = new TDEAction(i18n("Examine Core File..."), "core", 0,
                          this, TQT_SLOT(slotExamineCore()),
                          actionCollection(), "debug_core");
     action->setToolTip( i18n("Examine core file") );
@@ -303,13 +303,13 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
                                "allowing you to do a post-mortem analysis.") );
 
 
-    action = new KAction(i18n("Attach to Process"), "connect_creating", 0,
+    action = new TDEAction(i18n("Attach to Process"), "connect_creating", 0,
                          this, TQT_SLOT(slotAttachProcess()),
                          actionCollection(), "debug_attach");
     action->setToolTip( i18n("Attach to process") );
     action->setWhatsThis(i18n("<b>Attach to process</b><p>Attaches the debugger to a running process."));
 
-    action = new KAction(i18n("Toggle Breakpoint"), 0, 0,
+    action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0,
                          this, TQT_SLOT(toggleBreakpoint()),
                          actionCollection(), "debug_toggle_breakpoint");
     action->setToolTip(i18n("Toggle breakpoint"));
@@ -492,7 +492,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
     if (running)
     {
         // Too bad we can't add TQAction to popup menu in TQt3.
-        KAction* act = actionCollection()->action("debug_runtocursor");
+        TDEAction* act = actionCollection()->action("debug_runtocursor");
         Q_ASSERT(act);
         if (act)
         {
@@ -672,7 +672,7 @@ bool DebuggerPart::startDebugger()
 
         stateChanged( TQString("active") );
 
-        KActionCollection *ac = actionCollection();
+        TDEActionCollection *ac = actionCollection();
         ac->action("debug_run")->setText( i18n("&Continue") );
 
         ac->action("debug_run")->setToolTip(
@@ -737,7 +737,7 @@ void DebuggerPart::slotStopDebugger()
     mainWindow()->setViewAvailable(disassembleWidget, false);
     mainWindow()->setViewAvailable(gdbOutputWidget, false);
 
-    KActionCollection *ac = actionCollection();
+    TDEActionCollection *ac = actionCollection();
     ac->action("debug_run")->setText( i18n("&Start") );
 //    ac->action("debug_run")->setIcon( "1rightarrow" );
     ac->action("debug_run")->setToolTip( i18n("Runs the program in the debugger") );
@@ -912,7 +912,7 @@ void DebuggerPart::slotRun_part2()
     }
     else if (controller->stateIsOn( s_appNotStarted ) )
     {
-        KActionCollection *ac = actionCollection();
+        TDEActionCollection *ac = actionCollection();
         ac->action("debug_run")->setText( i18n("&Continue") );
         ac->action("debug_run")->setToolTip( i18n("Continues the application execution") );
         ac->action("debug_run")->setWhatsThis( i18n("Continue application execution\n\n"
@@ -1135,7 +1135,7 @@ void DebuggerPart::slotStatus(const TQString &msg, int state)
 
     if (state & s_appNotStarted)
     {
-        KActionCollection *ac = actionCollection();
+        TDEActionCollection *ac = actionCollection();
         ac->action("debug_run")->setText( i18n("To start something","Start") );
         ac->action("debug_run")->setToolTip( i18n("Restart the program in the debugger") );
         ac->action("debug_run")->setWhatsThis( i18n("Restart in debugger\n\n"
@@ -1215,7 +1215,7 @@ void DebuggerPart::slotGotoSource(const TQString &fileName, int lineNum)
 
 void DebuggerPart::slotActivePartChanged( KParts::Part* part )
 {
-    KAction* action = actionCollection()->action("debug_toggle_breakpoint");
+    TDEAction* action = actionCollection()->action("debug_toggle_breakpoint");
     if(!action)
         return;
 
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index 11e50feb..ef2dd56f 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -321,7 +321,7 @@ void GDBOutputWidget::restorePartialProjectSession(const TQDomElement* el)
 //void OutputText::contextMenuEvent(TQContextMenuEvent* e)
 TQPopupMenu* OutputText::createPopupMenu(const TQPoint&)
 {
-    KPopupMenu* popup = new KPopupMenu;
+    TDEPopupMenu* popup = new TDEPopupMenu;
 
     int id = popup->insertItem(i18n("Show Internal Commands"),
                                this,
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 62a99ad4..19dd877a 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -201,7 +201,7 @@ VariableTree::VariableTree(VariableWidget *parent,
                            GDBController*  controller,
                            GDBBreakpointWidget* breakpointWidget,
                            const char *name)
-    : KListView(parent, name),
+    : TDEListView(parent, name),
       TQToolTip( viewport() ),
       controller_(controller),
       breakpointWidget_(breakpointWidget),
@@ -223,8 +223,8 @@ VariableTree::VariableTree(VariableWidget *parent,
     addColumn(i18n("Value"));
 //     setResizeMode(AllColumns);
 
-    connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
-             TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+             TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) );
     connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)),
              this, TQT_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&)));
 }
@@ -237,7 +237,7 @@ VariableTree::~VariableTree()
 
 // **************************************************************************
 
-void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
+void VariableTree::slotContextMenu(TDEListView *, TQListViewItem *item)
 {
     if (!item)
         return;
@@ -246,8 +246,8 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
 
     if (item->parent())
     {
-        KPopupMenu popup(this);
-        KPopupMenu format(this);
+        TDEPopupMenu popup(this);
+        TDEPopupMenu format(this);
 
         int idRemember = -2;
         int idRemove = -2;
@@ -393,7 +393,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
     }
     else if (item == recentExpressions_)
     {
-        KPopupMenu popup(this);
+        TDEPopupMenu popup(this);
         popup.insertTitle(i18n("Recent Expressions"));
         int idRemove = popup.insertItem(
             SmallIcon("editdelete"), i18n("Remove All"));
@@ -1019,14 +1019,14 @@ void VariableTree::handleAddressComputed(const GDBMI::ResultRecord& r)
 // **************************************************************************
 
 TrimmableItem::TrimmableItem(VariableTree *parent)
-    : KListViewItem (parent, parent->lastChild())
+    : TDEListViewItem (parent, parent->lastChild())
 {
 }
 
 // **************************************************************************
 
 TrimmableItem::TrimmableItem(TrimmableItem *parent)
-    : KListViewItem (parent, parent->lastChild())
+    : TDEListViewItem (parent, parent->lastChild())
 {
 }
 
diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h
index 86d08848..d08d5729 100644
--- a/languages/cpp/debugger/variablewidget.h
+++ b/languages/cpp/debugger/variablewidget.h
@@ -31,7 +31,7 @@
 #include <vector>
 
 class KLineEdit;
-class KPopupMenu;
+class TDEPopupMenu;
 
 namespace GDBDebugger
 {
@@ -83,7 +83,7 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-class VariableTree : public KListView, public TQToolTip
+class VariableTree : public TDEListView, public TQToolTip
 {
     Q_OBJECT
   
@@ -117,7 +117,7 @@ public slots:
     void slotItemRenamed(TQListViewItem* item, int col, const TQString& text);
 
 private slots:
-    void slotContextMenu(KListView *, TQListViewItem *item);
+    void slotContextMenu(TDEListView *, TQListViewItem *item);
     void slotVarobjNameChanged(const TQString& from, const TQString& to);
 
 private: // Callbacks for gdb commands;
@@ -174,7 +174,7 @@ private:
 
     TQMap<TQString, VarItem*> varobj2varitem;
 
-    KPopupMenu* activePopup_;
+    TDEPopupMenu* activePopup_;
     static const int idToggleWatch = 10;
 
     friend class VarFrameRoot;
@@ -204,7 +204,7 @@ private:
     'trim' method is called, removing all variables which were not recieved
     from gdbr.    
  */
-class TrimmableItem : public KListViewItem
+class TrimmableItem : public TDEListViewItem
 {
 public:
     TrimmableItem(VariableTree *parent);
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index 6dd08e6c..d806e440 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -250,7 +250,7 @@
 <entry name="actions, helpContents" url="ch06.html"/>
 <entry name="actions, help" url="ch06.html"/>
 <entry name="actions, home" url="ch06.html"/>
-<entry name="actions, KAction class" url="ch05.html"/>
+<entry name="actions, TDEAction class" url="ch05.html"/>
 <entry name="actions, keyBindings" url="ch06.html"/>
 <entry name="actions, lastPage" url="ch06.html"/>
 <entry name="actions, mail" url="ch06.html"/>
@@ -429,8 +429,8 @@
 <entry name="classes, CGotoDialog, modeless dialog box" url="ch08lev1sec3.html"/>
 <entry name="classes, documentation" url="ch02lev1sec5.html"/>
 <entry name="classes, documentation" url="ch15.html"/>
-<entry name="classes, KAction" url="ch05.html"/>
-<entry name="classes, KAction" url="ch06.html"/>
+<entry name="classes, TDEAction" url="ch05.html"/>
+<entry name="classes, TDEAction" url="ch06.html"/>
 <entry name="classes, TDEApplication" url="ch02lev1sec3.html"/>
 <entry name="classes, KAudioPlayer" url="ch14lev1sec6.html"/>
 <entry name="classes, TDE versus Qt" url="ch03lev1sec2.html"/>
@@ -775,7 +775,7 @@
 <entry name="dialog boxes, modeless, removing from memory" url="ch08lev1sec3.html"/>
 <entry name="dialog boxes, simple example" url="ch08.html"/>
 <entry name="dialog boxes, standard dialog boxes, KFileDialog" url="ch05lev1sec3.html"/>
-<entry name="dialog boxes, standard dialog boxes, KFontDialog" url="ch05lev1sec3.html"/>
+<entry name="dialog boxes, standard dialog boxes, TDEFontDialog" url="ch05lev1sec3.html"/>
 <entry name="dialog boxes, standard dialog boxes, KMessageBox" url="ch05lev1sec3.html"/>
 <entry name="dialog boxes, standard dialog boxes, sample application" url="ch05lev1sec3.html"/>
 <entry name="dialog boxes, standard dialog boxes" url="ch05lev1sec3.html"/>
@@ -830,7 +830,7 @@
 <entry name="documentation, widgets" url="ch04.html"/>
 <entry name="document-centric programs" url="ch02lev1sec3.html"/>
 <entry name="document-centric user interface, actions, custom actions" url="ch05.html"/>
-<entry name="document-centric user interface, actions, KAction class" url="ch05.html"/>
+<entry name="document-centric user interface, actions, TDEAction class" url="ch05.html"/>
 <entry name="document-centric user interface, actions, standard actions" url="ch05.html"/>
 <entry name="document-centric user interface, actions" url="ch05.html"/>
 <entry name="document-centric user interface, content areas, Konqueror" url="ch05.html"/>
@@ -993,7 +993,7 @@
 <entry name="flushing graphics" url="ch03lev1sec2.html"/>
 <entry name="focusInEvent() event handler, widgets" url="ch04.html"/>
 <entry name="focusOutEvent() event handler, widgets" url="ch04.html"/>
-<entry name="font dialog boxes, KFontDialog" url="ch05lev1sec3.html"/>
+<entry name="font dialog boxes, TDEFontDialog" url="ch05lev1sec3.html"/>
 <entry name="font dialog boxes, KMessageBox" url="ch05lev1sec3.html"/>
 <entry name="formats, PNG, icons" url="ch06lev1sec3.html"/>
 <entry name="formatting tags (DocBook)" url="ch15lev1sec2.html"/>
@@ -1153,7 +1153,7 @@
 <entry name="GUIs, responsiveness" url="ch09.html"/>
 <entry name="GUIs, responsiveness, Window updates, double-buffering" url="ch09lev1sec2.html"/>
 <entry name="GUIs, standard dialog boxes, KFileDialog" url="ch05lev1sec3.html"/>
-<entry name="GUIs, standard dialog boxes, KFontDialog" url="ch05lev1sec3.html"/>
+<entry name="GUIs, standard dialog boxes, TDEFontDialog" url="ch05lev1sec3.html"/>
 <entry name="GUIs, standard dialog boxes, KMessageBox" url="ch05lev1sec3.html"/>
 <entry name="GUIs, standard dialog boxes, sample application" url="ch05lev1sec3.html"/>
 <entry name="GUIs, standard dialog boxes" url="ch05lev1sec3.html"/>
@@ -1273,8 +1273,8 @@
 <entry name="KabDemo application (address book dialog)" url="ch10lev1sec4.html"/>
 <entry name="kabdemo.cpp class definiiton (KabDemo)" url="ch10lev1sec4.html"/>
 <entry name="kabdemo.h class declaration (KabDemo)" url="ch10lev1sec4.html"/>
-<entry name="KAction class" url="ch05.html"/>
-<entry name="KAction class" url="ch06.html"/>
+<entry name="TDEAction class" url="ch05.html"/>
+<entry name="TDEAction class" url="ch06.html"/>
 <entry name="TDEApplication class" url="ch02lev1sec3.html"/>
 <entry name="KAudioPlayer class" url="ch14lev1sec6.html"/>
 <entry name="KButtonBox manager widget" url="ch08lev1sec4.html"/>
@@ -1430,7 +1430,7 @@
 <entry name="keywords, moc" url="ch03lev1sec4.html"/>
 <entry name="Keyword tag (DocBook)" url="ch15lev1sec2.html"/>
 <entry name="KFileDialog" url="ch05lev1sec3.html"/>
-<entry name="KFontDialog" url="ch05lev1sec3.html"/>
+<entry name="TDEFontDialog" url="ch05lev1sec3.html"/>
 <entry name="kfte editor" url="ch02.html"/>
 <entry name="kfte module (CVS)" url="ch17lev1sec2.html"/>
 <entry name="khello program, compiling" url="ch02lev1sec2.html"/>
@@ -2544,7 +2544,7 @@
 <entry name="standard actions, KStdActionsDemo widget, main() function" url="ch05.html"/>
 <entry name="standard actions, KStdActionsDemo widget" url="ch05.html"/>
 <entry name="standard dialog boxes, KFileDialog" url="ch05lev1sec3.html"/>
-<entry name="standard dialog boxes, KFontDialog" url="ch05lev1sec3.html"/>
+<entry name="standard dialog boxes, TDEFontDialog" url="ch05lev1sec3.html"/>
 <entry name="standard dialog boxes, KMessageBox" url="ch05lev1sec3.html"/>
 <entry name="standard dialog boxes, sample application" url="ch05lev1sec3.html"/>
 <entry name="standard dialog boxes" url="ch05lev1sec3.html"/>
@@ -2680,7 +2680,7 @@
 <entry name="UI compliance, help, ToolTips" url="ch05lev1sec2.html"/>
 <entry name="UI compliance, help" url="ch05lev1sec2.html"/>
 <entry name="UI compliance, standard dialog boxes, KFileDialog" url="ch05lev1sec3.html"/>
-<entry name="UI compliance, standard dialog boxes, KFontDialog" url="ch05lev1sec3.html"/>
+<entry name="UI compliance, standard dialog boxes, TDEFontDialog" url="ch05lev1sec3.html"/>
 <entry name="UI compliance, standard dialog boxes, KMessageBox" url="ch05lev1sec3.html"/>
 <entry name="UI compliance, standard dialog boxes, sample application" url="ch05lev1sec3.html"/>
 <entry name="UI compliance, standard dialog boxes" url="ch05lev1sec3.html"/>
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
index 3658c0ac..e529689d 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
@@ -46,7 +46,7 @@ Only the selected entry will be used</string>
                 <cstring>qtUrl</cstring>
             </property>
         </widget>
-        <widget class="KListBox" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>qtListBox</cstring>
             </property>
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
index 19fd0db1..82380038 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
@@ -105,7 +105,7 @@
 Only the selected entry will be used</string>
             </property>
         </widget>
-        <widget class="KListBox" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>qtListBox</cstring>
             </property>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
index 5e2604d3..acf72f22 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
@@ -81,7 +81,7 @@ Only the selected entry will be used</string>
                 <string>&amp;Add</string>
             </property>
         </widget>
-        <widget class="KListBox" row="1" column="0" rowspan="1" colspan="4">
+        <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>kdeListBox</cstring>
             </property>
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index baea54d7..349fc2ab 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -54,17 +54,17 @@
 #include <tqlayout.h>
 #include <tqlineedit.h>
 
-class ProblemItem: public KListViewItem
+class ProblemItem: public TDEListViewItem
 {
 public:
 	ProblemItem( TQListView* parent, const TQString& problem,
 	             const TQString& file, const TQString& line, const TQString& column )
-			: KListViewItem( parent, problem, file, line, column )
+			: TDEListViewItem( parent, problem, file, line, column )
 	{}
 
 	ProblemItem( TQListViewItem* parent, const TQString& problem,
 	             const TQString& file, const TQString& line, const TQString& column )
-			: KListViewItem( parent, problem, file, line, column )
+			: TDEListViewItem( parent, problem, file, line, column )
 	{}
 
 	int compare( TQListViewItem* item, int column, bool ascending ) const
@@ -77,7 +77,7 @@ public:
 				return 0;
 			return ( a > b ? 1 : -1 );
 		}
-		return KListViewItem::compare( item, column, ascending );
+		return TDEListViewItem::compare( item, column, ascending );
 	}
 
 };
@@ -99,12 +99,12 @@ m_markIface( 0 )
 	connect( m_initCurrentTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initCurrentList()) );
 	m_gridLayout = new TQGridLayout(this,2,3);
 
-	m_errorList = new KListView(this);
-	m_warningList = new KListView(this);
-	m_fixmeList = new KListView(this);
-	m_todoList = new KListView(this);
-	m_filteredList = new KListView(this);
-	m_currentList = new KListView(this);
+	m_errorList = new TDEListView(this);
+	m_warningList = new TDEListView(this);
+	m_fixmeList = new TDEListView(this);
+	m_todoList = new TDEListView(this);
+	m_filteredList = new TDEListView(this);
+	m_currentList = new TDEListView(this);
 
 	m_filteredList->addColumn( i18n("Level") );
 	m_currentList->addColumn( i18n("Level") );
@@ -197,14 +197,14 @@ void ProblemReporter::configWidget( KDialogBase* dlg )
 {
 }
 
-void ProblemReporter::filterList(KListView* listview, const TQString& level)
+void ProblemReporter::filterList(TDEListView* listview, const TQString& level)
 {
 	TQListViewItemIterator it( listview );
 	while ( it.current() )
 	{
 		if ( it.current()->text(3).contains(m_filterEdit->text(),false))
 		{
-			new KListViewItem(m_filteredList,level,
+			new TDEListViewItem(m_filteredList,level,
 			                  it.current()->text(0), it.current()->text(1),
 			                  it.current()->text(2), it.current()->text(3));
 		}
@@ -217,7 +217,7 @@ void ProblemReporter::slotTabSelected( int tabindex )
 	m_widgetStack->raiseWidget(tabindex);
 }
 
-void ProblemReporter::InitListView(KListView* listview)
+void ProblemReporter::InitListView(TDEListView* listview)
 {
 	listview->addColumn( i18n("File") );
 	listview->addColumn( i18n("Line") );
@@ -255,7 +255,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part )
 	initCurrentList();
 }
 
-void EfficientKListView::limitSize( int size )
+void EfficientTDEListView::limitSize( int size )
 {
 	if( m_map.size() <= size + 50 ) return;
 	
@@ -267,7 +267,7 @@ void EfficientKListView::limitSize( int size )
 		removeAllItems( (*it).str() );
 }
 
-void EfficientKListView::removeAllItems( const TQString& str )
+void EfficientTDEListView::removeAllItems( const TQString& str )
 {
 	HashedString h(str);
 	m_insertionNumbers.erase( h ) ;
@@ -326,9 +326,9 @@ void ProblemReporter::initCurrentList()
 // 	m_tabBar->setCurrentTab(0);
 }
 
-void ProblemReporter::updateCurrentWith(EfficientKListView& listview, const TQString& level, const TQString& filename)
+void ProblemReporter::updateCurrentWith(EfficientTDEListView& listview, const TQString& level, const TQString& filename)
 {
-    EfficientKListView::Range r = listview.getRange( filename );
+    EfficientTDEListView::Range r = listview.getRange( filename );
     for( ; r.first != r.second; ++r.first )
 	    new ProblemItem(m_currentList,level,(*r.first).second->text(1),(*r.first).second->text(2),(*r.first).second->text(3));
 }
@@ -364,7 +364,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p
 
 	TQString relFileName = m_cppSupport->project()->relativeProjectFile(fileName);
 
-	EfficientKListView* list;
+	EfficientTDEListView* list;
 
 	switch( p.level() )
 	{
diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h
index 79a1b77f..2a8bf10a 100644
--- a/languages/cpp/problemreporter.h
+++ b/languages/cpp/problemreporter.h
@@ -36,31 +36,31 @@ class KDialogBase;
 class Problem;
 class KURL;
 
-class EfficientKListView {
+class EfficientTDEListView {
 public:
     typedef __gnu_cxx::hash_multimap<HashedString, TQListViewItem*> Map;
     typedef std::pair< Map::const_iterator, Map::const_iterator > Range;
-    EfficientKListView( KListView* list = 0 ) : m_list( list ), m_insertionNumber( 0 ) {
+    EfficientTDEListView( TDEListView* list = 0 ) : m_list( list ), m_insertionNumber( 0 ) {
     }
     
-    EfficientKListView& operator = ( KListView* list ) {
+    EfficientTDEListView& operator = ( TDEListView* list ) {
         m_list = list;
         return *this;
     }
     
-    operator KListView* () {
+    operator TDEListView* () {
         return m_list;
     }
     
-    operator const KListView* () const {
+    operator const TDEListView* () const {
         return m_list;
     }
     
-    KListView* operator -> () {
+    TDEListView* operator -> () {
         return m_list;
     }
     
-    const KListView* operator -> () const {
+    const TDEListView* operator -> () const {
         return m_list;
     }
     
@@ -88,7 +88,7 @@ private:
     Map m_map;
     typedef __gnu_cxx::hash_map<HashedString, int> InsertionMap;
   InsertionMap m_insertionNumbers; //This is used to count which file was inserted first(higher insertion-number -> inserted later)
-    KListView* m_list;
+    TDEListView* m_list;
 };
 
 namespace KParts
@@ -128,21 +128,21 @@ private slots:
 private:
 	TQString levelToString( int level ) const;
 	int levelToMarkType( int level ) const;
-	void InitListView( KListView* listview );
-	void filterList( KListView* listview, const TQString& level );
-    void updateCurrentWith( EfficientKListView& listview, const TQString& level, const TQString& filename );
+	void InitListView( TDEListView* listview );
+	void filterList( TDEListView* listview, const TQString& level );
+    void updateCurrentWith( EfficientTDEListView& listview, const TQString& level, const TQString& filename );
 
 private:
 	TQGridLayout* m_gridLayout;
 	TQTabBar* m_tabBar;
 	TQWidgetStack* m_widgetStack;
-	KListView* m_currentList;
+	TDEListView* m_currentList;
     TQTimer* m_initCurrentTimer;
-	EfficientKListView m_errorList;
-	EfficientKListView m_fixmeList;
-	EfficientKListView m_todoList;
-    EfficientKListView m_warningList;
-	KListView* m_filteredList;
+	EfficientTDEListView m_errorList;
+	EfficientTDEListView m_fixmeList;
+	EfficientTDEListView m_todoList;
+    EfficientTDEListView m_warningList;
+	TDEListView* m_filteredList;
 	KLineEdit* m_filterEdit;
 
 	CppSupportPart* m_cppSupport;
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index a852d419..43502e5d 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -60,29 +60,29 @@ CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const T
     connect( partController(), TQT_SIGNAL(savedFile(const KURL&)),
              this, TQT_SLOT(savedFile(const KURL&)) );
 
-    KAction *action;
+    TDEAction *action;
 
-    action = new KAction( i18n("Execute Main Program"), "exec", 0,
+    action = new TDEAction( i18n("Execute Main Program"), "exec", 0,
                           this, TQT_SLOT(slotExecute()),
                           actionCollection(), "build_exec" );
     action->setToolTip( i18n("Runs the CSharp program") );
 
-    action = new KAction( i18n("Execute String..."), "exec", 0,
+    action = new TDEAction( i18n("Execute String..."), "exec", 0,
                           this, TQT_SLOT(slotExecuteString()),
                           actionCollection(), "build_execstring" );
     action->setToolTip( i18n("Executes a string as CSharp code") );
 
-    action = new KAction( i18n("Start CSharp Interpreter"), "exec", 0,
+    action = new TDEAction( i18n("Start CSharp Interpreter"), "exec", 0,
                           this, TQT_SLOT(slotStartInterpreter()),
                           actionCollection(), "build_runinterpreter" );
     action->setToolTip( i18n("Starts the CSharp interpreter without a program") );
 
-    action = new KAction( i18n("Find CSharp Function Documentation..."), 0,
+    action = new TDEAction( i18n("Find CSharp Function Documentation..."), 0,
                           this, TQT_SLOT(slotCSharpdocFunction()),
                           actionCollection(), "help_csharpdocfunction" );
     action->setToolTip( i18n("Show the documentation page of a CSharp function") );
 
-    action = new KAction( i18n("Find CSharp FAQ Entry..."), 0,
+    action = new TDEAction( i18n("Find CSharp FAQ Entry..."), 0,
                           this, TQT_SLOT(slotCSharpdocFAQ()),
                           actionCollection(), "help_csharpdocfaq" );
     action->setToolTip( i18n("Show the FAQ entry for a keyword") );
diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
index 4eeae482..71f9262e 100644
--- a/languages/fortran/fortransupportpart.cpp
+++ b/languages/fortran/fortransupportpart.cpp
@@ -62,9 +62,9 @@ FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const
     connect( partController(), TQT_SIGNAL(savedFile(const KURL&)),
              this, TQT_SLOT(savedFile(const KURL&)) );
 
-    KAction *action;
+    TDEAction *action;
 
-    action = new KAction( i18n("&Ftnchek"), 0,
+    action = new TDEAction( i18n("&Ftnchek"), 0,
                           this, TQT_SLOT(slotFtnchek()),
                           actionCollection(), "project_ftnchek" );
     action->setToolTip(i18n("Run ftnchek"));
diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java
index d6424f73..40bc6b93 100644
--- a/languages/java/app_templates/kappjava/app.java
+++ b/languages/java/app_templates/kappjava/app.java
@@ -14,7 +14,7 @@ import org.kde.koala.*;
  * @author $AUTHOR <$EMAIL>
  * @version $APP_VERSION
  */
-public class %{APPNAME} extends KMainWindow
+public class %{APPNAME} extends TDEMainWindow
 {
     private %{APPNAME}View m_view;
     private QPrinter   m_printer;
@@ -27,7 +27,7 @@ public class %{APPNAME} extends KMainWindow
     // accept dnd
     setAcceptDrops(true);
 
-    // tell the KMainWindow that this is indeed the main widget
+    // tell the TDEMainWindow that this is indeed the main widget
     setCentralWidget(m_view);
 
     // then, setup our actions
@@ -88,7 +88,7 @@ public void setupActions()
 
     // this doesn't do anything useful.  it's just here to illustrate
     // how to insert a custom menu and menu item
-    KAction custom = new KAction(tr("Cus&tom Menuitem"), new KShortcut(),
+    TDEAction custom = new TDEAction(tr("Cus&tom Menuitem"), new TDEShortcut(),
                                   this, SLOT("optionsPreferences()"),
                                   actionCollection(), "custom_action");
 }
diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui
index a4852fd5..a0e1ca39 100644
--- a/languages/java/configproblemreporter.ui
+++ b/languages/java/configproblemreporter.ui
@@ -103,7 +103,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListView" row="0" column="0" rowspan="5" colspan="1">
+                <widget class="TDEListView" row="0" column="0" rowspan="5" colspan="1">
                     <column>
                         <property name="text">
                             <string></string>
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 23ae1cc7..c868afa5 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -155,9 +155,9 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr
     connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)),
              this, TQT_SLOT(configWidget(KDialogBase*)) );
 
-    KAction *action;
+    TDEAction *action;
 
-    action = new KAction(i18n("New Class..."), "classnew", 0,
+    action = new TDEAction(i18n("New Class..."), "classnew", 0,
                          this, TQT_SLOT(slotNewClass()),
                          actionCollection(), "project_newclass");
     action->setToolTip( i18n("Generate a new class") );
diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h
index 54e1d57f..b71ca95c 100644
--- a/languages/java/javasupportpart.h
+++ b/languages/java/javasupportpart.h
@@ -33,7 +33,7 @@ class TQLabel;
 class TQProgressBar;
 class TQStringList;
 class TQListViewItem;
-class KListView;
+class TDEListView;
 class Driver;
 
 namespace KParts { class Part; }
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index a451abf3..4570efc7 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -51,16 +51,16 @@
 #include <tqgroupbox.h>
 
 
-class ProblemItem: public KListViewItem
+class ProblemItem: public TDEListViewItem
 {
 public:
     ProblemItem( TQListView* parent, const TQString& level, const TQString& problem,
 		 const TQString& file, const TQString& line, const TQString& column  )
-	: KListViewItem( parent, level, problem, file, line, column ) {}
+	: TDEListViewItem( parent, level, problem, file, line, column ) {}
 
     ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem,
 		 const TQString& file, const TQString& line, const TQString& column  )
-	: KListViewItem( parent, level, problem, file, line, column ) {}
+	: TDEListViewItem( parent, level, problem, file, line, column ) {}
 
     int compare( TQListViewItem* item, int column, bool ascending ) const {
 	if( column == 2 || column == 3 ){
@@ -70,13 +70,13 @@ public:
 		return 0;
 	    return( a > b ? 1 : -1 );
 	}
-	return KListViewItem::compare( item, column, ascending );
+	return TDEListViewItem::compare( item, column, ascending );
     }
 
 };
 
 ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const char* name )
-    : KListView( parent, name ? name : "problemreporter" ),
+    : TDEListView( parent, name ? name : "problemreporter" ),
       m_javaSupport( part ),
       m_document( 0 ),
       m_markIface( 0 )
diff --git a/languages/java/problemreporter.h b/languages/java/problemreporter.h
index 42c26d9f..dace638b 100644
--- a/languages/java/problemreporter.h
+++ b/languages/java/problemreporter.h
@@ -36,7 +36,7 @@ namespace KTextEditor{
     class Document;
 }
 
-class ProblemReporter: public KListView{
+class ProblemReporter: public TDEListView{
     Q_OBJECT
   
 public:
diff --git a/languages/kjssupport/kjsproblems.cpp b/languages/kjssupport/kjsproblems.cpp
index 31882e7c..1a13870e 100644
--- a/languages/kjssupport/kjsproblems.cpp
+++ b/languages/kjssupport/kjsproblems.cpp
@@ -20,17 +20,17 @@
 #include "kjssupport_part.h"
 #include <kiconloader.h>
 
-class KJSProblemItem: public KListViewItem
+class KJSProblemItem: public TDEListViewItem
 {
 	public:
 		KJSProblemItem( TQListView* parent, const TQString& level, const TQString& problem,
 		             const TQString& file, const TQString& line, const TQString& column  )
-				: KListViewItem( parent, level, problem, file, line, column )
+				: TDEListViewItem( parent, level, problem, file, line, column )
 		{}
 
 		KJSProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem,
 		             const TQString& file, const TQString& line, const TQString& column  )
-				: KListViewItem( parent, level, problem, file, line, column )
+				: TDEListViewItem( parent, level, problem, file, line, column )
 		{}
 
 		int compare( TQListViewItem* item, int column, bool ascending ) const
@@ -43,12 +43,12 @@ class KJSProblemItem: public KListViewItem
 					return 0;
 				return( a > b ? 1 : -1 );
 			}
-			return KListViewItem::compare( item, column, ascending );
+			return TDEListViewItem::compare( item, column, ascending );
 		}
 
 };
 
-KJSProblems::KJSProblems(kjsSupportPart *part, TQWidget *parent, const char *name) : KListView(parent,name), m_part(part)
+KJSProblems::KJSProblems(kjsSupportPart *part, TQWidget *parent, const char *name) : TDEListView(parent,name), m_part(part)
 {
 	addColumn ("File");
 	addColumn ("Line #");
diff --git a/languages/kjssupport/kjsproblems.h b/languages/kjssupport/kjsproblems.h
index 473624ae..beb1fd5d 100644
--- a/languages/kjssupport/kjsproblems.h
+++ b/languages/kjssupport/kjsproblems.h
@@ -25,7 +25,7 @@ class kjsSupportPart;
 /**
 @author ian reinhart geiser
 */
-class KJSProblems : public KListView
+class KJSProblems : public TDEListView
 {
 Q_OBJECT
   
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index c73d51bb..100f34e6 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -69,7 +69,7 @@ kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStrin
 	setXMLFile("kdevkjssupport.rc");
 
 
-	m_build = new KAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
+	m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
 	m_build->setStatusText( i18n("Test the active script.") );
 
 	kdDebug() << "Creating kjssupport Part" << endl;
diff --git a/languages/kjssupport/kjssupport_part.h b/languages/kjssupport/kjssupport_part.h
index 1a1eae10..4572b9a2 100644
--- a/languages/kjssupport/kjssupport_part.h
+++ b/languages/kjssupport/kjssupport_part.h
@@ -35,7 +35,7 @@ class KJSConsoleWidget;
 };
 
 class TQPopupMenu;
-class KAction;
+class TDEAction;
 class KJSProblems;
 class JSCodeCompletion;
 class Context;
@@ -73,7 +73,7 @@ class kjsSupportPart : public KDevLanguageSupport
 		void addAttribute(const TQString &name, FileDom file, uint lineNo);
 		void addMethod(const TQString &name, FileDom file, uint lineNo);
 		ClassDom addClass(const TQString &name, FileDom file, uint lineNo);
-		KAction *m_build;
+		TDEAction *m_build;
 		KJSEmbed::KJSEmbedPart *m_js;
 		KJSProblems *m_problemReporter;
 		TQDict<typeProperty> m_typeMap;
diff --git a/languages/kjssupport/template/app.js b/languages/kjssupport/template/app.js
index aa564dd6..f15d3bfa 100644
--- a/languages/kjssupport/template/app.js
+++ b/languages/kjssupport/template/app.js
@@ -1,8 +1,8 @@
 #!/usr/bin/env kjscmd
 
 // Create main view
-var mw = new KMainWindow();
-var lv = new KListView( mw );
+var mw = new TDEMainWindow();
+var lv = new TDEListView( mw );
 mw.setCentralWidget(lv);
 
 lv.addColumn('One');
diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp
index c051db92..b9e193a1 100644
--- a/languages/lib/designer_integration/implementationwidget.cpp
+++ b/languages/lib/designer_integration/implementationwidget.cpp
@@ -38,23 +38,23 @@
 #include <kdevlanguagesupport.h>
 
 namespace ImplUtils{
-class ClassItem: public KListViewItem{
+class ClassItem: public TDEListViewItem{
 public:
-    ClassItem(KListViewItem *parent, ClassDom dom)
-        :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
-    ClassItem(KListView *parent, ClassDom dom)
-        :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
+    ClassItem(TDEListViewItem *parent, ClassDom dom)
+        :TDEListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
+    ClassItem(TDEListView *parent, ClassDom dom)
+        :TDEListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
     ClassDom dom() const { return m_dom; }
 private:
     ClassDom m_dom;
 };
 
-class NamespaceItem: public KListViewItem{
+class NamespaceItem: public TDEListViewItem{
 public:
-    NamespaceItem(KListViewItem *parent, NamespaceDom dom)
-        :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
-    NamespaceItem(KListView *parent, NamespaceDom dom)
-        :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
+    NamespaceItem(TDEListViewItem *parent, NamespaceDom dom)
+        :TDEListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
+    NamespaceItem(TDEListView *parent, NamespaceDom dom)
+        :TDEListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
     NamespaceDom dom() const { return m_dom; }
 private:
     NamespaceDom m_dom;
@@ -79,12 +79,12 @@ void ImplementationWidget::init(const TQString &formName)
     m_baseClassName = DomUtil::elementByPathExt(doc, "class").text();
     setCaption(i18n("Create or Select Implementation Class for: %1").arg(m_baseClassName));
     
-    KListViewItem *item = new KListViewItem(classView, i18n("Namespaces &amp;&amp; Classes"));
+    TDEListViewItem *item = new TDEListViewItem(classView, i18n("Namespaces &amp;&amp; Classes"));
     item->setOpen(true);
     processNamespaces(m_part->codeModel()->globalNamespace(), item);
 }
 
-void ImplementationWidget::processNamespaces(NamespaceDom dom, KListViewItem *parent)
+void ImplementationWidget::processNamespaces(NamespaceDom dom, TDEListViewItem *parent)
 {
     const NamespaceList nslist = dom->namespaceList();
     for (NamespaceList::const_iterator it = nslist.begin(); it != nslist.end(); ++it)
@@ -94,7 +94,7 @@ void ImplementationWidget::processNamespaces(NamespaceDom dom, KListViewItem *pa
         processClasses(*it, new ImplUtils::ClassItem(parent, *it));    
 }
 
-void ImplementationWidget::processClasses(ClassDom dom, KListViewItem *parent)
+void ImplementationWidget::processClasses(ClassDom dom, TDEListViewItem *parent)
 {
     const ClassList cllist = dom->classList();
     for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it)
diff --git a/languages/lib/designer_integration/implementationwidget.h b/languages/lib/designer_integration/implementationwidget.h
index bae6cdff..dcdd820c 100644
--- a/languages/lib/designer_integration/implementationwidget.h
+++ b/languages/lib/designer_integration/implementationwidget.h
@@ -25,7 +25,7 @@
 
 #include <codemodel.h>
 
-class KListViewItem;
+class TDEListViewItem;
 class KDevLanguageSupport;
 
 /**
@@ -61,8 +61,8 @@ protected:
     the number of classes being displayed as possible implementation classes.*/
     void init(const TQString &formName);
     
-    void processNamespaces(NamespaceDom dom, KListViewItem *parent);
-    void processClasses(ClassDom dom, KListViewItem *parent);
+    void processNamespaces(NamespaceDom dom, TDEListViewItem *parent);
+    void processClasses(ClassDom dom, TDEListViewItem *parent);
     
     /**Creates a class and adds it to a project. No need to reimplement.*/
     bool createClass();
diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui
index 93969da3..8dc6c545 100644
--- a/languages/lib/designer_integration/implementationwidgetbase.ui
+++ b/languages/lib/designer_integration/implementationwidgetbase.ui
@@ -103,7 +103,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="KListView" row="4" column="0">
+                <widget class="TDEListView" row="4" column="0">
                     <column>
                         <property name="text">
                             <string>Class Name</string>
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index e634b52c..c3d92608 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -60,29 +60,29 @@ PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStr
     connect( partController(), TQT_SIGNAL(savedFile(const KURL&)),
              this, TQT_SLOT(savedFile(const KURL&)) );
 
-    KAction *action;
+    TDEAction *action;
 
-    action = new KAction( i18n("Execute Main Program"), "exec", 0,
+    action = new TDEAction( i18n("Execute Main Program"), "exec", 0,
                           this, TQT_SLOT(slotExecute()),
                           actionCollection(), "build_exec" );
     action->setToolTip( i18n("Runs the Perl program") );
 
-    action = new KAction( i18n("Execute String..."), "exec", 0,
+    action = new TDEAction( i18n("Execute String..."), "exec", 0,
                           this, TQT_SLOT(slotExecuteString()),
                           actionCollection(), "build_execstring" );
     action->setToolTip( i18n("Executes a string as Perl code") );
 
-    action = new KAction( i18n("Start Perl Interpreter"), "exec", 0,
+    action = new TDEAction( i18n("Start Perl Interpreter"), "exec", 0,
                           this, TQT_SLOT(slotStartInterpreter()),
                           actionCollection(), "build_runinterpreter" );
     action->setToolTip( i18n("Starts the Perl interpreter without a program") );
 
-    action = new KAction( i18n("Find Perl Function Documentation..."), 0,
+    action = new TDEAction( i18n("Find Perl Function Documentation..."), 0,
                           this, TQT_SLOT(slotPerldocFunction()),
                           actionCollection(), "help_perldocfunction" );
     action->setToolTip( i18n("Show the documentation page of a Perl function") );
 
-    action = new KAction( i18n("Find Perl FAQ Entry..."), 0,
+    action = new TDEAction( i18n("Find Perl FAQ Entry..."), 0,
                           this, TQT_SLOT(slotPerldocFAQ()),
                           actionCollection(), "help_perldocfaq" );
     action->setToolTip( i18n("Show the FAQ entry for a keyword") );
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index d3134a89..0703ff3c 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -53,16 +53,16 @@
 #include <tqlayout.h>
 #include <tqlineedit.h>
 
-class ProblemItem: public KListViewItem
+class ProblemItem: public TDEListViewItem
 {
 public:
     ProblemItem( TQListView* parent, const TQString& problem,
        const TQString& file, const TQString& line, const TQString& column  )
-   : KListViewItem( parent, problem, file, line, column ) {}
+   : TDEListViewItem( parent, problem, file, line, column ) {}
 
     ProblemItem( TQListViewItem* parent, const TQString& problem,
        const TQString& file, const TQString& line, const TQString& column  )
-   : KListViewItem( parent,  problem, file, line, column ) {}
+   : TDEListViewItem( parent,  problem, file, line, column ) {}
 
     int compare( TQListViewItem* item, int column, bool ascending ) const {
    if( column == 2 || column == 3 ){
@@ -72,7 +72,7 @@ public:
       return 0;
        return( a > b ? 1 : -1 );
    }
-   return KListViewItem::compare( item, column, ascending );
+   return TDEListViewItem::compare( item, column, ascending );
     }
 
 };
@@ -92,11 +92,11 @@ PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char*
 
     m_gridLayout = new TQGridLayout(this,2,3);
 
-    m_errorList = new KListView(this);
-    m_fixmeList = new KListView(this);
-    m_todoList = new KListView(this);
-    m_filteredList = new KListView(this);
-    m_currentList = new KListView(this);
+    m_errorList = new TDEListView(this);
+    m_fixmeList = new TDEListView(this);
+    m_todoList = new TDEListView(this);
+    m_filteredList = new TDEListView(this);
+    m_currentList = new TDEListView(this);
 
     m_filteredList->addColumn( i18n("Level") );
     m_currentList->addColumn( i18n("Level") );
@@ -162,12 +162,12 @@ void PHPErrorView::slotFilter()
 
 }
 
-void PHPErrorView::filterList(KListView* listview, const TQString& level)
+void PHPErrorView::filterList(TDEListView* listview, const TQString& level)
 {
     TQListViewItemIterator it( listview );
     while ( it.current() ) {
         if ( it.current()->text(3).contains(m_filterEdit->text(),false))
-       new KListViewItem(m_filteredList,level,
+       new TDEListViewItem(m_filteredList,level,
        it.current()->text(0),it.current()->text(1),it.current()->text(2),it.current()->text(3));
         ++it;
     }
@@ -178,7 +178,7 @@ void PHPErrorView::slotTabSelected( int tabindex )
     m_widgetStack->raiseWidget(tabindex);
 }
 
-void PHPErrorView::InitListView(KListView* listview)
+void PHPErrorView::InitListView(TDEListView* listview)
 {
     listview->addColumn( i18n("File") );
     listview->addColumn( i18n("Line") );
@@ -313,7 +313,7 @@ void PHPErrorView::reportProblem( int level, const TQString& fileName, int line,
    TQString relFileName = fileName;
    relFileName.remove(m_phpSupport->project()->projectDirectory());
 
-   KListView* list;
+   TDEListView* list;
    switch( level )
    {
       case Error:
diff --git a/languages/php/phperrorview.h b/languages/php/phperrorview.h
index 20eeb859..a14c0c8e 100644
--- a/languages/php/phperrorview.h
+++ b/languages/php/phperrorview.h
@@ -75,9 +75,9 @@ private slots:
 private:
    TQString levelToString( int level ) const;
    int levelToMarkType( int level ) const;
-   void InitListView(KListView* listview);
+   void InitListView(TDEListView* listview);
    void removeAllItems( TQListView* listview, const TQString& filename );
-   void filterList(KListView* listview, const TQString& level);
+   void filterList(TDEListView* listview, const TQString& level);
    void updateCurrentWith(TQListView* listview, const TQString& level, const TQString& filename);
    void initCurrentList();
 
@@ -85,12 +85,12 @@ private:
    TQGridLayout* m_gridLayout;
    TQTabBar* m_tabBar;
    TQWidgetStack* m_widgetStack;
-   KListView* m_currentList;
-   KListView* m_errorList;
-   KListView* m_fixmeList;
-   KListView* m_warningList;
-   KListView* m_todoList;
-   KListView* m_filteredList;
+   TDEListView* m_currentList;
+   TDEListView* m_errorList;
+   TDEListView* m_fixmeList;
+   TDEListView* m_warningList;
+   TDEListView* m_todoList;
+   TDEListView* m_filteredList;
    KLineEdit* m_filterEdit;
 
    PHPSupportPart* m_phpSupport;
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index 5d42b59e..e7a597de 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -86,15 +86,15 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin
    connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)),
             this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
 
-   KAction *action;
+   TDEAction *action;
 
-   action = new KAction( i18n("&Run"), "exec",Key_F9,
+   action = new TDEAction( i18n("&Run"), "exec",Key_F9,
    this, TQT_SLOT(slotRun()),
    actionCollection(), "build_execute" );
    action->setToolTip(i18n("Run"));
    action->setWhatsThis(i18n("<b>Run</b><p>Executes script on a terminal or a webserver."));
 
-   action = new KAction( i18n("&New Class..."),0,
+   action = new TDEAction( i18n("&New Class..."),0,
    this, TQT_SLOT(slotNewClass()),
    actionCollection(), "project_new_class" );
    action->setToolTip(i18n("New class"));
@@ -125,7 +125,7 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin
 
    m_codeCompletion = new  PHPCodeCompletion(this, configData);
 
-   new KAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQT_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text");
+   new TDEAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQT_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text");
 
    connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
             this, TQT_SLOT(slotActivePartChanged(KParts::Part *)));
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index e82cfefc..d921108a 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -58,27 +58,27 @@ PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const T
   connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
         this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
-    KAction *action;
+    TDEAction *action;
 
-    action = new KAction( i18n("Execute Program"), "exec", 0,
+    action = new TDEAction( i18n("Execute Program"), "exec", 0,
                           this, TQT_SLOT(slotExecute()),
                           actionCollection(), "build_exec" );
     action->setToolTip( i18n("Execute program") );
     action->setWhatsThis(i18n("<b>Execute program</b><p>Runs the Python program."));
 
-    action = new KAction( i18n("Execute String..."), "exec", 0,
+    action = new TDEAction( i18n("Execute String..."), "exec", 0,
                           this, TQT_SLOT(slotExecuteString()),
                           actionCollection(), "build_execstring" );
     action->setToolTip( i18n("Execute string") );
     action->setWhatsThis(i18n("<b>Execute String</b><p>Executes a string as Python code."));
 
-    action = new KAction( i18n("Start Python Interpreter"), "exec", 0,
+    action = new TDEAction( i18n("Start Python Interpreter"), "exec", 0,
                           this, TQT_SLOT(slotStartInterpreter()),
                           actionCollection(), "build_runinterpreter" );
     action->setToolTip( i18n("Start Python interpreter") );
     action->setWhatsThis(i18n("<b>Start python interpreter</b><p>Starts the Python interpreter without a program"));
 
-    action = new KAction( i18n("Python Documentation..."), 0,
+    action = new TDEAction( i18n("Python Documentation..."), 0,
                           this, TQT_SLOT(slotPydoc()),
                           actionCollection(), "help_pydoc" );
     action->setToolTip( i18n("Python documentation") );
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index c985fabb..7bfb4ad9 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -46,7 +46,7 @@
 
 // Implements a floating toolbar for the debugger.
 
-// Unfortunately, I couldn't get the KToolBar to work nicely when it
+// Unfortunately, I couldn't get the TDEToolBar to work nicely when it
 // was floating, so I was forced to write these classes. I'm not sure whether
 // I didn't try hard enough or ... and I've forgotten what the problems were
 // now.
@@ -54,7 +54,7 @@
 // The problem with using this is that it will not dock as a normal toolbar.
 // I'm not convince that this is a real problem though.
 
-// So, if you can get it to work as a KToolBar, and it works well when the
+// So, if you can get it to work as a TDEToolBar, and it works well when the
 // app is running, then all these classes can be removed.
 
 // This code is very specific to the internal debugger in tdevelop.
@@ -70,7 +70,7 @@ namespace RDBDebugger
 // I would have preferred to use normal decoration on the toolbar and removed
 // the iconify, close, etc buttons from the window title but again I kept running
 // into problems. Instead, I used no decoration and this class. Also this looks
-// similar to the KToolBar floating style.
+// similar to the TDEToolBar floating style.
 class DbgMoveHandle : public TQFrame
 {
 public:
@@ -114,7 +114,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
         return;
 
     if (e->button() == Qt::RightButton) {
-        KPopupMenu *menu = new KPopupMenu(this);
+        TDEPopupMenu *menu = new TDEPopupMenu(this);
 	menu->insertTitle(i18n("Debug Toolbar"));
         menu->insertItem(i18n("Dock to Panel"),
                          parent(), TQT_SLOT(slotDock()));
@@ -240,7 +240,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e)
         }
     case Qt::RightButton:
         {
-            KPopupMenu* menu = new KPopupMenu(this);
+            TDEPopupMenu* menu = new TDEPopupMenu(this);
 	    menu->insertTitle(i18n("Debug Toolbar"));
             menu->insertItem(i18n("Activate"),                        toolBar_, TQT_SLOT(slotUndock()));
             menu->insertItem(i18n("Activate (TDevelop gets focus)"),  toolBar_, TQT_SLOT(slotActivateAndUndock()));
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 3daefeff..70611d28 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -156,10 +156,10 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ
              this,             TQT_SLOT(slotGotoSource(const TQString&, int)) );
 
     // Now setup the actions
-    KAction *action;
+    TDEAction *action;
 
-//    action = new KAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9,
-    action = new KAction(i18n("&Start"), "dbgrun", CTRL+SHIFT+Key_F9,
+//    action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9,
+    action = new TDEAction(i18n("&Start"), "dbgrun", CTRL+SHIFT+Key_F9,
                          this, TQT_SLOT(slotRun()),
                          actionCollection(), "debug_run");
     action->setToolTip( i18n("Start in debugger") );
@@ -170,26 +170,26 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ
                                "while it is running, in order to get information "
                                "about variables, frame stack, and so on.") );
 
-    action = new KAction(i18n("Sto&p"), "stop", 0,
+    action = new TDEAction(i18n("Sto&p"), "stop", 0,
                          this, TQT_SLOT(slotStop()),
                          actionCollection(), "debug_stop");
     action->setToolTip( i18n("Stop debugger") );
     action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger."));
 
-    action = new KAction(i18n("Interrupt"), "player_pause", 0,
+    action = new TDEAction(i18n("Interrupt"), "player_pause", 0,
                          this, TQT_SLOT(slotPause()),
                          actionCollection(), "debug_pause");
     action->setToolTip( i18n("Interrupt application") );
     action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current RDB command."));
 
-    action = new KAction(i18n("Run to &Cursor"), "dbgrunto", 0,
+    action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0,
                          this, TQT_SLOT(slotRunToCursor()),
                          actionCollection(), "debug_runtocursor");
     action->setToolTip( i18n("Run to cursor") );
     action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached."));
 
 
-    action = new KAction(i18n("Step &Over"), "dbgnext", 0,
+    action = new TDEAction(i18n("Step &Over"), "dbgnext", 0,
                          this, TQT_SLOT(slotStepOver()),
                          actionCollection(), "debug_stepover");
     action->setToolTip( i18n("Step over the next line") );
@@ -200,7 +200,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ
                                "following the method call.") );
 
 
-    action = new KAction(i18n("Step &Into"), "dbgstep", 0,
+    action = new TDEAction(i18n("Step &Into"), "dbgstep", 0,
                          this, TQT_SLOT(slotStepInto()),
                          actionCollection(), "debug_stepinto");
     action->setToolTip( i18n("Step into the next statement") );
@@ -211,7 +211,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ
 
 
 
-    action = new KAction(i18n("Step O&ut"), "dbgstepout", 0,
+    action = new TDEAction(i18n("Step O&ut"), "dbgstepout", 0,
                          this, TQT_SLOT(slotStepOut()),
                          actionCollection(), "debug_stepout");
     action->setToolTip( i18n("Steps out of the current method") );
@@ -223,7 +223,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ
                                "the topleveltoggleWatchpoint) then this operation has no effect.") );
 
 
-    action = new KAction(i18n("Toggle Breakpoint"), 0, 0,
+    action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0,
                          this, TQT_SLOT(toggleBreakpoint()),
                          actionCollection(), "debug_toggle_breakpoint");
     action->setToolTip(i18n("Toggle breakpoint"));
@@ -488,7 +488,7 @@ bool RubyDebuggerPart::startDebugger()
 
     stateChanged( TQString("active") );
 
-    KActionCollection *ac = actionCollection();
+    TDEActionCollection *ac = actionCollection();
     ac->action("debug_run")->setText( i18n("&Continue") );
 //    ac->action("debug_run")->setIcon( "dbgrun" );
     ac->action("debug_run")->setToolTip( i18n("Continues the application execution") );
@@ -566,7 +566,7 @@ void RubyDebuggerPart::slotStopDebugger()
     mainWindow()->setViewAvailable(framestackWidget, false);
     mainWindow()->setViewAvailable(rdbOutputWidget, false);
 
-    KActionCollection *ac = actionCollection();
+    TDEActionCollection *ac = actionCollection();
     ac->action("debug_run")->setText( i18n("&Start") );
 //    ac->action("debug_run")->setIcon( "1rightarrow" );
     ac->action("debug_run")->setToolTip( i18n("Runs the program in the debugger") );
@@ -599,7 +599,7 @@ void RubyDebuggerPart::slotRun()
         appFrontend()->clearView();
         startDebugger();
     } else {
-        KActionCollection *ac = actionCollection();
+        TDEActionCollection *ac = actionCollection();
         ac->action("debug_run")->setText( i18n("&Continue") );
         ac->action("debug_run")->setToolTip( i18n("Continues the application execution") );
         ac->action("debug_run")->setWhatsThis( i18n("Continue application execution\n\n"
@@ -701,7 +701,7 @@ void RubyDebuggerPart::slotStatus(const TQString &msg, int state)
     {
         stateIndicator = "E";
         stateChanged( TQString("stopped") );
-        KActionCollection *ac = actionCollection();
+        TDEActionCollection *ac = actionCollection();
         ac->action("debug_run")->setText( i18n("Restart") );
 //        ac->action("debug_run")->setIcon( "1rightarrow" );
         ac->action("debug_run")->setToolTip( i18n("Restart the program in the debugger") );
@@ -744,7 +744,7 @@ void RubyDebuggerPart::slotGotoSource(const TQString &fileName, int lineNum)
 
 void RubyDebuggerPart::slotActivePartChanged( KParts::Part* part )
 {
-    KAction* action = actionCollection()->action("debug_toggle_breakpoint");
+    TDEAction* action = actionCollection()->action("debug_toggle_breakpoint");
     if(!action)
         return;
 
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index de60eaea..8179eeab 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -128,7 +128,7 @@ void VariableWidget::savePartialProjectSession(TQDomElement* el)
 // **************************************************************************
 
 VariableTree::VariableTree(VariableWidget *parent, const char *name)
-    : KListView(parent, name),
+    : TDEListView(parent, name),
       TQToolTip( viewport() ),
       activationId_(0),
       currentThread_(-1),
@@ -145,8 +145,8 @@ VariableTree::VariableTree(VariableWidget *parent, const char *name)
     addColumn(i18n("Variable"), 100 );
     addColumn(i18n("Value"), 100 );
 
-    connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
-             TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*)) );
+    connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+             TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) );
     
 	connect( this, TQT_SIGNAL(pressed(TQListViewItem*)),
              this, TQT_SLOT(slotPressed(TQListViewItem*)) );
@@ -180,7 +180,7 @@ void VariableTree::clear()
 
 // **************************************************************************
 
-void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
+void VariableTree::slotContextMenu(TDEListView *, TQListViewItem *item)
 {
     if (item == 0)
         return;
@@ -188,7 +188,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
     setSelected(item, true);    // Need to select this item.
 
     if (item->parent() != 0) {
-        KPopupMenu popup(this);
+        TDEPopupMenu popup(this);
         popup.insertTitle(item->text(VAR_NAME_COLUMN));
         int idRemoveWatch = -2;
         if (item->rtti() == RTTI_WATCH_VAR_ITEM) {
@@ -441,7 +441,7 @@ void VariableTree::maybeTip(const TQPoint &p)
 // **************************************************************************
 
 LazyFetchItem::LazyFetchItem(VariableTree *parent)
-    : KListViewItem(parent),
+    : TDEListViewItem(parent),
       activationId_(0),
 	  waitingForData_(false)
 {
@@ -451,7 +451,7 @@ LazyFetchItem::LazyFetchItem(VariableTree *parent)
 // **************************************************************************
 
 LazyFetchItem::LazyFetchItem(LazyFetchItem *parent)
-    : KListViewItem(parent),
+    : TDEListViewItem(parent),
       activationId_(0),
       waitingForData_(false)
 {
diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h
index fa56aa6c..bac6d669 100644
--- a/languages/ruby/debugger/variablewidget.h
+++ b/languages/ruby/debugger/variablewidget.h
@@ -92,7 +92,7 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-class VariableTree : public KListView, public TQToolTip
+class VariableTree : public TDEListView, public TQToolTip
 {
     Q_OBJECT
   
@@ -150,7 +150,7 @@ public slots:
     void slotPressed(TQListViewItem * item);	
 
 private slots:
-    void slotContextMenu(KListView *, TQListViewItem *item);
+    void slotContextMenu(TDEListView *, TQListViewItem *item);
 
 private:
     int activationId_;
@@ -169,7 +169,7 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-class LazyFetchItem : public KListViewItem
+class LazyFetchItem : public TDEListViewItem
 {
 public:
     LazyFetchItem(VariableTree *parent);
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 7111ffca..0a963043 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -47,28 +47,28 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr
   setInstance(RubySupportFactory::instance());
   setXMLFile("kdevrubysupport.rc");
 
-  KAction *action;
-  action = new KAction( i18n("&Run"), "exec", SHIFT + Key_F9,
+  TDEAction *action;
+  action = new TDEAction( i18n("&Run"), "exec", SHIFT + Key_F9,
                         this, TQT_SLOT(slotRun()),
                         actionCollection(), "build_execute" );
   action->setToolTip(i18n("Run"));
   action->setWhatsThis(i18n("<b>Run</b><p>Starts an application."));
   action->setIcon("ruby_run.png");
 
-  action = new KAction( i18n("Run Test Under Cursor"), "exec", ALT + Key_F9,
+  action = new TDEAction( i18n("Run Test Under Cursor"), "exec", ALT + Key_F9,
                         this, TQT_SLOT(slotRunTestUnderCursor()),
                         actionCollection(), "build_execute_test_function" );
   action->setToolTip(i18n("Run Test Under Cursor"));
   action->setWhatsThis(i18n("<b>Run Test Under Cursor</b><p>Runs the function under the cursor as test."));
 
-  action = new KAction( i18n("Launch Browser"), "network", 0, this, TQT_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" );
+  action = new TDEAction( i18n("Launch Browser"), "network", 0, this, TQT_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" );
   action->setToolTip(i18n("Launch Browser"));
   action->setWhatsThis(i18n("<b>Launch Browser</b><p>Opens a web browser pointing to the Ruby Rails server") );
 
-  action = new KAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQT_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" );
-  action = new KAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQT_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" );
-  action = new KAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQT_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" );
-  action = new KAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQT_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" );
+  action = new TDEAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQT_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" );
+  action = new TDEAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQT_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" );
+  action = new TDEAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQT_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" );
+  action = new TDEAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQT_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" );
 
   kdDebug() << "Creating RubySupportPart" << endl;
 
diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp
index 633a687d..02112d78 100644
--- a/languages/sql/sqlactions.cpp
+++ b/languages/sql/sqlactions.cpp
@@ -26,9 +26,9 @@
 #include "sqlsupport_part.h"
 
 SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, 
-				 const KShortcut& cut,
+				 const TDEShortcut& cut,
                                  const TQObject *receiver, const char *slot,
-                                 KActionCollection *parent, const char *name)
+                                 TDEActionCollection *parent, const char *name)
     : KWidgetAction( m_combo = new KComboBox(), text, cut, 0, 0, parent, name), m_part(part)
 {
     m_combo->setEditable( false );
diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h
index 28b7ea63..20923a15 100644
--- a/languages/sql/sqlactions.h
+++ b/languages/sql/sqlactions.h
@@ -24,9 +24,9 @@ class SqlListAction : public KWidgetAction
     Q_OBJECT
   
 public:
-    SqlListAction( SQLSupportPart *part, const TQString &text, const KShortcut& cut,
+    SqlListAction( SQLSupportPart *part, const TQString &text, const TDEShortcut& cut,
                      const TQObject *receiver, const char *slot,
-                     KActionCollection *parent, const char *name );
+                     TDEActionCollection *parent, const char *name );
     void setCurrentConnectionName(const TQString &name);
     TQString currentConnectionName() const;
     void refresh();
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index 580d99c5..d5b6f91c 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -39,8 +39,8 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri
     setInstance( SQLSupportFactory::instance() );
     setXMLFile( "kdevsqlsupport.rc" );
 
-    KAction *action;
-    action = new KAction( i18n( "&Run" ), "exec", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" );
+    TDEAction *action;
+    action = new TDEAction( i18n( "&Run" ), "exec", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" );
     action->setToolTip(i18n("Run"));
     action->setWhatsThis(i18n("<b>Run</b><p>Executes a SQL script."));