Rename many classes and header files to avoid conflicts with KDE4

12 years ago · 5be945600e
parent e36b30d13d
commit 5be945600e
256 changed files with 362 additions and 362 deletions
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@ -17,7 +17,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
--- a/buildtools/ant/antprojectpart.cpp
+++ b/buildtools/ant/antprojectpart.cpp
@ -13,8 +13,8 @@
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <kcombobox.h>
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@ -24,12 +24,12 @@
 /** KDE Libs */
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 /** KDevelop */
 #include "kdevappfrontend.h"
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
--- a/buildtools/autotools/autoprojectviewbase.ui
+++ b/buildtools/autotools/autoprojectviewbase.ui
@ -118,6 +118,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@ -34,13 +34,13 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kregexp.h>
 #include <kurl.h>
 #include <tdefile.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include "kdevcore.h"
 #include "domutil.h"
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@ -22,16 +22,16 @@
 /** KDE Libs */
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kprocess.h>
 #include <ksqueezedtextlabel.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 /** KDevelop */
 #include <kdevmainwindow.h>
--- a/buildtools/autotools/autotoolsaction.h
+++ b/buildtools/autotools/autotoolsaction.h
@ -15,7 +15,7 @@
 #define AUTOTOOLSACTION_H
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 class TQObject;
 class TDEActionCollection;
--- a/buildtools/autotools/choosetargetdialog.cpp
+++ b/buildtools/autotools/choosetargetdialog.cpp
@ -29,7 +29,7 @@
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <ksqueezedtextlabel.h>
--- a/buildtools/autotools/choosetargetdlgbase.ui
+++ b/buildtools/autotools/choosetargetdlgbase.ui
@ -217,6 +217,6 @@
    <includehint>klineedit.h</includehint>
    <includehint>kcombobox.h</includehint>
    <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
--- a/buildtools/autotools/fileselectorwidget.h
+++ b/buildtools/autotools/fileselectorwidget.h
@ -19,7 +19,7 @@
 #include <tqstrlist.h>
 #include <tqtooltip.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
 #include <tdefile.h>
--- a/buildtools/autotools/removetargetdlg.cpp
+++ b/buildtools/autotools/removetargetdlg.cpp
@ -28,7 +28,7 @@
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kprogress.h>
 #include <ksqueezedtextlabel.h>
 #include <klocale.h>
--- a/buildtools/autotools/removetargetdlgbase.ui
+++ b/buildtools/autotools/removetargetdlgbase.ui
@ -258,7 +258,7 @@
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
    <includehint>ksqueezedtextlabel.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
    <includehint>kprogress.h</includehint>
 </includehints>
 </UI>
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@ -26,7 +26,7 @@
 #include <tqwhatsthis.h>
 #include <tqdom.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
@ -34,10 +34,10 @@
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <tdeparts/part.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeversion.h>
 #include <kprocess.h>
--- a/buildtools/custommakefiles/selectnewfilesdialog.cpp
+++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp
@ -13,7 +13,7 @@
 #include "selectnewfilesdialog.h"
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqheader.h>
 #include <tqstringlist.h>
 #include <klocale.h>
--- a/buildtools/custommakefiles/selectnewfilesdialogbase.ui
+++ b/buildtools/custommakefiles/selectnewfilesdialogbase.ui
@ -45,6 +45,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
--- a/buildtools/lib/widgets/environmentdisplaydialog.cpp
+++ b/buildtools/lib/widgets/environmentdisplaydialog.cpp
@ -18,7 +18,7 @@
 */
 #include <unistd.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstringlist.h>
 #include "environmentdisplaydialog.h"
--- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui
+++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
@ -106,6 +106,6 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@ -20,7 +20,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
--- a/buildtools/qmake/choosesubprojectdlg.h
+++ b/buildtools/qmake/choosesubprojectdlg.h
@ -12,7 +12,7 @@
 #ifndef CHOOSESUBPROJECTDLG_H
 #define CHOOSESUBPROJECTDLG_H
-#include <klistview.h>
+#include <tdelistview.h>
 #include "choosesubprojectdlgbase.h"
--- a/buildtools/qmake/choosesubprojectdlgbase.ui
+++ b/buildtools/qmake/choosesubprojectdlgbase.ui
@ -128,7 +128,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
    <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
