Rename many classes and header files to avoid conflicts with KDE4

44 files changed, 61 insertions, 61 deletions

diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui
index 024caaefe..e7181c521 100644
--- a/kicker/applets/clock/analog.ui
+++ b/kicker/applets/clock/analog.ui
@@ -332,7 +332,7 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">kfontrequester.h</include>
+    <include location="local" impldecl="in implementation">tdefontrequester.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 92420e652..58f6d9da1 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -45,10 +45,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 #include <tdefiledialog.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <kglobalsettings.h>
 #include <tdeconfigdialogmanager.h>
 #include <kcalendarsystem.h>
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index 1450e6f4f..7fad42834 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -289,7 +289,7 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">kfontrequester.h</include>
+    <include location="local" impldecl="in implementation">tdefontrequester.h</include>
     <include location="local" impldecl="in implementation">digital.ui.h</include>
 </includes>
 <Q_SLOTS>
diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui
index 28bcd7185..386315bc2 100644
--- a/kicker/applets/clock/fuzzy.ui
+++ b/kicker/applets/clock/fuzzy.ui
@@ -275,13 +275,13 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">kfontrequester.h</include>
+    <include location="local" impldecl="in implementation">tdefontrequester.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
 </includehints>
 </UI>
diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp
index 8cf336866..4285ff749 100644
--- a/kicker/applets/clock/init.cpp
+++ b/kicker/applets/clock/init.cpp
@@ -45,10 +45,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 #include <tdefiledialog.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <kglobalsettings.h>
 #include <tdeconfigdialogmanager.h>
 #include <kcalendarsystem.h>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 170a830f4..6f63694a4 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -497,7 +497,7 @@
 <includes>
     <include location="local" impldecl="in implementation">tqheader.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">kfontrequester.h</include>
+    <include location="local" impldecl="in implementation">tdefontrequester.h</include>
 </includes>
 <Q_SLOTS>
     <slot>configureType()</slot>
@@ -507,10 +507,10 @@
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index f8c2fc59a..3a313fbe8 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqfile.h>
 #include <tqtooltip.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <time.h>
 #include <stdlib.h> // for getenv()
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index c66f4ceb8..199a7b750 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpopupmenu.h>
 #include <tqtooltip.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kickertip.h>
 #include <klocale.h>
 #include <kdesktopfile.h>
diff --git a/kicker/applets/launcher/quictdelauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp
index 15439f9c9..8a1c1c9dc 100644
--- a/kicker/applets/launcher/quictdelauncher.cpp
+++ b/kicker/applets/launcher/quictdelauncher.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index b6e1e7995..f2aa6be2b 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -24,7 +24,7 @@
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include "mediaapplet.h"
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index a180cfbd9..7f4118bf8 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -38,7 +38,7 @@
 #include <kipc.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <konq_operations.h>
 #include <konq_popupmenu.h>
diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h
index 1bc6380c2..76e448b27 100644
--- a/kicker/applets/media/mediumbutton.h
+++ b/kicker/applets/media/mediumbutton.h
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tdefileitem.h>
 #include <kpanelapplet.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 class MediumButton : public PanelPopupButton
 {
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index bd1a21b0d..8fbd958fa 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -23,7 +23,7 @@
 #include <kmimetype.h>
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdefiledetailview.h>
 
 class MediumTypeItem : public TQCheckListItem
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 6662d57d4..7ff922ed5 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kdebug.h>
 #include <kprocess.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <dcopclient.h>
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index eb1ba784c..78353abbf 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -590,9 +590,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
         bp.drawRect(0, 0, ww, wh);
         bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background());
 
-        Task::List tasklist;
-        tasklist.append(m_currentWindow);
-        TaskDrag* drag = new TaskDrag(tasklist, this);
+        Task::List tastdelist;
+        tastdelist.append(m_currentWindow);
+        TaskDrag* drag = new TaskDrag(tastdelist, this);
         TQPoint offset(m_pager->clickPos.x() - (r.x() * w / dw),
                 m_pager->clickPos.y() - (r.y() * h / dh));
         drag->setPixmap(windowImage, offset);
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 4e3332768..c953ec637 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -32,7 +32,7 @@
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <tqpushbutton.h>
 
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index 5f930190a..eec48637c 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -213,7 +213,7 @@ void RunApplet::run_command(const TQString& command)
 
     _filterData->setData( _input->currentText().stripWhiteSpace() );
     TQStringList filters;
