Rename many classes and header files to avoid conflicts with KDE4

74 files changed, 99 insertions, 99 deletions

diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index be27d0c2..29cd5c80 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -17,7 +17,7 @@
 #include <kdevgenericfactory.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kdialogbase.h>
 
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index f4c4cba2..9daebf13 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -13,7 +13,7 @@
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kstatusbar.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
@@ -21,8 +21,8 @@
 #include <kurldrag.h>
 #include <kurlrequesterdlg.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 %{APPNAME}::%{APPNAME}()
diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h
index 007a5db0..9f281120 100644
--- a/languages/cpp/app_templates/kapp/app.h
+++ b/languages/cpp/app_templates/kapp/app.h
@@ -8,7 +8,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
 
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
index b9d5a9b4..a1cb79d7 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
@@ -2,7 +2,7 @@
 
 #include "plugin_%{APPNAMELC}.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 269a6b9e..888e76ab 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -2,7 +2,7 @@
 
 #include "plugin_%{APPNAMELC}.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp
index 0cbd25ed..5cfd1342 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4.cpp
@@ -10,8 +10,8 @@
 #include <tdeconfigdialog.h>
 #include <kstatusbar.h>
 
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <kstandardaction.h>
 
 #include <KDE/TDELocale>
diff --git a/languages/cpp/app_templates/kdedcop/app.cpp b/languages/cpp/app_templates/kdedcop/app.cpp
index 0548f6bd..d6508e90 100644
--- a/languages/cpp/app_templates/kdedcop/app.cpp
+++ b/languages/cpp/app_templates/kdedcop/app.cpp
@@ -4,7 +4,7 @@
 
 #include <tqlabel.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
 
 %{APPNAME}::%{APPNAME}()
diff --git a/languages/cpp/app_templates/kdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h
index 5e533c50..814fccad 100644
--- a/languages/cpp/app_templates/kdedcop/app.h
+++ b/languages/cpp/app_templates/kdedcop/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "mainclass.h"
 
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index ce011498..b0a33d94 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -10,7 +10,7 @@
 #include <kdevpartcontroller.h>
 #include <kdevplugininfo.h>
 #include <kdevproject.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kapplication.h>
 
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
index 62ab3d94..e9843bd8 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
@@ -6,7 +6,7 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
index 62ab3d94..e9843bd8 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
@@ -6,7 +6,7 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
diff --git a/languages/cpp/app_templates/khello/app.cpp b/languages/cpp/app_templates/khello/app.cpp
index 72b9e2dc..01373881 100644
--- a/languages/cpp/app_templates/khello/app.cpp
+++ b/languages/cpp/app_templates/khello/app.cpp
@@ -4,7 +4,7 @@
 
 #include <tqlabel.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
 
 %{APPNAME}::%{APPNAME}()