--- a/buildtools/qmake/disablesubprojectdlg.cpp
+++ b/buildtools/qmake/disablesubprojectdlg.cpp
@ -10,7 +10,7 @@
 ***************************************************************************/
 #include "disablesubprojectdlg.h"
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstringlist.h>
 #include "scope.h"
 #include "qmakescopeitem.h"
--- a/buildtools/qmake/disablesubprojectdlgbase.ui
+++ b/buildtools/qmake/disablesubprojectdlgbase.ui
@ -119,7 +119,7 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
 </includehints>
--- a/buildtools/qmake/projectconfigurationdlg.h
+++ b/buildtools/qmake/projectconfigurationdlg.h
@ -22,7 +22,7 @@
 //#include "trollprojectwidget.h"
 #include <tdeversion.h>
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqmap.h>
 class QMakeScopeItem;
--- a/buildtools/qmake/projectconfigurationdlgbase.ui
+++ b/buildtools/qmake/projectconfigurationdlgbase.ui
@ -2886,7 +2886,7 @@
    <includehint>kpushbutton.h</includehint>
    <includehint>kurlrequester.h</includehint>
    <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
--- a/buildtools/qmake/trolllistview.h
+++ b/buildtools/qmake/trolllistview.h
@ -20,7 +20,7 @@
 #ifndef TROLLLISTVIEW_H
 #define TROLLLISTVIEW_H
-#include <klistview.h>
+#include <tdelistview.h>
 #include "trollprojectwidget.h"
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@ -28,7 +28,7 @@
 #include <kstatusbar.h>
 #include <tqmessagebox.h>
 #include <kdevgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@ -42,15 +42,15 @@
 #include <tdefiledialog.h>
 #include <tqtooltip.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kregexp.h>
 #include <kurl.h>
 #include <tqmessagebox.h>
 #include <iostream>
 #include <tdeparts/part.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kprocess.h>
 #include <kinputdialog.h>
 #include <tdeversion.h>
--- a/buildtools/script/scriptprojectpart.cpp
+++ b/buildtools/script/scriptprojectpart.cpp
@ -17,7 +17,7 @@
 #include <tqvaluestack.h>
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
--- a/embedded/visualboyadvance/visualboyadvance_part.cpp
+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp
@ -3,7 +3,7 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <klocale.h>
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@ -21,8 +21,8 @@
 #include "kdevdesigner_part.h"
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
@ -209,15 +209,15 @@ bool KDevDesignerPart::saveFile()
    return true;
 }
-void KDevDesignerPart::stateSync( TDEAction * kaction, TQAction * qaction )
+void KDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction )
 {
    if (!qaction)
        return;
-    kaction->setEnabled(qaction->isEnabled());
+    tdeaction->setEnabled(qaction->isEnabled());
    DesignerAction *ac = dynamic_cast<DesignerAction*>(qaction);
    if (!ac)
        return;
-    connect(ac, TQT_SIGNAL(actionEnabled(bool )), kaction, TQT_SLOT(setEnabled(bool )));
+    connect(ac, TQT_SIGNAL(actionEnabled(bool )), tdeaction, TQT_SLOT(setEnabled(bool )));
 }
 void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action )
@ -475,13 +475,13 @@ void KDevDesignerPart::setToggleActionChecked( bool b)
            pointerAction->setChecked(true);
        return;
    }
-    TDERadioAction *kaction = m_actionMap[action];
+    TDERadioAction *tdeaction = m_actionMap[action];
-    if (!kaction)
+    if (!tdeaction)
        return;
-//    kdDebug() << "untoggle action: " << kaction->text() << endl;
+//    kdDebug() << "untoggle action: " << tdeaction->text() << endl;
-    kaction->blockSignals(true);
+    tdeaction->blockSignals(true);
-    kaction->setChecked(b);
+    tdeaction->setChecked(b);
-    kaction->blockSignals(false);
+    tdeaction->blockSignals(false);
 }
 void KDevDesignerPart::setToggleActionOn( bool b )
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@ -70,7 +70,7 @@ protected:
    void setupDesignerWindow();
    void setupActions();
-    void stateSync(TDEAction *kaction, TQAction *qaction);
+    void stateSync(TDEAction *tdeaction, TQAction *qaction);
    void setupToolsAction(TDERadioAction *toggle, TQAction *action);
 protected slots:
