Rename many classes and header files to avoid conflicts with KDE4

107 files changed, 140 insertions, 140 deletions

diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index beadb5fa..197457eb 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -25,7 +25,7 @@
 #include <tdeparts/part.h>
 #include <kstandarddirs.h>
 #include <kdevgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <tdeio/netaccess.h>
 #include <kiconloader.h>
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 41e52a03..76ac124c 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -33,7 +33,7 @@
 #include <tqtooltip.h>
 #include <tqvalidator.h>
 #include <tqtimer.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconview.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -48,7 +48,7 @@
 #include <tdefiledialog.h>
 #include <tdefile.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <ktrader.h>
 #include <tdeparts/componentfactory.h>
diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h
index 859b1524..cbd2836e 100644
--- a/parts/appwizard/appwizarddlg.h
+++ b/parts/appwizard/appwizarddlg.h
@@ -30,7 +30,7 @@ class ProfileSupport;
 #include <klineedit.h>
 #include <tqlabel.h>
 #include <tqstringlist.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconview.h>
 #include "kdevversioncontrol.h"
 #include "kdevvcsintegrator.h"
diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui
index a2303139..891c1c10 100644
--- a/parts/appwizard/appwizarddlgbase.ui
+++ b/parts/appwizard/appwizarddlgbase.ui
@@ -636,7 +636,7 @@
 </forwards>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
-    <include location="global" impldecl="in implementation">klistview.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
     <include location="global" impldecl="in implementation">kiconview.h</include>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
 </includes>
@@ -655,7 +655,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kiconview.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index bcc21127..6cec2631 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -22,7 +22,7 @@
 #include <kdevcore.h>
 #include <kgenericfactory.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqmessagebox.h>
 
 #include "importdlg.h"
diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h
index cd7c757e..61b5a382 100644
--- a/parts/astyle/astyle_part.h
+++ b/parts/astyle/astyle_part.h
@@ -8,7 +8,7 @@
 
 class KDialogBase;
 #include <kdevsourceformatter.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kdevplugin.h>
 #include <kdebug.h>
diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index 733d2010..b12289c9 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -22,7 +22,7 @@
 #include <tdetexteditor/markinterface.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/document.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 
 #include <kdevpartcontroller.h>
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index f15f6289..fef9405a 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -20,7 +20,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 
 #include <kdevpartcontroller.h>
diff --git a/parts/bookmarks/bookmarks_widget.h b/parts/bookmarks/bookmarks_widget.h
index ed645e0e..57180574 100644
--- a/parts/bookmarks/bookmarks_widget.h
+++ b/parts/bookmarks/bookmarks_widget.h
@@ -18,7 +18,7 @@
 //#include <tqlistview.h>
 #include <tqtooltip.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "bookmarks_part.h"
 
diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp
index 878cd44b..56301edd 100644
--- a/parts/classview/classtoolwidget.cpp
+++ b/parts/classview/classtoolwidget.cpp
@@ -16,7 +16,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include "classstore.h"
 
 
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index 43604b42..8af0efc8 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -18,7 +18,7 @@
 #include <tqregexp.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kiconloader.h>
 
diff --git a/parts/classview/classtreebase.h b/parts/classview/classtreebase.h
index fb218387..df495641 100644
--- a/parts/classview/classtreebase.h
+++ b/parts/classview/classtreebase.h
@@ -14,7 +14,7 @@
 #ifndef _CLASSTREEBASE_H_
 #define _CLASSTREEBASE_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include "parseditem.h"
 #include "parsedscopecontainer.h"
 #include "parsedclass.h"
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 7bf70310..80e3e8c4 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -27,7 +27,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdevgenericfactory.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 
@@ -48,7 +48,7 @@
 #include "hierarchydlg.h"
 #include "navigator.h"
 
-#include "klistviewaction.h"
+#include "tdelistviewaction.h"
 
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 9142d110..de025d7b 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -25,9 +25,9 @@
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <kurl.h>
-#include <kaction.h>
-#include <kactionclasses.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 
 #include <urlutil.h>
diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h
index 586ac41e..e54ea56d 100644
--- a/parts/classview/classviewwidget.h
+++ b/parts/classview/classviewwidget.h
@@ -22,7 +22,7 @@
 #ifndef __CLASSVIEW_WIDGET_H__
 #define __CLASSVIEW_WIDGET_H__
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index b79847d1..389b1d6f 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -30,7 +30,7 @@
 #include <tdetexteditor/viewcursorinterface.h>
 
 #include <kcomboview.h>