diff --git a/languages/cpp/app_templates/khello/app.h b/languages/cpp/app_templates/khello/app.h
index a3e4bd31..11a9241f 100644
--- a/languages/cpp/app_templates/khello/app.h
+++ b/languages/cpp/app_templates/khello/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 /**
  * @short Application Main Window
diff --git a/languages/cpp/app_templates/khello2/app.cpp b/languages/cpp/app_templates/khello2/app.cpp
index e506490b..a952bfb6 100644
--- a/languages/cpp/app_templates/khello2/app.cpp
+++ b/languages/cpp/app_templates/khello2/app.cpp
@@ -1,6 +1,6 @@
 %{CPP_TEMPLATE}
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
 
 #include "%{APPNAMELC}.h"
diff --git a/languages/cpp/app_templates/khello2/app.h b/languages/cpp/app_templates/khello2/app.h
index a3e4bd31..11a9241f 100644
--- a/languages/cpp/app_templates/khello2/app.h
+++ b/languages/cpp/app_templates/khello2/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 /**
  * @short Application Main Window
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
index 26b70e3d..50633e04 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
@@ -8,7 +8,7 @@
 
 #include <tqpainter.h>
 #include <tqiconset.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp
index 7e7dc64d..7c5154a6 100644
--- a/languages/cpp/app_templates/kpartapp/app.cpp
+++ b/languages/cpp/app_templates/kpartapp/app.cpp
@@ -8,7 +8,7 @@
 
 #include <kedittoolbar.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <klibloader.h>
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 0187646e..9fb19b18 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -2,7 +2,7 @@
 #include "%{APPNAMELC}_part.h"
 
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index 3941fa56..25e8861a 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -2,7 +2,7 @@
 #include "plugin_%{APPNAMELC}.h"
 
 #include <tdehtml_part.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index 6b37401d..dfd6024d 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -21,8 +21,8 @@
 
 #include <kedittoolbar.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 %{APPNAME}::%{APPNAME}()
diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h
index fd0e7fa1..f66896e9 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.h
+++ b/languages/cpp/app_templates/kscons_kxt/app.h
@@ -9,7 +9,7 @@
 
 #include <dcopobject.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
index 87c66b54..73e1492d 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
@@ -4,7 +4,7 @@
 
 #include <tdeparts/genericfactory.h>
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index bc36931c..4dcd8df5 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -22,7 +22,7 @@
 #include <klibloader.h>
 #include <kaboutdata.h>
 #include <tdefiledialog.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -34,8 +34,8 @@
 #include <ktabwidget.h>
 #include <kedittoolbar.h>
 #include <tdeversion.h>
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include "settings.h"
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index 183841ad..85df8854 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -20,8 +20,8 @@
 
 #include <kedittoolbar.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 %{APPNAMELC}::%{APPNAMELC}()
diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h
index b56f3ae9..049e8ecb 100644
--- a/languages/cpp/app_templates/kxt/app.h
+++ b/languages/cpp/app_templates/kxt/app.h
@@ -8,7 +8,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
 
diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
index 849f332a..7bb93d70 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
@@ -16,7 +16,7 @@
 #include <tqobjectlist.h>
 #include <tqobjectdict.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/languages/cpp/app_templates/qtopia4app/app.pro b/languages/cpp/app_templates/qtopia4app/app.pro
index 05a0bb9c..e1367f82 100644
--- a/languages/cpp/app_templates/qtopia4app/app.pro
+++ b/languages/cpp/app_templates/qtopia4app/app.pro
@@ -2,7 +2,7 @@ qtopia_project(qtopia app) # see buildsystem.html for more project keywords
 TARGET=%{APPNAMELC}
 CONFIG+=qtopia_main
 CONFIG+=no_singleexec
-CONFIG+=no_quicklaunch
+CONFIG+=no_quictdelaunch
 CONFIG+=no_tr
 
 FORMS=%{APPNAMELC}base.ui
diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp
index 41e30220..d9313146 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/app.cpp
@@ -6,7 +6,7 @@
 
 #include <tqdragobject.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfigdialog.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/languages/cpp/app_templates/tdeconfig35/app.h b/languages/cpp/app_templates/tdeconfig35/app.h
index 67073ea3..cdcce5a5 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.h
+++ b/languages/cpp/app_templates/tdeconfig35/app.h
@@ -8,7 +8,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
 
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index f2041e35..31e06204 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -34,9 +34,9 @@
 #include <tdefileitem.h>
 #include <kurlrequester.h>
 #include <keditlistbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <knuminput.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineedit.h>
 #include <tdeversion.h>
 // tdevelop includes
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index c6ee9db7..df89a03c 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -42,12 +42,12 @@ email                : david.nolden.tdevelop@art-master.de
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <tdeparts/part.h>
 #include <kstatusbar.h>
 #include <tdetexteditor/document.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqdatastream.h>
 #include <tqfile.h>
diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp
index 478b3d31..f0986c2b 100644
--- a/languages/cpp/cppimplementationwidget.cpp
+++ b/languages/cpp/cppimplementationwidget.cpp
@@ -28,7 +28,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 
 #include <kdevlanguagesupport.h>
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index ca2f082e..57e5c757 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -42,7 +42,7 @@
 #include "qtbuildconfig.h"
 #include "kdeveditorutil.h"
 #include <tdetexteditor/viewcursorinterface.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 // wizards
 #include "cppnewclassdlg.h"
 #include "subclassingdlg.h"
@@ -71,14 +71,14 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index 21b3c55a..08fbf15e 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -25,9 +25,9 @@
 #include <ktrader.h>
 #include <kdebug.h>
 #include <klibloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kapplication.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui
index bb99e12a..ac65b5f9 100644
--- a/languages/cpp/createpcsdialogbase.ui
+++ b/languages/cpp/createpcsdialogbase.ui
@@ -165,7 +165,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index 22104794..fd85999f 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -22,8 +22,8 @@
 #include <kprocess.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 #include <kmessagebox.h>
 
 #include <tqframe.h>
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index 16fe3b53..cee864c1 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -20,7 +20,7 @@
 #include <kdockwindow.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <twin.h>
 #include <twinmodule.h>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 29280d4e..a185ade9 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -20,13 +20,13 @@
 #include <tqpopupmenu.h>
 #include <tqtooltip.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index fcca7a36..ab54deb0 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index ef2dd56f..4a8b30d3 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 19dd877a..5dab0174 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -19,7 +19,7 @@
 #include "gdbbreakpointwidget.h"
 
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klineedit.h>
 #include <tdeversion.h>
 #include <kiconloader.h>
diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h
index d08d5729..ac0b9576 100644
--- a/languages/cpp/debugger/variablewidget.h
+++ b/languages/cpp/debugger/variablewidget.h
@@ -19,7 +19,7 @@
 #include "gdbcontroller.h"
 #include "mi/gdbmi.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
 #include <tqwidget.h>
 #include <tqtooltip.h>
diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc
index 2295f820..79a119df 100644
--- a/languages/cpp/doc/gnome1.toc
+++ b/languages/cpp/doc/gnome1.toc
@@ -133,7 +133,7 @@
     <tocsect3 name="Private Information" url="gtk/gtk-private-information.html"/>
   </tocsect2>
   <tocsect2 name="GTK+ Widgets and Objects" url="gtk/gtkobjects.html">
-    <tocsect3 name="GtkAccelLabel" url="gtk/gtkaccellabel.html"/>
+    <tocsect3 name="GtkAccelLabel" url="gtk/gttdeaccellabel.html"/>
     <tocsect3 name="GtkAdjustment" url="gtk/gtkadjustment.html"/>
     <tocsect3 name="GtkAlignment" url="gtk/gtkalignment.html"/>
     <tocsect3 name="GtkArrow" url="gtk/gtkarrow.html"/>
@@ -160,8 +160,8 @@
     <tocsect3 name="GtkEventBox" url="gtk/gtkeventbox.html"/>
     <tocsect3 name="GtkFileSelection" url="gtk/gttdefileselection.html"/>
     <tocsect3 name="GtkFixed" url="gtk/gtkfixed.html"/>
-    <tocsect3 name="GtkFontSelection" url="gtk/gtkfontselection.html"/>
-    <tocsect3 name="GtkFontSelectionDialog" url="gtk/gtkfontselectiondialog.html"/>
+    <tocsect3 name="GtkFontSelection" url="gtk/gttdefontselection.html"/>
+    <tocsect3 name="GtkFontSelectionDialog" url="gtk/gttdefontselectiondialog.html"/>
     <tocsect3 name="GtkFrame" url="gtk/gtkframe.html"/>
     <tocsect3 name="GtkGammaCurve" url="gtk/gtkgammacurve.html"/>
     <tocsect3 name="GtkHandleBox" url="gtk/gtkhandlebox.html"/>
@@ -179,8 +179,8 @@
     <tocsect3 name="GtkItemFactory" url="gtk/gtkitemfactory.html"/>
     <tocsect3 name="GtkLabel" url="gtk/gtklabel.html"/>
     <tocsect3 name="GtkLayout" url="gtk/gtklayout.html"/>
-    <tocsect3 name="GtkList" url="gtk/gtklist.html"/>
-    <tocsect3 name="GtkListItem" url="gtk/gtklistitem.html"/>
+    <tocsect3 name="GtkList" url="gtk/gttdelist.html"/>
+    <tocsect3 name="GtkListItem" url="gtk/gttdelistitem.html"/>
     <tocsect3 name="GtkMenu" url="gtk/gtkmenu.html"/>
     <tocsect3 name="GtkMenuBar" url="gtk/gtkmenubar.html"/>
     <tocsect3 name="GtkMenuItem" url="gtk/gtkmenuitem.html"/>
@@ -196,8 +196,8 @@
     <tocsect3 name="GtkPreview" url="gtk/gtkpreview.html"/>
     <tocsect3 name="GtkProgress" url="gtk/gtkprogress.html"/>
     <tocsect3 name="GtkProgressBar" url="gtk/gtkprogressbar.html"/>
-    <tocsect3 name="GtkRadioButton" url="gtk/gtkradiobutton.html"/>
-    <tocsect3 name="GtkRadioMenuItem" url="gtk/gtkradiomenuitem.html"/>
+    <tocsect3 name="GtkRadioButton" url="gtk/gttderadiobutton.html"/>
+    <tocsect3 name="GtkRadioMenuItem" url="gtk/gttderadiomenuitem.html"/>
     <tocsect3 name="GtkRange" url="gtk/gtkrange.html"/>
     <tocsect3 name="GtkRuler" url="gtk/gtkruler.html"/>
     <tocsect3 name="GtkScale" url="gtk/gtkscale.html"/>
@@ -211,9 +211,9 @@
     <tocsect3 name="GtkTearoffMenuItem" url="gtk/gtktearoffmenuitem.html"/>
     <tocsect3 name="GtkText" url="gtk/gtktext.html"/>
     <tocsect3 name="GtkTipsQuery" url="gtk/gtktipsquery.html"/>
-    <tocsect3 name="GtkToggleButton" url="gtk/gtktogglebutton.html"/>
-    <tocsect3 name="GtkToolbar" url="gtk/gtktoolbar.html"/>
-    <tocsect3 name="GtkTooltips" url="gtk/gtktooltips.html"/>
+    <tocsect3 name="GtkToggleButton" url="gtk/gttdetogglebutton.html"/>
+    <tocsect3 name="GtkToolbar" url="gtk/gttdetoolbar.html"/>
+    <tocsect3 name="GtkTooltips" url="gtk/gttdetooltips.html"/>
     <tocsect3 name="GtkTree" url="gtk/gtktree.html"/>
     <tocsect3 name="GtkTreeItem" url="gtk/gtktreeitem.html"/>
     <tocsect3 name="GtkVButtonBox" url="gtk/gtkvbuttonbox.html"/>
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
index ff05ab6a..84583e81 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
@@ -14,7 +14,7 @@
 
 #include <tqdir.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <tdeversion.h>
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
index f92f6fb6..1aa90dc0 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
@@ -12,7 +12,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
index e529689d..6c36b44f 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
@@ -77,6 +77,6 @@ Only the selected entry will be used</string>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
index b3c717fd..1c05d5e8 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
@@ -12,7 +12,7 @@
 *                                                                         *
 ***************************************************************************/
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
index 82380038..e736a074 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
@@ -137,6 +137,6 @@ Only the selected entry will be used</string>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
index ae9675d2..bc46d5b7 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
@@ -12,7 +12,7 @@
 *                                                                         *
 ***************************************************************************/
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
index acf72f22..cdac57cd 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui
@@ -129,6 +129,6 @@ Only the selected entry will be used</string>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h
index 2a8bf10a..db88d7a9 100644
--- a/languages/cpp/problemreporter.h
+++ b/languages/cpp/problemreporter.h
@@ -19,7 +19,7 @@
 #ifndef PROBLEMSREPORTER_H
 #define PROBLEMSREPORTER_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <tqguardedptr.h>
 #include <tqdatetime.h>
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index 43502e5d..3b229744 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -16,7 +16,7 @@
 #include <tqstringlist.h>
 #include <tqtextstream.h>
 #include <tqtimer.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