-    filters << "kurisearchfilter" << "kshorturifilter";
+    filters << "kurisearchfilter" << "tdeshorturifilter";
     KURIFilter::self()->filterURI( *(_filterData), filters );
 
     _input->addToHistory(command);
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 850e4a519..c1117fb2d 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <krun.h>
 #include <twinmodule.h>
 #include <kdialogbase.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
 #include <kiconloader.h>
 #include <twin.h>
 
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 478ac01ec..3b7ae419a 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -24,7 +24,7 @@
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include "trashapplet.h"
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index fe8ad3200..526048c59 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -24,7 +24,7 @@
 
 #include <klocale.h>
 #include <krun.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tdeio/netaccess.h>
 
diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index 15c5d598f..bbf596a0c 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tdefileitem.h>
 #include <kpanelapplet.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 class TrashButton : public PanelPopupButton
 {
diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp
index 5a9ea355a..71419922b 100644
--- a/kicker/extensions/dockbar/dockcontainer.cpp
+++ b/kicker/extensions/dockbar/dockcontainer.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqvalidator.h>
 #include <kinputdialog.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 #include "dockcontainer.h"
diff --git a/kicker/extensions/kasbar/CMakeLists.txt b/kicker/extensions/kasbar/CMakeLists.txt
index c9fd0e736..31a1db895 100644
--- a/kicker/extensions/kasbar/CMakeLists.txt
+++ b/kicker/extensions/kasbar/CMakeLists.txt
@@ -33,7 +33,7 @@ set( target kasbar )
 
 set( ${target}_SRCS
   kasbar.cpp kasitem.cpp kastaskitem.cpp kastasker.cpp
-  kaspopup.cpp kastaskpopup.cpp kasstartupitem.cpp
+  kaspopup.cpp kastastdepopup.cpp kasstartupitem.cpp
   kasaboutdlg.cpp kasprefsdlg.cpp kasclockitem.cpp
   kasgroupitem.cpp kasresources.cpp kasgrouper.cpp
   kasloaditem.cpp
diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am
index e186aad17..25635299d 100644
--- a/kicker/extensions/kasbar/Makefile.am
+++ b/kicker/extensions/kasbar/Makefile.am
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkasbar.la
 
 libkasbar_la_SOURCES =	kasbar.cpp kasitem.cpp \
 			kastaskitem.cpp	kastasker.cpp kaspopup.cpp \
-			kastaskpopup.cpp kasstartupitem.cpp \
+			kastastdepopup.cpp kasstartupitem.cpp \
 			kasaboutdlg.cpp kasprefsdlg.cpp kasclockitem.cpp \
 			kasgroupitem.cpp kasresources.cpp kasgrouper.cpp \
 			kasloaditem.cpp
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index 912c9b0d3..b1d4d2c96 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -13,7 +13,7 @@
 #include <kpixmapeffect.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <taskmanager.h>
 
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index 638213e8e..3c73e21f0 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -62,7 +62,7 @@
 #include <kiconloader.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 
 #include <taskmanager.h>
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index f89e210ed..5a62349ce 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -20,7 +20,7 @@
 #include <kpixmapeffect.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <taskmanager.h>
 
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 54ed56e4a..a62b59580 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -54,11 +54,11 @@
 #include <tqapplication.h>
 #include <tqtimer.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 //#include <tdeconfiggroupsaver.h>
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index b986ea54a..fc2bea8bb 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -69,10 +69,10 @@
 #include <kdialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpassivepopup.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <dcopclient.h>
 #include <kapplication.h>
@@ -81,7 +81,7 @@
 #include <taskrmbmenu.h>
 
 #include "kastasker.h"
-#include "kastaskpopup.h"
+#include "kastastdepopup.h"
 #include "kastaskitem.h"
 #include "kasbarextension.h"
 
diff --git a/kicker/extensions/kasbar/kastastdepopup.cpp b/kicker/extensions/kasbar/kastastdepopup.cpp
index 6529fafec..74c8631a7 100644
--- a/kicker/extensions/kasbar/kastastdepopup.cpp
+++ b/kicker/extensions/kasbar/kastastdepopup.cpp
@@ -1,4 +1,4 @@
-/* kastaskpopup.cpp
+/* kastastdepopup.cpp
 **
 ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
 ** Contributor: Mosfet
@@ -63,8 +63,8 @@
 #include "kastaskitem.h"
 #include "kastasker.h"
 
-#include "kastaskpopup.h"
-#include "kastaskpopup.moc"
+#include "kastastdepopup.h"
+#include "kastastdepopup.moc"
 
 static const int TITLE_HEIGHT = 13;
 
diff --git a/kicker/extensions/kasbar/kastastdepopup.h b/kicker/extensions/kasbar/kastastdepopup.h
index dcdc33107..60cff87bb 100644
--- a/kicker/extensions/kasbar/kastastdepopup.h
+++ b/kicker/extensions/kasbar/kastastdepopup.h
@@ -1,4 +1,4 @@
-/* kastaskpopup.h
+/* kastastdepopup.h
 **
 ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
 ** Contributor: Mosfet
diff --git a/kicker/kicker/buttons/bookmarksbutton.cpp b/kicker/kicker/buttons/bookmarksbutton.cpp
index 5dc8190ac..8b4559c52 100644
--- a/kicker/kicker/buttons/bookmarksbutton.cpp
+++ b/kicker/kicker/buttons/bookmarksbutton.cpp
@@ -23,12 +23,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqtooltip.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kbookmark.h>
 #include <kbookmarkmenu.h>
 #include <konqbookmarkmanager.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "bookmarksbutton.h"
 #include "bookmarksbutton.moc"
diff --git a/kicker/kicker/buttons/windowlist.desktop b/kicker/kicker/buttons/windowlist.desktop
index f3d15fd69..3b2e677fb 100644
--- a/kicker/kicker/buttons/windowlist.desktop
+++ b/kicker/kicker/buttons/windowlist.desktop
@@ -25,7 +25,7 @@ Name[fy]=Finsterlistmenu
 Name[gl]=Lista de Fiestras
 Name[he]=תפריט רשימת חלונות
 Name[hr]=Izbornik popisa prozora
-Name[hu]=Ablaklista menü
+Name[hu]=Ablatdelista menü
 Name[is]=Gluggalista valmynd
 Name[it]=Menu elenco delle finestre
 Name[ja]=ウィンドウリストメニュー
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index 969a81847..44bad20b9 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpanelapplet.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index fbf6b9e43..fa4ca15dd 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <khelpmenu.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kstdguiitem.h>
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 6d0f2b542..abe5370a6 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <kaboutkde.h>
 #include <kpixmapeffect.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kbookmarkmenu.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h
index 995cc57b4..27807c939 100644
--- a/kicker/kicker/ui/itemview.h
+++ b/kicker/kicker/ui/itemview.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpixmap.h>
 #include <tqframe.h>
 #include <tqtoolbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqdragobject.h>
 
 #include "kmenubase.h"
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index f19d59d8b..46d66b099 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kaboutkde.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kbookmarkmenu.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <twin.h>
 
 #include "client_mnu.h"
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index a8d69c220..f8e3eaef5 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -46,7 +46,7 @@
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kaboutkde.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kbookmarkmenu.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -64,7 +64,7 @@
 #include <kurllabel.h>
 #include <krun.h>
 #include <kmimetype.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <kcompletionbox.h>
 #include <kurifilter.h>
 #include <kbookmarkmanager.h>
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index 314ceae10..9ace6483e 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -7,7 +7,7 @@
 
 #include <kbookmarkimporter.h>
 #include <kmimetype.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 3284c7a03..420a17c3b 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -5,7 +5,7 @@
 
 #include <kbookmarkimporter.h>
 #include <kmimetype.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 //#include <kbookmarkmenu.h>
@@ -16,7 +16,7 @@
 
 #include <tqfile.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 95f46dadc..c30ff04b4 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kglobalsettings.h>
 #include <kapplication.h>
 #include <kurldrag.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 
 #include "recentdocsmenu.h"
 
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index a02d88a6a..00a4b1a59 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -44,7 +44,7 @@ using namespace std;
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kpixmap.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <kservice.h>
 #include <kservicegroup.h>
 #include <kstandarddirs.h>
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 18f04452f..8803b1cd1 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -93,7 +93,7 @@ TaskManager::~TaskManager()
 
 void TaskManager::configure_startup()
 {
-    TDEConfig c("klaunchrc", true);
+    TDEConfig c("tdelaunchrc", true);
     c.setGroup("FeedbackStyle");
     if (!c.readBoolEntry("TaskbarButton", false))
         return;