-#include <klistviewaction.h>
+#include <tdelistviewaction.h>
 #include <kdevpartcontroller.h>
 #include <kdevlanguagesupport.h>
 #include <kdevmainwindow.h>
diff --git a/parts/classview/viewcombos.cpp b/parts/classview/viewcombos.cpp
index bb7bf01d..cf8b278e 100644
--- a/parts/classview/viewcombos.cpp
+++ b/parts/classview/viewcombos.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-#include "klistviewaction.h"
+#include "tdelistviewaction.h"
 #include "kcomboview.h"
 
 #include "viewcombos.h"
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index e5b48dba..bc36002f 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -16,7 +16,7 @@
 #include <tqregexp.h>
 
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdeparts/part.h>
@@ -29,7 +29,7 @@
 #include <kdialogbase.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "kdevappfrontend.h"
 #include <kdevgenericfactory.h>
diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp
index 49503cdc..8f108efb 100644
--- a/parts/ctags2/ctags2_settingswidget.cpp
+++ b/parts/ctags2/ctags2_settingswidget.cpp
@@ -14,7 +14,7 @@
 #include <tqheader.h>
 
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdevproject.h>
 #include <kapplication.h>
 #include <kurlcompletion.h>
diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui
index 275c1e4b..c423f79c 100644
--- a/parts/ctags2/ctags2_settingswidgetbase.ui
+++ b/parts/ctags2/ctags2_settingswidgetbase.ui
@@ -377,6 +377,6 @@
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp
index 4f400272..b2ea542c 100644
--- a/parts/ctags2/ctags2_widget.cpp
+++ b/parts/ctags2/ctags2_widget.cpp
@@ -16,7 +16,7 @@
 #include <tqfocusdata.h>
 
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui
index 0218e21b..58107966 100644
--- a/parts/ctags2/ctags2_widgetbase.ui
+++ b/parts/ctags2/ctags2_widgetbase.ui
@@ -175,7 +175,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/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 14ce5d0d..3861f202 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -17,7 +17,7 @@
 
 #include <klocale.h>
 #include <kdevgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <kprocess.h>
 #include <tdeio/jobclasses.h>
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 6b3a2d6d..fea6b497 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -20,7 +20,7 @@
 #include <klocale.h>
 #include <kservice.h>
 #include <ktempfile.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h
index 4b907353..aa019c4d 100644
--- a/parts/distpart/distpart_part.h
+++ b/parts/distpart/distpart_part.h
@@ -25,7 +25,7 @@
 
 #include <tqguardedptr.h>
 #include <kdevplugin.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "packagebase.h"
 
diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui
index 3eec55e6..e981dcab 100644
--- a/parts/distpart/distpart_ui.ui
+++ b/parts/distpart/distpart_ui.ui
@@ -1197,7 +1197,7 @@ Build Files</string>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
-    <include location="global" impldecl="in implementation">klistbox.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">ktextedit.h</include>
 </includes>
@@ -1216,7 +1216,7 @@ Build Files</string>
     <forward>class TQListBoxItem;</forward>
 </forwards>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
@@ -1236,7 +1236,7 @@ Build Files</string>
     <includehint>ktextedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h
index ff3d729c..7a684a5a 100644
--- a/parts/distpart/distpart_widget.h
+++ b/parts/distpart/distpart_widget.h
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <tqstring.h>
 #include "distpart_ui.h"
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqcheckbox.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index 5cf527ab..7b2945f4 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -29,7 +29,7 @@
 #include <kdialog.h>
 #include <kpushbutton.h>
 #include <kurlrequester.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeparts/part.h>
 #include <tdehtml_part.h>
 #include <dom/html_document.h>
diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp
index 42b4be64..2d1c8230 100644
--- a/parts/documentation/contentsview.cpp
+++ b/parts/documentation/contentsview.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 #include <kdevpartcontroller.h>
diff --git a/parts/documentation/docconfiglistview.h b/parts/documentation/docconfiglistview.h
index 474655b0..561c326d 100644
--- a/parts/documentation/docconfiglistview.h
+++ b/parts/documentation/docconfiglistview.h
@@ -20,7 +20,7 @@
 #ifndef DOCCONFIGLISTVIEW_H
 #define DOCCONFIGLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class DocConfigListView : public TDEListView
 {
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index df41666b..f0559510 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -34,7 +34,7 @@
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kurlrequester.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <tdehtml_part.h>
 #include <tdehtml_settings.h>
 
diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui
index 12c4de1a..78b27b22 100644
--- a/parts/documentation/docglobalconfigwidgetbase.ui
+++ b/parts/documentation/docglobalconfigwidgetbase.ui
@@ -564,9 +564,9 @@
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index e618c2a3..10419a3b 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -38,8 +38,8 @@
 #include <tdeparts/componentfactory.h>
 #include <kservice.h>
 #include <kdialogbase.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kbookmark.h>
 #include <kbookmarkmenu.h>
 #include <kinputdialog.h>
diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp
index 12fb1dd1..879177db 100644
--- a/parts/documentation/docutils.cpp
+++ b/parts/documentation/docutils.cpp
@@ -23,7 +23,7 @@
 #include <kurlcompletion.h>
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kstringhandler.h>
 
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index 9e97ecce..91f94af8 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -27,7 +27,7 @@
 
 #include <klineedit.h>
 #include <kprocess.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 #include <kdevpartcontroller.h>
 #include <kdevdocumentationplugin.h>
diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp
index 54aac7ac..61990e9a 100644
--- a/parts/documentation/find_documentation_options.cpp
+++ b/parts/documentation/find_documentation_options.cpp
@@ -22,7 +22,7 @@
 #include <tqheader.h>
 #include <tqcheckbox.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 #include <tdeconfig.h>
diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui
index cae5096a..e983c8e0 100644
--- a/parts/documentation/find_documentationbase.ui
+++ b/parts/documentation/find_documentationbase.ui
@@ -165,6 +165,6 @@
 <layoutdefaults spacing="1" margin="1"/>
 <includehints>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h
index e5e71ca2..a5dbe458 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.h
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.h
@@ -23,8 +23,8 @@
 #include <tqvaluelist.h>
 #include <tqpair.h>
 
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <kurl.h>
 #include <tdefile.h>
 
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index be624209..587f635d 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -23,7 +23,7 @@
 #include <kaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeio/netaccess.h>
 #include <iostream>
 #include <fstream>
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index bc6488bf..317bdf8b 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -23,7 +23,7 @@
 #include <kaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index 7cb92879..2d9a4731 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -23,7 +23,7 @@
 #include <kaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
 
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index cf0676a2..2e21d5c3 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -30,7 +30,7 @@
 #include <kaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstandarddirs.h>
 
 #include <urlutil.h>
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index 8ad1dc43..9f9ec045 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -23,7 +23,7 @@
 #include <kaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
 
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index 0e1373a0..b8fe76b4 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -23,7 +23,7 @@
 #include <kaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
 
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 69a52a64..58d2dd4e 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -29,7 +29,7 @@
 #include <kaboutdata.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <urlutil.h>
 #include <kdevgenericfactory.h>
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index 47131b03..f33823c3 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -31,7 +31,7 @@
 #include <tqregexp.h>
 
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <klocale.h>
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index b238f99c..04233e25 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -28,9 +28,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdevgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/viewcursorinterface.h>
diff --git a/parts/filecreate/filecreate_listitem.h b/parts/filecreate/filecreate_listitem.h
index 6cb9ecc5..ef2b0974 100644
--- a/parts/filecreate/filecreate_listitem.h
+++ b/parts/filecreate/filecreate_listitem.h
@@ -12,7 +12,7 @@
 #ifndef __FILECREATE_LISTITEM_H__
 #define __FILECREATE_LISTITEM_H__
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqobject.h>
 
 #include "filecreate_filetype.h"
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 0d4db9bc..50009952 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -24,10 +24,10 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
-#include <kactionclasses.h>
-#include <kpopupmenu.h>
+#include <tdeactionclasses.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 
 #include "kdevcore.h"
diff --git a/parts/filecreate/filecreate_widget2.h b/parts/filecreate/filecreate_widget2.h
index 9a27f274..027333c9 100644
--- a/parts/filecreate/filecreate_widget2.h
+++ b/parts/filecreate/filecreate_widget2.h
@@ -16,7 +16,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
 
-//#include <klistview.h>
+//#include <tdelistview.h>
 
 #include "filecreate_typechooser.h"
 
diff --git a/parts/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h
index 863e3d73..ac8b866e 100644
--- a/parts/filecreate/filecreate_widget3.h
+++ b/parts/filecreate/filecreate_widget3.h
@@ -15,7 +15,7 @@
 #include <tqwidget.h>
 #include <tqstring.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "filecreate_typechooser.h"
 
diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp
index 150bd156..2e5a240e 100644
--- a/parts/filelist/filelist_widget.cpp
+++ b/parts/filelist/filelist_widget.cpp
@@ -19,7 +19,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <kdevcore.h>
 #include <kdevpartcontroller.h>
diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h
index b61cd8cc..8f837056 100644
--- a/parts/filelist/filelist_widget.h
+++ b/parts/filelist/filelist_widget.h
@@ -15,7 +15,7 @@
 #define __FILELIST_WIDGET_H__
 
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 #include <kdevpartcontroller.h> // for DocumentState
 
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 6763dff4..d7b9d885 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -36,10 +36,10 @@
 #include <tqpoint.h>
 #include <tqlayout.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kinputdialog.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
diff --git a/parts/filelist/toolbarguibuilder.cpp b/parts/filelist/toolbarguibuilder.cpp
index 03e9acfd..4a2ad967 100644
--- a/parts/filelist/toolbarguibuilder.cpp
+++ b/parts/filelist/toolbarguibuilder.cpp
@@ -20,7 +20,7 @@
 
 #include "toolbarguibuilder.h"
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 ToolbarGUIBuilder::ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget)
   : KXMLGUIBuilder(widget), TDEToolBar(parent, "ToolbarGUIbuilder"), m_parent(parent)