index 71f9262e..960dcbe4 100644
--- a/languages/fortran/fortransupportpart.cpp
+++ b/languages/fortran/fortransupportpart.cpp
@@ -32,7 +32,7 @@
 #include <kprocess.h>
 #include <kregexp.h>
 #include <kdevgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 
 #include <kdevcore.h>
diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui
index a0e1ca39..87300352 100644
--- a/languages/java/configproblemreporter.ui
+++ b/languages/java/configproblemreporter.ui
@@ -252,6 +252,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index c868afa5..b4919837 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -41,13 +41,13 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
diff --git a/languages/java/problemreporter.h b/languages/java/problemreporter.h
index dace638b..40f2e279 100644
--- a/languages/java/problemreporter.h
+++ b/languages/java/problemreporter.h
@@ -19,7 +19,7 @@
 #ifndef PROBLEMSREPORTER_H
 #define PROBLEMSREPORTER_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqguardedptr.h>
 
 class JavaSupportPart;
diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp
index 032d861b..1780a04e 100644
--- a/languages/kjssupport/jscodecompletion.cpp
+++ b/languages/kjssupport/jscodecompletion.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kdialogbase.h>
 
diff --git a/languages/kjssupport/kjsproblems.h b/languages/kjssupport/kjsproblems.h
index beb1fd5d..ff1a0ce1 100644
--- a/languages/kjssupport/kjsproblems.h
+++ b/languages/kjssupport/kjsproblems.h
@@ -19,7 +19,7 @@
 #ifndef KJSPROBLEMS_H
 #define KJSPROBLEMS_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 class kjsSupportPart;
 
 /**
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index 100f34e6..300991d8 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -35,7 +35,7 @@
 
 
 #include <kdevproject.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kapplication.h>
 
diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp
index b9e193a1..4e8344a6 100644
--- a/languages/lib/designer_integration/implementationwidget.cpp
+++ b/languages/lib/designer_integration/implementationwidget.cpp
@@ -30,7 +30,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <kdevproject.h>
 #include <domutil.h>
diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui
index 8dc6c545..9d8769d7 100644
--- a/languages/lib/designer_integration/implementationwidgetbase.ui
+++ b/languages/lib/designer_integration/implementationwidgetbase.ui
@@ -262,6 +262,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index c3d92608..4da9949f 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -16,7 +16,7 @@
 #include <tqstringlist.h>
 #include <tqtextstream.h>
 #include <tqtimer.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
diff --git a/languages/php/phperrorview.h b/languages/php/phperrorview.h
index a14c0c8e..3436465b 100644
--- a/languages/php/phperrorview.h
+++ b/languages/php/phperrorview.h
@@ -20,7 +20,7 @@
 #ifndef PHPERRORVIEW_H
 #define PHPERRORVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <tqguardedptr.h>
 #include "phpfile.h"
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index e7a597de..42abe30a 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -32,7 +32,7 @@
 #include <tqwhatsthis.h>
 #include <tqthread.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdehtmlview.h>
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index d921108a..afdf16ca 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -25,7 +25,7 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 #include <tqvbox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index 7bfb4ad9..de750ba0 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -26,7 +26,7 @@
 #include <kdockwindow.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <twin.h>
 #include <twinmodule.h>
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 70611d28..6293aaf0 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -23,13 +23,13 @@
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp
index f176a3ed..f28ea1de 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.cpp
+++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurl.h>
 
 #include <tqvbuttongroup.h>
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index 8179eeab..044614b6 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -24,7 +24,7 @@
 #include "rdbcommand.h"
 
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klineedit.h>
 #include <tdeversion.h>
 
diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h
index bac6d669..c05d8479 100644
--- a/languages/ruby/debugger/variablewidget.h
+++ b/languages/ruby/debugger/variablewidget.h
@@ -24,7 +24,7 @@
 
 #include "rdbcontroller.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
 #include <tqwidget.h>
 #include <tqtooltip.h>
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 0a963043..9a85f065 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -27,7 +27,7 @@
 #include <kdevgenericfactory.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kdialogbase.h>
 #include <kapplication.h>
diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp
index 02112d78..37aa6862 100644
--- a/languages/sql/sqlactions.cpp
+++ b/languages/sql/sqlactions.cpp
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
 
diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h
index 20923a15..248c4d66 100644
--- a/languages/sql/sqlactions.h
+++ b/languages/sql/sqlactions.h
@@ -14,7 +14,7 @@
 
 #include <tdeversion.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class SQLSupportPart;
 class KComboBox;
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index d5b6f91c..f61c6bea 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -10,7 +10,7 @@
 #include <klocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kdialogbase.h>
 #include <tdetexteditor/editinterface.h>