--- a/kdevdesigner/src/kdevdesigner.cpp
+++ b/kdevdesigner/src/kdevdesigner.cpp
@ -29,7 +29,7 @@
 #include <kedittoolbar.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <klibloader.h>
--- 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>
--- 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 <tdestdaccel.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 %{APPNAME}::%{APPNAME}()
--- 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"
--- 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>
--- 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>
--- 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 <tdeaction.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kstandardaction.h>
 #include <KDE/TDELocale>
--- 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}()
--- 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"
--- 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>
--- 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>
--- 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>
--- 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}()
--- 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
--- 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"
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 <tdestdaccel.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 %{APPNAME}::%{APPNAME}()
--- 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"
--- 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>
--- 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 <tdestdaccel.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include "settings.h"
--- 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 <tdestdaccel.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 %{APPNAMELC}::%{APPNAMELC}()
--- 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"
--- 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>
--- 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
--- 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>
--- 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"
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 <tdelistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <kmessagebox.h>
 #include <tqframe.h>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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="GtkFontSelection" url="gtk/gttdefontselection.html"/>
-    <tocsect3 name="GtkFontSelectionDialog" url="gtk/gtkfontselectiondialog.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="GtkList" url="gtk/gttdelist.html"/>
-    <tocsect3 name="GtkListItem" url="gtk/gtklistitem.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="GtkRadioButton" url="gtk/gttderadiobutton.html"/>
-    <tocsect3 name="GtkRadioMenuItem" url="gtk/gtkradiomenuitem.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="GtkToggleButton" url="gtk/gttdetogglebutton.html"/>
-    <tocsect3 name="GtkToolbar" url="gtk/gtktoolbar.html"/>
+    <tocsect3 name="GtkToolbar" url="gtk/gttdetoolbar.html"/>
-    <tocsect3 name="GtkTooltips" url="gtk/gtktooltips.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"/>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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>
--- 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;
 /**
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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>
--- a/lib/interfaces/kdevmainwindow.cpp
+++ b/lib/interfaces/kdevmainwindow.cpp
@ -19,7 +19,7 @@
 */
 #include "kdevmainwindow.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstatusbar.h>
 KStatusBar *KDevMainWindow::statusBar()
--- a/lib/interfaces/kdevplugin.cpp
+++ b/lib/interfaces/kdevplugin.cpp
@ -32,7 +32,7 @@
 #include "kdevpartcontroller.h"
 #include "kdevplugincontroller.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <kiconloader.h>
--- a/lib/util/tdescriptactionmanager.cpp
+++ b/lib/util/tdescriptactionmanager.cpp
@ -28,7 +28,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <scriptinterface.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqfileinfo.h>
 #include <tqtimer.h>