diff --git a/parts/filelist/toolbarguibuilder.h b/parts/filelist/toolbarguibuilder.h
index 477e9c13..395f6178 100644
--- a/parts/filelist/toolbarguibuilder.h
+++ b/parts/filelist/toolbarguibuilder.h
@@ -23,7 +23,7 @@
 
 #include <kxmlguibuilder.h>
 #include <kdebug.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 
 /**
diff --git a/parts/fileselector/CMakeLists.txt b/parts/fileselector/CMakeLists.txt
index 16eaecf3..8f18792e 100644
--- a/parts/fileselector/CMakeLists.txt
+++ b/parts/fileselector/CMakeLists.txt
@@ -35,7 +35,7 @@ install( FILES kdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 tde_add_kpart( libkdevfileselector AUTOMOC
   SOURCES
     fileselector_part.cpp fileselector_widget.cpp
-    kactionselector.cpp kbookmarkhandler.cpp
+    tdeactionselector.cpp kbookmarkhandler.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/fileselector/Makefile.am b/parts/fileselector/Makefile.am
index 6d5f7447..f0c2fc35 100644
--- a/parts/fileselector/Makefile.am
+++ b/parts/fileselector/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libkdevfileselector.la
 libkdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp kactionselector.cpp kbookmarkhandler.cpp
+libkdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp
 
 METASOURCES = AUTO
 
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 295ff957..f19ec2d3 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -23,7 +23,7 @@
 //BEGIN Includes
 #include "fileselector_part.h"
 #include "fileselector_widget.h"
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 #include "kbookmarkhandler.h"
 
 #include <kdevcore.h>
@@ -50,7 +50,7 @@
 
 #include <tdetexteditor/document.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <kurlcombobox.h>
@@ -59,11 +59,11 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <tqtoolbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdialog.h>
 #include <tdeio/netaccess.h>
 
@@ -184,7 +184,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
     connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),
              filter, TQT_SLOT( addToHistory(const TQString&) ) );
 
-    // kaction for the dir sync method
+    // tdeaction for the dir sync method
     acSyncDir = new TDEAction( i18n("Current Document Directory"), "dirsynch", 0,
                              TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
     toolbar->setIconText( TDEToolBar::IconOnly );
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index c95335a2..e47f00c9 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <tdefile.h>
 #include <kurl.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqframe.h>
 #include <kdiroperator.h>
 
diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp
index 4c1c0271..004411ff 100644
--- a/parts/fileselector/kbookmarkhandler.cpp
+++ b/parts/fileselector/kbookmarkhandler.cpp
@@ -25,21 +25,21 @@
 
 #include <kxmlguiclient.h>
 #include <kbookmarkimporter.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kdiroperator.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "kbookmarkhandler.h"
 #include "kbookmarkhandler.moc"
 
 
-KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* kpopupmenu )
+KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* tdepopupmenu )
     : TQObject( parent, "KBookmarkHandler" ),
       KBookmarkOwner(),
       mParent( parent ),
-      m_menu( kpopupmenu ),
+      m_menu( tdepopupmenu ),
       m_importStream( 0L )
 {
     if (!m_menu)
diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h
index 38091e0f..4ec065aa 100644
--- a/parts/fileselector/kbookmarkhandler.h
+++ b/parts/fileselector/kbookmarkhandler.h
@@ -34,7 +34,7 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner
   
 
 public:
-    KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu *kpopupmenu=0 );
+    KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
     ~KBookmarkHandler();
 
     // KBookmarkOwner interface:
diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp
index 0b5b3801..598fe496 100644
--- a/parts/fileselector/tdeactionselector.cpp
+++ b/parts/fileselector/tdeactionselector.cpp
@@ -17,7 +17,7 @@
 */
 
 
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 
 #include <klocale.h>
 #include <kiconloader.h>
@@ -534,4 +534,4 @@ int TDEActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
 }
 
 //END Private Methods
-#include "kactionselector.moc"
+#include "tdeactionselector.moc"
diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp
index 92200d03..f0f61e51 100644
--- a/parts/fileview/filegroupspart.cpp
+++ b/parts/fileview/filegroupspart.cpp
@@ -15,7 +15,7 @@
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
 #include <tqtimer.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index d1629d1e..31ccc10f 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -22,9 +22,9 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeversion.h>
 
 #include "kdevcore.h"
diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h
index 355c9662..83071567 100644
--- a/parts/fileview/filegroupswidget.h
+++ b/parts/fileview/filegroupswidget.h
@@ -12,7 +12,7 @@
 #ifndef _FILEGROUPSWIDGET_H_
 #define _FILEGROUPSWIDGET_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class FileGroupsPart;
 class KDevProject;
diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index 044055cb..759b3204 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -12,7 +12,7 @@
 #include <tqpopupmenu.h>
 #include <kxmlguiclient.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <tdeversion.h>
 
diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp
index caa43466..06322e38 100644
--- a/parts/fileview/filetreewidget.cpp
+++ b/parts/fileview/filetreewidget.cpp
@@ -21,10 +21,10 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdefileitem.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "kdevcore.h"
 #include "kdevproject.h"
diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
index a6c79495..a49dddf7 100644
--- a/parts/fileview/fileviewpart.cpp
+++ b/parts/fileview/fileviewpart.cpp
@@ -19,7 +19,7 @@
 #include <tqdom.h>
 #include <kcombobox.h>
 #include <tqtimer.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index f9d9fa8f..f03b3101 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -17,7 +17,7 @@
 #include <tqdom.h>
 #include <kxmlguiclient.h>
 #include <kcombobox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index a644c9d1..aac3fb38 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -13,7 +13,7 @@
 #include <tqheader.h>
 #include <tqpopupmenu.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdeversion.h>
diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
index 69fc82eb..b21cea0a 100644
--- a/parts/filter/filterpart.cpp
+++ b/parts/filter/filterpart.cpp
@@ -11,7 +11,7 @@
 
 #include "filterpart.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeparts/part.h>
diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp
index 9b6f49e6..fcf2a771 100644
--- a/parts/fullscreen/fullscreen_part.cpp
+++ b/parts/fullscreen/fullscreen_part.cpp
@@ -13,7 +13,7 @@
 #include <klocale.h>
 #include <kdevgenericfactory.h>
 #include <kstdaction.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmenubar.h>
 
 #include <kdevcore.h>
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 627d7447..2e7b63e0 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -16,7 +16,7 @@
 #include <tqwhatsthis.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kprocess.h>
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index acace1b7..f4cb34aa 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -19,8 +19,8 @@
 #include <kprocess.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/selectioninterface.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <ktabwidget.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp
index b8f5e552..63fcc6d9 100644
--- a/parts/openwith/openwithpart.cpp
+++ b/parts/openwith/openwithpart.cpp
@@ -2,13 +2,13 @@
 
 #include <tqfile.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <ktrader.h>
 #include <krun.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcharsets.h>
 
 #include "kdevpartcontroller.h"
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index 5e1e92bc..d8fa152a 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -15,7 +15,7 @@
 #include <tqdir.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <tdeparts/part.h>
 #include <kdevgenericfactory.h>
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index d6aa0856..b38586a7 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -27,7 +27,7 @@
 #include <kstatusbar.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klineedit.h>
 #include <tdefiledialog.h>
 
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index e7285c82..cfc42904 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -234,7 +234,7 @@ void MakeActionFilter::test()
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libtdefilereplacepart.la.closure libtdefilereplacepart_la_closure.lo "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 tdefilereplacepart.lo tdefilereplacedoc.lo "
 		"tdefilereplaceview.lo kabouttdefilereplace.lo kaddstringdlg.lo tdeconfirmdlg.lo kernel.lo kexpression.lo tdefilereplacepref.lo "