--- a/lib/widgets/CMakeLists.txt
+++ b/lib/widgets/CMakeLists.txt
@ -26,7 +26,7 @@ link_directories(
 ##### headers ###################################
 install( FILES
-    klistviewaction.h qcomboview.h flagboxes.h
+    tdelistviewaction.h qcomboview.h flagboxes.h
    ksavealldialog.h resizablecombo.h kcomboview.h
    kdevhtmlpart.h processlinemaker.h processwidget.h
    fancylistviewitem.h
@ -42,7 +42,7 @@ install( FILES kdevhtml_partui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevelop )
 tde_add_library( kdevwidgets SHARED AUTOMOC
  SOURCES
-    flagboxes.cpp qcomboview.cpp klistviewaction.cpp
+    flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp
    kcomboview.cpp resizablecombo.cpp kdevhtmlpart.cpp
    processlinemaker.cpp processwidget.cpp ksavealldialog.cpp
    fancylistviewitem.cpp
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@ -6,12 +6,12 @@ lib_LTLIBRARIES = libkdevwidgets.la
 kdevwidgetsincludedir = $(includedir)/tdevelop/widgets
-libkdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp klistviewaction.cpp \
+libkdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp \
 	kcomboview.cpp resizablecombo.cpp kdevhtmlpart.cpp processlinemaker.cpp \
 	processwidget.cpp ksavealldialog.cpp fancylistviewitem.cpp
-kdevwidgetsinclude_HEADERS = klistviewaction.h qcomboview.h flagboxes.h \
+kdevwidgetsinclude_HEADERS = tdelistviewaction.h qcomboview.h flagboxes.h \
 	ksavealldialog.h resizablecombo.h kcomboview.h kdevhtmlpart.h processlinemaker.h \
 	processwidget.h fancylistviewitem.h 
--- a/lib/widgets/fancylistviewitem.h
+++ b/lib/widgets/fancylistviewitem.h
@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqfont.h>
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 class TextPaintStyleStore {
    public:
--- a/lib/widgets/kcomboview.cpp
+++ b/lib/widgets/kcomboview.cpp
@ -17,7 +17,7 @@
   Boston, MA 02110-1301, USA.
 */
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcompletionbox.h>
 #include <tqheader.h>
 #include <tqmap.h>
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@ -3,13 +3,13 @@
 #include <tqapplication.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdehtmlview.h>
 #include <tdehtml_settings.h>
 #include <tdeconfig.h>
--- a/lib/widgets/ksavealldialog.cpp
+++ b/lib/widgets/ksavealldialog.cpp
@ -23,8 +23,8 @@
 #include <klocale.h>
 #include <kpushbutton.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstdguiitem.h>
 #include "ksavealldialog.h"
--- a/lib/widgets/processwidget.h
+++ b/lib/widgets/processwidget.h
@ -20,7 +20,7 @@
 #ifndef _PROCESSWIDGET_H_
 #define _PROCESSWIDGET_H_
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kprocess.h>
 /**
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqpushbutton.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #ifndef PURE_QT
 #include <klocale.h>
--- a/lib/widgets/propeditor/pfontcombo.cpp
+++ b/lib/widgets/propeditor/pfontcombo.cpp
@ -20,7 +20,7 @@
 #include "pfontcombo.h"
 #ifndef PURE_QT
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #else
 #include <tqcombobox.h>
 #endif
--- a/lib/widgets/propeditor/propertyeditor.h
+++ b/lib/widgets/propeditor/propertyeditor.h
@ -21,7 +21,7 @@
 #define PROPERTYEDITOR_H
 #ifndef PURE_QT
-#include <klistview.h>
+#include <tdelistview.h>
 #else
 #include <tqlistview.h>
 #define TDEListView TQListView
--- a/lib/widgets/tdelistviewaction.cpp
+++ b/lib/widgets/tdelistviewaction.cpp
@ -16,7 +16,7 @@
   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
   Boston, MA 02110-1301, USA.
 */
-#include "klistviewaction.h"
+#include "tdelistviewaction.h"
 #include "kcomboview.h"
 #include "resizablecombo.h"
--- a/lib/widgets/tdelistviewaction.h
+++ b/lib/widgets/tdelistviewaction.h
@ -21,12 +21,12 @@
 #include <kxmlguiclient.h>
 #include <tdeversion.h>
-#include <kaction.h>
+#include <tdeaction.h>
 class KComboView;
 /**
-@file klistviewaction.h
+@file tdelistviewaction.h
 Widget action with KComboView.
 */
--- 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>
--- 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>
--- 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"
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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"
--- 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"
--- 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>
--- 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"
--- 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>
--- 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 <tdeaction.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <urlutil.h>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
 {
--- 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>
--- 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>
--- 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 <tdeaction.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kbookmark.h>
 #include <kbookmarkmenu.h>
 #include <kinputdialog.h>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 <tdelistbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 #include <tdefile.h>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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 <tdeactionclasses.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include "kdevcore.h"
--- 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"
--- 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"
--- 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>
--- 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
--- 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>
--- 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)
--- 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>
 /**
--- 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}
 )
--- 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
--- 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 );
--- 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>
--- 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)
--- 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:
--- 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"
--- 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>
--- 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"
--- 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;
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 <tdeaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ktabwidget.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
--- 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"
--- 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>
--- 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>
--- 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 "
--- 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>
--- 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 <tdeaction.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdevplugininfo.h>
 #include <kdevmainwindow.h>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>tdelistbox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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>
--- 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;
--- 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>
--- 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>
--- 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;
--- 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>
--- 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>
--- 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>
--- 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>
--- a/src/core.cpp
+++ b/src/core.cpp
@ -4,12 +4,12 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include "toplevel.h"
 #include "partcontroller.h"
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@ -18,10 +18,10 @@
 #include <tdetexteditor/view.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <klocale.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include "toplevel.h"
 #include "partcontroller.h"
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@ -32,7 +32,7 @@
 #include <kiconloader.h>
 #include <kurlrequester.h>
 #include <kapplication.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <kdevplugin.h>
 #include <kdevmakefrontend.h>
--- a/src/main.cpp
+++ b/src/main.cpp
@ -4,7 +4,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <dcopclient.h>
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@ -4,7 +4,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <dcopclient.h>
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kaboutdata.h>
 #include <kstdaction.h>
 #include <kapplication.h>
@ -37,7 +37,7 @@
 #include <kedittoolbar.h>
 #include <kbugreport.h>
 #include <kurlrequester.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdetexteditor/document.h>
--- a/src/multibuffer.cpp
+++ b/src/multibuffer.cpp
@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <tdeparts/factory.h>
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@ -28,8 +28,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kapplication.h>
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@ -24,16 +24,16 @@
 #include <tdeparts/partmanager.h>
 #include <tdeparts/browserextension.h>
 #include <tdefiledialog.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
 #include <tdehtml_part.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeio/netaccess.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kcompletion.h>
 #include <kdirwatch.h>
 #include <tdeversion.h>
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@ -9,7 +9,7 @@
 #include <kmessagebox.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeparts/componentfactory.h>
 #include <assert.h>
 #include <kdebug.h>
@ -27,7 +27,7 @@
 #include <kdevsourceformatter.h>
 #include <kdevcreatefile.h>
 #include <kdevplugininfo.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <profileengine.h>
--- a/src/profileengine/editor/profileeditor.cpp
+++ b/src/profileengine/editor/profileeditor.cpp
@ -25,8 +25,8 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/src/profileengine/editor/profileeditorbase.ui
+++ b/src/profileengine/editor/profileeditorbase.ui
@ -664,21 +664,21 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kcombobox.h</includehint>
    <includehint>klineedit.h</includehint>
    <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@ -16,9 +16,9 @@ class TQDomDocument;
 #include <kservice.h>
 #include <ktrader.h>
 #include <tdefiledialog.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeparts/componentfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kprocess.h>
--- a/src/settingswidget.ui
+++ b/src/settingswidget.ui
@ -522,7 +522,7 @@
    <includehint>kurlrequester.h</includehint>
    <includehint>klineedit.h</includehint>
    <includehint>kpushbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
    <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@ -21,10 +21,10 @@
 #include <tqtextedit.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdeparts/part.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <klocale.h>
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@ -15,7 +15,7 @@
 #include <tqfileinfo.h>
 #include <tqpopupmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <klocale.h>
--- a/vcs/cvsservice/annotateview.h
+++ b/vcs/cvsservice/annotateview.h
@ -17,7 +17,7 @@
 #define ANNOTATEVIEW_H
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqtooltip.h>
 class TQDateTime;
--- a/vcs/cvsservice/checkoutdialog.cpp
+++ b/vcs/cvsservice/checkoutdialog.cpp
@ -15,7 +15,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurlrequester.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/vcs/cvsservice/checkoutdialogbase.ui
+++ b/vcs/cvsservice/checkoutdialogbase.ui
@ -307,6 +307,6 @@
 <includehints>
    <includehint>klineedit.h</includehint>
    <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@ -17,16 +17,16 @@
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialogbase.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 // Because of KShellProcess::quote()
 #include <kprocess.h>
 #include <kiconloader.h>
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <dcopref.h>
 // CvsService stuff
 #include <repository_stub.h>
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/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>
--- a/vcs/perforce/commitdlg.h
+++ b/vcs/perforce/commitdlg.h
@ -16,7 +16,7 @@
 #include <tqstringlist.h>
 #include <tqtextedit.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kdialogbase.h>
 class TDEProcess;
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@ -15,13 +15,13 @@
 #include <tqfileinfo.h>
 #include <tqpopupmenu.h>
 #include <tqregexp.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include <tdeparts/part.h>
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@ -34,7 +34,7 @@
 #include <tdeio/jobclasses.h>
 #include <tdeio/netaccess.h>
 #include <kdebug.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <ktempfile.h>
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <kapplication.h>
 #include <kdevmainwindow.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqregexp.h>
 #include <tdeio/netaccess.h>
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@ -22,8 +22,8 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdevgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include "kdevcore.h"
 #include "kdevmainwindow.h"