-		"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml",
+		"tdelistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml",
 		"linking", "libtool", "libtdefilereplacepart.la.closure")
 	<< TestItem( //libtool, linking 3
 		"/bin/sh ../libtool --silent --mode=link --tag=CXX g++  -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic "
@@ -242,7 +242,7 @@ void MakeActionFilter::test()
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libtdefilereplacepart.la -rpath /opt/trinity/lib/trinity "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 tdefilereplacepart.lo "
 		"tdefilereplacedoc.lo tdefilereplaceview.lo kabouttdefilereplace.lo kaddstringdlg.lo tdeconfirmdlg.lo kernel.lo kexpression.lo "
-		"tdefilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml",
+		"tdefilereplacepref.lo tdelistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml",
 		"linking", "libtool", "libtdefilereplacepart.la")
 	<< TestItem( //automake, builddir!=srcdir, libtool=no, compiling
 		" g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project "
diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
index cc8d356c..8937fa5d 100644
--- a/parts/outputviews/makeviewpart.cpp
+++ b/parts/outputviews/makeviewpart.cpp
@@ -15,7 +15,7 @@
 #include <tqdir.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
index b0bd82b1..63fd15dc 100644
--- a/parts/partexplorer/partexplorer_plugin.cpp
+++ b/parts/partexplorer/partexplorer_plugin.cpp
@@ -15,8 +15,8 @@
 #include <klocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
-#include <kaction.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdemainwindow.h>
 
 #include <kdevplugininfo.h>
 #include <kdevmainwindow.h>
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index 8cff1f57..3284a69a 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -17,7 +17,7 @@
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
index ae8bae82..60bd2044 100644
--- a/parts/quickopen/quickopen_part.cpp
+++ b/parts/quickopen/quickopen_part.cpp
@@ -23,14 +23,14 @@
 #include "quickopenfunctiondialog.h"
 #include "quickopenfiledialog.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <tdeparts/part.h>
 #include <tdetexteditor/document.h>
diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui
index 1b29104a..6aea61b1 100644
--- a/parts/quickopen/quickopenbase.ui
+++ b/parts/quickopen/quickopenbase.ui
@@ -175,7 +175,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp
index 1a5be1e6..2248dfcc 100644
--- a/parts/quickopen/quickopenclassdialog.cpp
+++ b/parts/quickopen/quickopenclassdialog.cpp
@@ -22,7 +22,7 @@
 #include <kdevpartcontroller.h>
 #include <kdevlanguagesupport.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kcompletion.h>
diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp
index b29af671..5032ee15 100644
--- a/parts/quickopen/quickopendialog.cpp
+++ b/parts/quickopen/quickopendialog.cpp
@@ -21,7 +21,7 @@
 #include <tqapplication.h>
 #include <tqregexp.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineedit.h>
 #include <kdebug.h>
 
diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp
index 38dbd387..ba2a674b 100644
--- a/parts/quickopen/quickopenfiledialog.cpp
+++ b/parts/quickopen/quickopenfiledialog.cpp
@@ -22,7 +22,7 @@
 #include <kdevpartcontroller.h>
 
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kcompletion.h>
diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp
index a8853417..b18da8b7 100644
--- a/parts/quickopen/quickopenfunctionchooseform.cpp
+++ b/parts/quickopen/quickopenfunctionchooseform.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui
index f4bae80b..88b47e53 100644
--- a/parts/quickopen/quickopenfunctionchooseformbase.ui
+++ b/parts/quickopen/quickopenfunctionchooseformbase.ui
@@ -225,7 +225,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ksqueezedtextlabel.h</includehint>
-    <includehint>klistbox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp
index 859597f5..4a3a0888 100644
--- a/parts/quickopen/quickopenfunctiondialog.cpp
+++ b/parts/quickopen/quickopenfunctiondialog.cpp
@@ -24,7 +24,7 @@
 
 #include <kcompletion.h>
 #include <kdebug.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
 
diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp
index b671542e..49d8b702 100644
--- a/parts/regexptest/regexptestpart.cpp
+++ b/parts/regexptest/regexptestpart.cpp
@@ -14,7 +14,7 @@
 #include <klocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "kdevcore.h"
 #include "regexptestdlg.h"
diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp
index 857c6696..7dfaaaf0 100644
--- a/parts/replace/replace_part.cpp
+++ b/parts/replace/replace_part.cpp
@@ -12,7 +12,7 @@
 
 #include <tqwhatsthis.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdevgenericfactory.h>
diff --git a/parts/replace/replaceview.h b/parts/replace/replaceview.h
index f70e41c0..1b7591aa 100644
--- a/parts/replace/replaceview.h
+++ b/parts/replace/replaceview.h
@@ -12,7 +12,7 @@
 #ifndef __REPLACEVIEW_H__
 #define __REPLACEVIEW_H__
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqstring.h>
 #include <tqregexp.h>
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index 8f799242..a4ff3fd3 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -25,7 +25,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/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index e16f7821..9707f4e8 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -9,7 +9,7 @@
 
 #include <tqwhatsthis.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kaboutdata.h>
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index dd057a29..279dc18b 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -13,7 +13,7 @@
 #include <klocale.h>
 #include <tqlayout.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqheader.h>
 #include <klineedit.h>
 #include <ktextedit.h>
@@ -25,7 +25,7 @@
 #include <tdetexteditor/document.h>
 #include <tdeconfig.h>
 #include <tqtooltip.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqregexp.h>
 #include <tqinputdialog.h>
 #include <tqlabel.h>
diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h
index bce03e17..8b6c17a1 100644
--- a/parts/snippet/snippet_widget.h
+++ b/parts/snippet/snippet_widget.h
@@ -11,7 +11,7 @@
 
 #include <tqwidget.h>
 #include <tqstring.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqtooltip.h>
 #include <tqrect.h>
 
diff --git a/parts/snippet/snippetitem.h b/parts/snippet/snippetitem.h
index ee181725..f534987c 100644
--- a/parts/snippet/snippetitem.h
+++ b/parts/snippet/snippetitem.h
@@ -9,7 +9,7 @@
 #ifndef SNIPPETITEM_H
 #define SNIPPETITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 class TQString;
diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp
index 2bc1299a..d1f5def4 100644
--- a/parts/texttools/texttoolswidget.cpp
+++ b/parts/texttools/texttoolswidget.cpp
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeparts/part.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/selectioninterface.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/parts/texttools/texttoolswidget.h b/parts/texttools/texttoolswidget.h
index 2e3c274a..50d2e895 100644
--- a/parts/texttools/texttoolswidget.h
+++ b/parts/texttools/texttoolswidget.h
@@ -12,7 +12,7 @@
 #ifndef _TEXTTOOLSWIDGET_H_
 #define _TEXTTOOLSWIDGET_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstringlist.h>
 
 class TextToolsPart;
diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
index e116e948..24c3fe68 100644
--- a/parts/tipofday/tipofday_part.cpp
+++ b/parts/tipofday/tipofday_part.cpp
@@ -5,7 +5,7 @@
 #include <tqwhatsthis.h>
 
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdevgenericfactory.h>
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index d035a185..64ffb187 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -52,7 +52,7 @@
 #include <dcopclient.h>
 #include <kmimetype.h>
 #include <kservicegroup.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdesycoca.h>
 #include <kdebug.h>
 
diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h
index 864ab1a0..0ba2cc9f 100644
--- a/parts/tools/kapplicationtree.h
+++ b/parts/tools/kapplicationtree.h
@@ -20,7 +20,7 @@
 #define __KDevApplicationTree_h__
 
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KURLRequester;
 
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index 50ff0230..b7df4eb4 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -7,7 +7,7 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index aece8c06..85a392fd 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -7,7 +7,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdevgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp
index 07fd2123..a1e17396 100644
--- a/parts/valgrind/valgrind_widget.cpp
+++ b/parts/valgrind/valgrind_widget.cpp
@@ -6,7 +6,7 @@
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kstatusbar.h>
 
diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
index 0906bb73..f2d27387 100644
--- a/parts/vcsmanager/vcsmanagerpart.cpp
+++ b/parts/vcsmanager/vcsmanagerpart.cpp
@@ -25,7 +25,7 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>