From a9184bb205c837f932e03b2a6cac578582f36ed5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:17:49 -0600
Subject: [PATCH] Rename many classes and header files to avoid conflicts with
 KDE4

---
 atlantikdesigner/designer/designer.cpp        |   4 +-
 atlantikdesigner/designer/designer.h          |   2 +-
 atlantikdesigner/designer/editor.cpp          |   2 +-
 atlantikdesigner/designer/editor.h            |   2 +-
 atlantikdesigner/designer/group.cpp           |   2 +-
 .../plugin_katesymbolviewer.cpp               |   2 +-
 .../cppsymbolviewer/plugin_katesymbolviewer.h |   2 +-
 kate/filelistloader/katefll_initplugin.cpp    |   2 +-
 kate/filelistloader/katefll_plugin.cpp        |   2 +-
 kate/filetemplates/plugin/filetemplates.cpp   |   6 +-
 kate/helloworld/plugin_katehelloworld.cpp     |   2 +-
 kate/htmltools/plugin_katehtmltools.cpp       |   2 +-
 .../plugin_kateinsertcommand.cpp              |   2 +-
 kate/kpybrowser/kpybrowser.h                  |   2 +-
 kate/kpybrowser/pybrowse_part.cpp             |   2 +-
 kate/make/plugin_katemake.cpp                 |   2 +-
 kate/modeline/ModelinePlugin.cpp              |   2 +-
 kate/openheader/plugin_kateopenheader.cpp     |   2 +-
 kate/snippets/csnippet.h                      |   2 +-
 kate/snippets/plugin_katesnippets.cpp         |   2 +-
 .../plugin_katetabbarextension.cpp            |   4 +-
 .../plugin_katetabbarextension.h              |   2 +-
 kate/textfilter/plugin_katetextfilter.cpp     |   2 +-
 kate/xmlcheck/plugin_katexmlcheck.cpp         |   2 +-
 kate/xmltools/plugin_katexmltools.cpp         |   2 +-
 kicker-applets/kbinaryclock/kbinaryclock.cpp  |   2 +-
 kicker-applets/kolourpicker/kolourpicker.cpp  |   2 +-
 kicker-applets/ktimemon/timemon.cc            |   2 +-
 kicker-applets/math/mathapplet.cpp            |   2 +-
 kicker-applets/mediacontrol/mediacontrol.cpp  |   2 +-
 .../mediacontrol/mediacontrolconfig.cpp       |   2 +-
 .../mediacontrol/mediacontrolconfigwidget.ui  |   8 +-
 konq-plugins/adblock/adblock.cpp              |   2 +-
 konq-plugins/adblock/adblockdialogue.cpp      |   2 +-
 konq-plugins/akregator/akregatorplugin.cpp    |   4 +-
 konq-plugins/akregator/konqfeedicon.h         |   2 +-
 konq-plugins/arkplugin/arkplugin.cpp          |   4 +-
 konq-plugins/autorefresh/autorefresh.cpp      |   2 +-
 konq-plugins/babelfish/plugin_babelfish.cpp   |   2 +-
 konq-plugins/crashes/crashesplugin.cpp        |   4 +-
 konq-plugins/dirfilter/dirfilterplugin.cpp    |   8 +-
 konq-plugins/domtreeviewer/Makefile.am        |   2 +-
 konq-plugins/domtreeviewer/domtreeview.cpp    |   6 +-
 konq-plugins/domtreeviewer/domtreeviewbase.ui |   4 +-
 konq-plugins/domtreeviewer/domtreewindow.cpp  |   6 +-
 konq-plugins/domtreeviewer/domtreewindow.h    |   2 +-
 .../domtreeviewer/plugin_domtreeviewer.cpp    |   2 +-
 konq-plugins/fsview/fsview_part.cpp           |   4 +-
 .../kimgalleryplugin/imgallerydialog.cpp      |   2 +-
 .../kimgalleryplugin/imgalleryplugin.cpp      |   2 +-
 konq-plugins/kuick/kdirmenu.cpp               |   2 +-
 konq-plugins/kuick/kmetamenu.h                |   2 +-
 konq-plugins/kuick/kuick_plugin.cpp           |   2 +-
 konq-plugins/microformat/konqmficon.h         |   2 +-
 konq-plugins/minitools/minitoolsplugin.cpp    |   4 +-
 konq-plugins/rellinks/plugin_rellinks.cpp     | 184 +++++++++---------
 konq-plugins/rellinks/plugin_rellinks.h       |   4 +-
 konq-plugins/rsync/rsyncplugin.cpp            |   8 +-
 konq-plugins/searchbar/searchbar.cpp          |   2 +-
 .../sidebar/delicious/bookmarkListItem.h      |   2 +-
 konq-plugins/sidebar/delicious/mainWidget.cpp |   2 +-
 konq-plugins/sidebar/delicious/widget.ui      |   2 +-
 konq-plugins/sidebar/mediaplayer/controls.h   |   4 +-
 .../sidebar/metabar/src/configdialog.h        |   4 +-
 .../sidebar/metabar/src/metabarwidget.cpp     |   6 +-
 .../sidebar/metabar/src/metabarwidget.h       |   2 +-
 .../sidebar/metabar/src/serviceloader.cpp     |   6 +-
 .../sidebar/metabar/src/serviceloader.h       |   2 +-
 konq-plugins/sidebar/newsticker/nspanel.cpp   |   2 +-
 konq-plugins/sidebar/newsticker/nspanel.h     |   2 +-
 .../sidebar/newsticker/nsstacktabwidget.cpp   |   2 +-
 .../tdehtmlsettingsplugin/settingsplugin.cpp  |   4 +-
 konq-plugins/uachanger/uachangerplugin.cpp    |   4 +-
 konq-plugins/validators/plugin_validators.cpp |   2 +-
 konq-plugins/webarchiver/archivedialog.cpp    |   2 +-
 konq-plugins/webarchiver/archiveviewbase.ui   |   2 +-
 .../webarchiver/plugin_webarchiver.cpp        |   2 +-
 ksig/ksig.cpp                                 |   4 +-
 ksig/ksig.h                                   |   2 +-
 ksig/siglistview.h                            |   2 +-
 noatun-plugins/alsaplayer/userinterface.cpp   |   2 +-
 noatun-plugins/dub/dub/dub.h                  |   2 +-
 noatun-plugins/dub/dub/dubapp.h               |   6 +-
 noatun-plugins/dub/dub/fileselectorwidget.h   |   2 +-
 noatun-plugins/lyrics/cmodule.cpp             |   2 +-
 noatun-plugins/lyrics/lyrics.h                |   4 +-
 noatun-plugins/nexscope/gui.cpp               |   2 +-
 noatun-plugins/nexscope/gui.h                 |   4 +-
 noatun-plugins/oblique/cmodule.cpp            |   2 +-
 noatun-plugins/oblique/menu.h                 |   4 +-
 noatun-plugins/oblique/tree.h                 |   2 +-
 noatun-plugins/oblique/view.h                 |   4 +-
 noatun-plugins/wavecapture/wavecapture.cpp    |   4 +-
 93 files changed, 224 insertions(+), 224 deletions(-)

diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 35b64fb..9e0f536 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -13,7 +13,7 @@
 #include <tqtimer.h>
 #include <tqwidget.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -21,7 +21,7 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h
index a10ee1e..92d2b01 100644
--- a/atlantikdesigner/designer/designer.h
+++ b/atlantikdesigner/designer/designer.h
@@ -7,7 +7,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "boardinfo.h"
 #include "group.h"
diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp
index 4825362..3a61a5e 100644
--- a/atlantikdesigner/designer/editor.cpp
+++ b/atlantikdesigner/designer/editor.cpp
@@ -17,7 +17,7 @@
 #include <kdialog.h>
 #include <kdialogbase.h>
 #include <klineeditdlg.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h
index 3439f81..690880e 100644
--- a/atlantikdesigner/designer/editor.h
+++ b/atlantikdesigner/designer/editor.h
@@ -1,7 +1,7 @@
 #ifndef ATLANTIK_EDITOR_H
 #define ATLANTIK_EDITOR_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqstring.h>
 #include <tqcolor.h>
 #include <tqstringlist.h>
diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp
index 03dabbf..b284b82 100644
--- a/atlantikdesigner/designer/group.cpp
+++ b/atlantikdesigner/designer/group.cpp
@@ -11,7 +11,7 @@
 #include <kdebug.h>
 #include <klineedit.h>
 #include <klineeditdlg.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
index d12bb99..f2c8419 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
@@ -41,7 +41,7 @@
 #include "plugin_katesymbolviewer.h"
 #include "plugin_katesymbolviewer.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kgenericfactory.h>
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
index 9e7a59a..ec3cf0a 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
@@ -38,7 +38,7 @@
 #include <tqregexp.h>
 #include <klibloader.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 
diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp
index b0530c5..a1d5ec7 100644
--- a/kate/filelistloader/katefll_initplugin.cpp
+++ b/kate/filelistloader/katefll_initplugin.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfileinfo.h>
 #include <kgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index f3f6f4d..8a6fd79 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfileinfo.h>
 #include <kgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 4fdf1d8..932d49d 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -24,8 +24,8 @@
 #include <kate/document.h>
 
 #include <kaboutdata.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
@@ -35,7 +35,7 @@
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knewstuff/knewstuff.h>
diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp
index f44cd66..e710c83 100644
--- a/kate/helloworld/plugin_katehelloworld.cpp
+++ b/kate/helloworld/plugin_katehelloworld.cpp
@@ -2,7 +2,7 @@
 #include "plugin_katehelloworld.h"
 #include "plugin_katehelloworld.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 
diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp
index a1fb5e1..02b2cba 100644
--- a/kate/htmltools/plugin_katehtmltools.cpp
+++ b/kate/htmltools/plugin_katehtmltools.cpp
@@ -19,7 +19,7 @@
 #include "plugin_katehtmltools.moc"
 
 #include <klineeditdlg.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <cassert>
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index edf269e..84fbfc5 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -30,7 +30,7 @@
 #include <tqwhatsthis.h>
 #include <tqwidget.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kanimwidget.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kate/kpybrowser/kpybrowser.h b/kate/kpybrowser/kpybrowser.h
index d8a0afb..8a23437 100644
--- a/kate/kpybrowser/kpybrowser.h
+++ b/kate/kpybrowser/kpybrowser.h
@@ -23,7 +23,7 @@
 #endif
 
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstring.h>
 #include <tqvaluelist.h>
 #include <tqtooltip.h>
diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp
index 788bac8..61732b4 100644
--- a/kate/kpybrowser/pybrowse_part.cpp
+++ b/kate/kpybrowser/pybrowse_part.cpp
@@ -21,7 +21,7 @@
 #include "pybrowse.xpm"
 
 #include <kgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index f2dfd1f..3bf75e7 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -40,7 +40,7 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kdockwidget.h>
diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp
index 59f6a27..7d05b9e 100644
--- a/kate/modeline/ModelinePlugin.cpp
+++ b/kate/modeline/ModelinePlugin.cpp
@@ -18,7 +18,7 @@
 #include <tqregexp.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 
 #include <kate/application.h>
diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp
index fde6fad..139c49d 100644
--- a/kate/openheader/plugin_kateopenheader.cpp
+++ b/kate/openheader/plugin_kateopenheader.cpp
@@ -20,7 +20,7 @@
 
 #include <tqfileinfo.h>
 #include <kgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
diff --git a/kate/snippets/csnippet.h b/kate/snippets/csnippet.h
index c341194..b453175 100644
--- a/kate/snippets/csnippet.h
+++ b/kate/snippets/csnippet.h
@@ -12,7 +12,7 @@
 
 #include <tqobject.h>
 #include <tqlistview.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqsignalmapper.h>
 
 /**
diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp
index f28b944..629cc87 100644
--- a/kate/snippets/plugin_katesnippets.cpp
+++ b/kate/snippets/plugin_katesnippets.cpp
@@ -4,7 +4,7 @@
 
 #include "plugin_katesnippets.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kgenericfactory.h>
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index 4f553d3..616f284 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -26,13 +26,13 @@
 // BEGIN INCLUDES
 #include "plugin_katetabbarextension.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 
 #include <kdebug.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index ec808cf..7d625f9 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -37,7 +37,7 @@
 
 #include <klibloader.h>
 #include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <tqwidget.h>
 #include <tqpushbutton.h>
diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp
index f1c10e5..cfe2793 100644
--- a/kate/textfilter/plugin_katetextfilter.cpp
+++ b/kate/textfilter/plugin_katetextfilter.cpp
@@ -18,7 +18,7 @@
 #include "plugin_katetextfilter.h"
 #include "plugin_katetextfilter.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index 49f2af2..c5f3a7b 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -40,7 +40,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kdockwidget.h>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index 8daeb83..6ebd9d9 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -89,7 +89,7 @@ TODO:
 #include <tqstring.h>
 #include <tqtimer.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kbuttonbox.h>
 #include <klineedit.h>
 #include <kcursor.h>
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 4bbba09..daac71f 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -27,7 +27,7 @@
 
 #include <tqradiobutton.h>
 #include <kcolorbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqslider.h>
 #include <tqcursor.h>
 #include <tqtimer.h>
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index 37dd1ca..f2f4cbd 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -38,7 +38,7 @@ $Id$
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "kolourpicker.h"
 #include "kolourpicker.moc"
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index 1487a81..ec90f08 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -21,7 +21,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index 88350fb..8a868cf 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdialog.h>
 #include <krun.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "parser.h"
 
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index ec09ddb..23cfd83 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -42,7 +42,7 @@
 #include <tqslider.h>
 #include <tqpainter.h>
 #include <tqiconset.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <kapplication.h>
 #include <kipc.h>
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index 8a10717..b423fdb 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -37,7 +37,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
index 1f1b835..6d28ca3 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
+++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
@@ -359,16 +359,16 @@
     <include location="local" impldecl="in implementation"></include>
     <include location="local" impldecl="in declaration"></include>
     <include location="global" impldecl="in declaration">knuminput.h</include>
-    <include location="global" impldecl="in declaration">klistview.h</include>
-    <include location="global" impldecl="in declaration">klistbox.h</include>
+    <include location="global" impldecl="in declaration">tdelistview.h</include>
+    <include location="global" impldecl="in declaration">tdelistbox.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>toggled(bool)</signal>
 </Q_SIGNALS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index f52fbc0..a62f457 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -37,7 +37,7 @@
 #include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kcmultidialog.h>
 #include <klocale.h>
 #include <dom/html_document.h>
diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp
index 48c7090..8198dd3 100644
--- a/konq-plugins/adblock/adblockdialogue.cpp
+++ b/konq-plugins/adblock/adblockdialogue.cpp
@@ -21,7 +21,7 @@
 #include "adblockdialogue.h"
 
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 
 #include <tqcursor.h>
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index 72a73d1..372c2e4 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -27,11 +27,11 @@
 #include <kapplication.h>
 #include <kmimetype.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <konq_popupmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 #include <kurl.h>
 #include <tdehtml_part.h>
diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h
index 3b6b470..4f102b1 100644
--- a/konq-plugins/akregator/konqfeedicon.h
+++ b/konq-plugins/akregator/konqfeedicon.h
@@ -27,7 +27,7 @@
 
 #include <tqguardedptr.h>
 #include <tdeparts/plugin.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include "feeddetector.h"
 #include "pluginbase.h"
 
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index 9e812c3..fd4c06c 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -24,11 +24,11 @@
 #include <kstandarddirs.h>
 #include <kmimetype.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <konq_popupmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp
index 9393aba..38e343b 100644
--- a/konq-plugins/autorefresh/autorefresh.cpp
+++ b/konq-plugins/autorefresh/autorefresh.cpp
@@ -8,7 +8,7 @@
 #include <tdehtml_part.h> // this plugin applies to a tdehtml part
 #include <kdebug.h>
 #include "autorefresh.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <kiconloader.h>
 #include <tqmessagebox.h>
diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp
index 98c37c6..ae39713 100644
--- a/konq-plugins/babelfish/plugin_babelfish.cpp
+++ b/konq-plugins/babelfish/plugin_babelfish.cpp
@@ -20,7 +20,7 @@
 */
 #include "plugin_babelfish.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp
index 6aec893..268d7f6 100644
--- a/konq-plugins/crashes/crashesplugin.cpp
+++ b/konq-plugins/crashes/crashesplugin.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kinstance.h>
@@ -29,7 +29,7 @@
 #include <krun.h>
 #include <kservice.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kbookmarkimporter_crash.h>
 
 #include "crashesplugin.h"
diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp
index d92ce52..33c965b 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.cpp
+++ b/konq-plugins/dirfilter/dirfilterplugin.cpp
@@ -26,19 +26,19 @@
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 #include <tqiconview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kinstance.h>
 
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 
 #include <kdirlister.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <kiconviewsearchline.h>
 #include <konq_dirpart.h>
 #include <konq_propsview.h>
diff --git a/konq-plugins/domtreeviewer/Makefile.am b/konq-plugins/domtreeviewer/Makefile.am
index e6d19e3..2d5c781 100644
--- a/konq-plugins/domtreeviewer/Makefile.am
+++ b/konq-plugins/domtreeviewer/Makefile.am
@@ -18,7 +18,7 @@ libdomtreeviewerplugin_la_SOURCES = 	plugin_domtreeviewer.cpp \
 					elementeditdialog.ui \
 					texteditdialog.ui \
 					messagedialog.ui
-#					klistview.cpp \
+#					tdelistview.cpp \
 #
 libdomtreeviewerplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEHTML)
 libdomtreeviewerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 32681ba..c474414 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -45,7 +45,7 @@
 #include <dom/dom_core.h>
 #include <dom/html_base.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <kdialog.h>
@@ -54,11 +54,11 @@
 #include <kglobalsettings.h>
 #include <tdehtml_part.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstdguiitem.h>
 #include <ktextedit.h>
 
diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui
index fb0a39e..09225c7 100644
--- a/konq-plugins/domtreeviewer/domtreeviewbase.ui
+++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui
@@ -514,12 +514,12 @@
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>ktextedit.h</includehint>
 </includehints>
 </UI>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 4eb5dce..c0ec594 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -24,7 +24,7 @@
 #include "messagedialog.h"
 #include "plugin_domtreeviewer.h"
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
 #include <kcommand.h>
 #include <tdeconfig.h>
@@ -46,8 +46,8 @@
 
 #include <kedittoolbar.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <tqdatetime.h>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h
index b2b0042..d5ef8f3 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.h
+++ b/konq-plugins/domtreeviewer/domtreewindow.h
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <tqguardedptr.h>
 
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
index a83bd1d..0a38c77 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
@@ -2,7 +2,7 @@
 #include "domtreewindow.h"
 #include "domtreeview.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klibloader.h>
 
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index cff68f1..0676b41 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -31,8 +31,8 @@
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kglobalsettings.h>
 #include <kprotocolinfo.h>
 #include <tdeio/job.h>
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 183ff13..964628a 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -31,7 +31,7 @@ Boston, MA 02110-1301, USA.
 
 #include <klocale.h>
 #include <kurl.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klineedit.h>
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index 71b3dce..34eeca6 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.
 #include <tqtextcodec.h>
 #include <tqstylesheet.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kcharsets.h>
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 20c2033..3c4dac1 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -21,7 +21,7 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <tdeio/global.h>
diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h
index e22ff19..2663157 100644
--- a/konq-plugins/kuick/kmetamenu.h
+++ b/konq-plugins/kuick/kmetamenu.h
@@ -23,7 +23,7 @@
 #include <tqpopupmenu.h>
 #include <tqptrlist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TQIconSet;
 class TQStringList;
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index cb8730a..2cabd4d 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -22,7 +22,7 @@
 #include "kdirmenu.h"
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <kiconloader.h>
 #include <tdeimproxy.h>
diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h
index d29a750..a69eee5 100644
--- a/konq-plugins/microformat/konqmficon.h
+++ b/konq-plugins/microformat/konqmficon.h
@@ -26,7 +26,7 @@
 
 #include <tdehtml_part.h>
 #include <tdeparts/plugin.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include "pluginbase.h"
 
 /**
diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp
index 3059584..c7fad81 100644
--- a/konq-plugins/minitools/minitoolsplugin.cpp
+++ b/konq-plugins/minitools/minitoolsplugin.cpp
@@ -21,7 +21,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kinstance.h>
@@ -33,7 +33,7 @@
 #include <krun.h>
 #include <kservice.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kbookmarkimporter.h>
 #include <kbookmarkmanager.h>
 
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index 880a448..374e888 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -32,7 +32,7 @@
 #include <dom/dom_element.h>
 #include <dom/dom_string.h>
 #include <dom/html_document.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <tdehtml_part.h>
@@ -40,9 +40,9 @@
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <kshortcut.h>
-#include <ktoolbar.h>
+#include <tdepopupmenu.h>
+#include <tdeshortcut.h>
+#include <tdetoolbar.h>
 #include <kurl.h>
 
 // local includes
@@ -70,106 +70,106 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin
     setInstance(RelLinksFactory::instance());
 
     // ------------- Navigation links --------------
-    kaction_map["home"] =  new TDEAction( i18n("&Top"), "2uparrow", TDEShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" );
-    kaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") );
+    tdeaction_map["home"] =  new TDEAction( i18n("&Top"), "2uparrow", TDEShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" );
+    tdeaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") );
 
-    kaction_map["up"] =  new TDEAction( i18n("&Up"), "1uparrow", TDEShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" );
-    kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") );
+    tdeaction_map["up"] =  new TDEAction( i18n("&Up"), "1uparrow", TDEShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" );
+    tdeaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") );
 
     bool isRTL = TQApplication::reverseLayout();
 
-    kaction_map["begin"] =  new TDEAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", TDEShortcut("Ctrl+Alt+F"), this,  TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" );
-    kaction_map["begin"]->setWhatsThis( i18n("<p>This link type tells search engines which document is considered by the author to be the starting point of the collection.</p>") );
+    tdeaction_map["begin"] =  new TDEAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", TDEShortcut("Ctrl+Alt+F"), this,  TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" );
+    tdeaction_map["begin"]->setWhatsThis( i18n("<p>This link type tells search engines which document is considered by the author to be the starting point of the collection.</p>") );
 
-    kaction_map["prev"] =  new TDEAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", TDEShortcut("Ctrl+Alt+P"), this,  TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" );
-    kaction_map["prev"]->setWhatsThis( i18n("<p>This link references the previous document in an ordered series of documents.</p>") );
+    tdeaction_map["prev"] =  new TDEAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", TDEShortcut("Ctrl+Alt+P"), this,  TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" );
+    tdeaction_map["prev"]->setWhatsThis( i18n("<p>This link references the previous document in an ordered series of documents.</p>") );
 
-    kaction_map["next"] =  new TDEAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", TDEShortcut("Ctrl+Alt+N"), this,  TQT_SLOT(goNext()), actionCollection(), "rellinks_next" );
-    kaction_map["next"]->setWhatsThis( i18n("<p>This link references the next document in an ordered series of documents.</p>") );
+    tdeaction_map["next"] =  new TDEAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", TDEShortcut("Ctrl+Alt+N"), this,  TQT_SLOT(goNext()), actionCollection(), "rellinks_next" );
+    tdeaction_map["next"]->setWhatsThis( i18n("<p>This link references the next document in an ordered series of documents.</p>") );
 
-    kaction_map["last"] =  new TDEAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", TDEShortcut("Ctrl+Alt+L"), this,  TQT_SLOT(goLast()), actionCollection(), "rellinks_last" );
-    kaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") );
+    tdeaction_map["last"] =  new TDEAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", TDEShortcut("Ctrl+Alt+L"), this,  TQT_SLOT(goLast()), actionCollection(), "rellinks_last" );
+    tdeaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") );
 
     // ------------ special items --------------------------
-    kaction_map["search"]  = new TDEAction( i18n("&Search"), "filefind", TDEShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" );
-    kaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") );
+    tdeaction_map["search"]  = new TDEAction( i18n("&Search"), "filefind", TDEShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" );
+    tdeaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") );
 
     // ------------ Document structure links ---------------
     m_document = new TDEActionMenu( i18n("Document"),  "contents", actionCollection(), "rellinks_document" );
     m_document->setWhatsThis( i18n("<p>This menu contains the links referring the document information.</p>") );
     m_document->setDelayed(false);
 
-    kaction_map["contents"] = new TDEAction( i18n("Table of &Contents"), "contents", TDEShortcut("Ctrl+Alt+C"),  this,  TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" );
-    m_document->insert(kaction_map["contents"]);
-    kaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") );
-
-    kactionmenu_map["chapter"] = new TDEActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" );
-    m_document->insert(kactionmenu_map["chapter"]);
-    connect( kactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int)));
-    kactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") );
-    kactionmenu_map["chapter"]->setDelayed(false);
-
-    kactionmenu_map["section"] = new TDEActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" );
-    m_document->insert(kactionmenu_map["section"]);
-    connect( kactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) );
-    kactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") );
-    kactionmenu_map["section"]->setDelayed(false);
-
-    kactionmenu_map["subsection"] = new TDEActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" );
-    m_document->insert(kactionmenu_map["subsection"]);
-    connect( kactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) );
-    kactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") );
-    kactionmenu_map["subsection"]->setDelayed(false);
-
-    kactionmenu_map["appendix"] = new TDEActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" );
-    m_document->insert(kactionmenu_map["appendix"]);
-    connect( kactionmenu_map["appendix"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAppendix( int ) ) );
-    kactionmenu_map["appendix"]->setWhatsThis( i18n("<p>This link references the appendix.</p>") );
-    kactionmenu_map["appendix"]->setDelayed(false);
-
-    kaction_map["glossary"] = new TDEAction( i18n("&Glossary"), "flag", TDEShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" );
-    m_document->insert(kaction_map["glossary"]);
-    kaction_map["glossary"]->setWhatsThis( i18n("<p>This link references the glossary.</p>") );
-
-    kaction_map["index"] = new TDEAction( i18n("&Index"), "info", TDEShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" );
-    m_document->insert(kaction_map["index"]);
-    kaction_map["index"]->setWhatsThis( i18n("<p>This link references the index.</p>") );
+    tdeaction_map["contents"] = new TDEAction( i18n("Table of &Contents"), "contents", TDEShortcut("Ctrl+Alt+C"),  this,  TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" );
+    m_document->insert(tdeaction_map["contents"]);
+    tdeaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") );
+
+    tdeactionmenu_map["chapter"] = new TDEActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" );
+    m_document->insert(tdeactionmenu_map["chapter"]);
+    connect( tdeactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int)));
+    tdeactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") );
+    tdeactionmenu_map["chapter"]->setDelayed(false);
+
+    tdeactionmenu_map["section"] = new TDEActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" );
+    m_document->insert(tdeactionmenu_map["section"]);
+    connect( tdeactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) );
+    tdeactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") );
+    tdeactionmenu_map["section"]->setDelayed(false);
+
+    tdeactionmenu_map["subsection"] = new TDEActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" );
+    m_document->insert(tdeactionmenu_map["subsection"]);
+    connect( tdeactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) );
+    tdeactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") );
+    tdeactionmenu_map["subsection"]->setDelayed(false);
+
+    tdeactionmenu_map["appendix"] = new TDEActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" );
+    m_document->insert(tdeactionmenu_map["appendix"]);
+    connect( tdeactionmenu_map["appendix"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAppendix( int ) ) );
+    tdeactionmenu_map["appendix"]->setWhatsThis( i18n("<p>This link references the appendix.</p>") );
+    tdeactionmenu_map["appendix"]->setDelayed(false);
+
+    tdeaction_map["glossary"] = new TDEAction( i18n("&Glossary"), "flag", TDEShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" );
+    m_document->insert(tdeaction_map["glossary"]);
+    tdeaction_map["glossary"]->setWhatsThis( i18n("<p>This link references the glossary.</p>") );
+
+    tdeaction_map["index"] = new TDEAction( i18n("&Index"), "info", TDEShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" );
+    m_document->insert(tdeaction_map["index"]);
+    tdeaction_map["index"]->setWhatsThis( i18n("<p>This link references the index.</p>") );
 
     // Other links
     m_more  = new TDEActionMenu( i18n("More"), "misc", actionCollection(), "rellinks_more" );
     m_more->setWhatsThis( i18n("<p>This menu contains other important links.</p>") );
     m_more->setDelayed(false);
 
-    kaction_map["help"] = new TDEAction( i18n("&Help"), "help", TDEShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" );
-    m_more->insert(kaction_map["help"]);
-    kaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") );
+    tdeaction_map["help"] = new TDEAction( i18n("&Help"), "help", TDEShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" );
+    m_more->insert(tdeaction_map["help"]);
+    tdeaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") );
 
-    kaction_map["author"]  = new TDEAction( i18n("&Authors"), "mail_new", TDEShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" );
-    m_more->insert(kaction_map["author"]);
-    kaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") );
+    tdeaction_map["author"]  = new TDEAction( i18n("&Authors"), "mail_new", TDEShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" );
+    m_more->insert(tdeaction_map["author"]);
+    tdeaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") );
 
-    kaction_map["copyright"]   = new TDEAction( i18n("Copy&right"), "signature", TDEShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" );
-    m_more->insert(kaction_map["copyright"]);
-    kaction_map["copyright"]->setWhatsThis( i18n("<p>This link references the copyright.</p>") );
+    tdeaction_map["copyright"]   = new TDEAction( i18n("Copy&right"), "signature", TDEShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" );
+    m_more->insert(tdeaction_map["copyright"]);
+    tdeaction_map["copyright"]->setWhatsThis( i18n("<p>This link references the copyright.</p>") );
 
-    kactionmenu_map["bookmark"] = new TDEActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" );
-    m_more->insert(kactionmenu_map["bookmark"]);
-    kactionmenu_map["bookmark"]->setWhatsThis( i18n("<p>This menu references the bookmarks.</p>") );
-    connect( kactionmenu_map["bookmark"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goBookmark( int ) ) );
-    kactionmenu_map["bookmark"]->setDelayed(false);
+    tdeactionmenu_map["bookmark"] = new TDEActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" );
+    m_more->insert(tdeactionmenu_map["bookmark"]);
+    tdeactionmenu_map["bookmark"]->setWhatsThis( i18n("<p>This menu references the bookmarks.</p>") );
+    connect( tdeactionmenu_map["bookmark"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goBookmark( int ) ) );
+    tdeactionmenu_map["bookmark"]->setDelayed(false);
 
-    kactionmenu_map["alternate"] = new TDEActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" );
-    m_more->insert(kactionmenu_map["alternate"]);
-    kactionmenu_map["alternate"]->setWhatsThis( i18n("<p>This link references the alternate versions of this document.</p>") );
-    connect( kactionmenu_map["alternate"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAlternate( int ) ) );
-    kactionmenu_map["alternate"]->setDelayed(false);
+    tdeactionmenu_map["alternate"] = new TDEActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" );
+    m_more->insert(tdeactionmenu_map["alternate"]);
+    tdeactionmenu_map["alternate"]->setWhatsThis( i18n("<p>This link references the alternate versions of this document.</p>") );
+    connect( tdeactionmenu_map["alternate"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAlternate( int ) ) );
+    tdeactionmenu_map["alternate"]->setDelayed(false);
 
     // Unclassified menu
     m_links = new TDEActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" );
-    kactionmenu_map["unclassified"] = m_links;
-    kactionmenu_map["unclassified"]->setWhatsThis( i18n("<p>Miscellaneous links.</p>") );
-    connect( kactionmenu_map["unclassified"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAllElements( int ) ) );
-    kactionmenu_map["unclassified"]->setDelayed(false);
+    tdeactionmenu_map["unclassified"] = m_links;
+    tdeactionmenu_map["unclassified"]->setWhatsThis( i18n("<p>Miscellaneous links.</p>") );
+    connect( tdeactionmenu_map["unclassified"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAllElements( int ) ) );
+    tdeactionmenu_map["unclassified"]->setDelayed(false);
 
     // We unactivate all the possible actions
     disableAll();
@@ -325,33 +325,33 @@ void RelLinksPlugin::updateToolbar() {
 
         // -- Buttons or menu items activation / creation --
         if (lrel == "bookmark" || lrel == "alternate") {
-            int id = kactionmenu_map[lrel]->popupMenu()->insertItem( title );
+            int id = tdeactionmenu_map[lrel]->popupMenu()->insertItem( title );
             m_more->setEnabled(true);
-            kactionmenu_map[lrel]->setEnabled(true);
+            tdeactionmenu_map[lrel]->setEnabled(true);
             element_map[lrel][id] = e;
 
         } else if (lrel == "appendix" || lrel == "chapter" || lrel == "section" || lrel == "subsection") {
-            int id = kactionmenu_map[lrel]->popupMenu()->insertItem( title );
+            int id = tdeactionmenu_map[lrel]->popupMenu()->insertItem( title );
             m_document->setEnabled(true);
-            kactionmenu_map[lrel]->setEnabled(true);
+            tdeactionmenu_map[lrel]->setEnabled(true);
             element_map[lrel][id] = e;
 
         } else {
             // It is a unique action
             element_map[lrel][0] = e;
-            if (kaction_map[lrel]) {
-                kaction_map[lrel]->setEnabled(true);
+            if (tdeaction_map[lrel]) {
+                tdeaction_map[lrel]->setEnabled(true);
                 // Tooltip
                 if (hreflang.isEmpty()) {
-                    kaction_map[lrel]->setToolTip( title );
+                    tdeaction_map[lrel]->setToolTip( title );
                 } else {
-                    kaction_map[lrel]->setToolTip( title + " [" + hreflang + "]");
+                    tdeaction_map[lrel]->setToolTip( title + " [" + hreflang + "]");
                 }
             } else {
                 // For the moment all the elements are reference in a separated menu
                 // TODO : reference the unknown ?
-                int id = kactionmenu_map["unclassified"]->popupMenu()->insertItem( lrel + " : " + title );
-                kactionmenu_map["unclassified"]->setEnabled(true);
+                int id = tdeactionmenu_map["unclassified"]->popupMenu()->insertItem( lrel + " : " + title );
+                tdeactionmenu_map["unclassified"]->setEnabled(true);
                 element_map["unclassified"][id] = e;
             }
 
@@ -398,8 +398,8 @@ void RelLinksPlugin::guessRelations()
 		DOM::Element e= m_part->document().createElement("link");
 		e.setAttribute("href",href);
 		element_map["next"][0] = e;
-		kaction_map["next"]->setEnabled(true);
-		kaction_map["next"]->setToolTip( title );
+		tdeaction_map["next"]->setEnabled(true);
+		tdeaction_map["next"]->setToolTip( title );
 
 		if(val>1)
 		{
@@ -412,8 +412,8 @@ void RelLinksPlugin::guessRelations()
 			e= m_part->document().createElement("link");
 			e.setAttribute("href",href);
 			element_map["prev"][0] = e;
-			kaction_map["prev"]->setEnabled(true);
-			kaction_map["prev"]->setToolTip( title );
+			tdeaction_map["prev"]->setEnabled(true);
+			tdeaction_map["prev"]->setToolTip( title );
 		}
 	}
 }
@@ -533,7 +533,7 @@ void RelLinksPlugin::disableAll() {
 
     // Clear actions
     TDEActionMap::Iterator it;
-    for ( it = kaction_map.begin(); it != kaction_map.end(); ++it ) {
+    for ( it = tdeaction_map.begin(); it != tdeaction_map.end(); ++it ) {
         // If I don't test it crash :(
         if (it.data()) {
             it.data()->setEnabled(false);
@@ -543,7 +543,7 @@ void RelLinksPlugin::disableAll() {
 
     // Clear actions
     TDEActionMenuMap::Iterator itmenu;
-    for ( itmenu = kactionmenu_map.begin(); itmenu != kactionmenu_map.end(); ++itmenu ) {
+    for ( itmenu = tdeactionmenu_map.begin(); itmenu != tdeactionmenu_map.end(); ++itmenu ) {
         // If I don't test it crash :(
         if (itmenu.data()) {
             itmenu.data()->popupMenu()->clear();
diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h
index d82402e..ea42cd5 100644
--- a/konq-plugins/rellinks/plugin_rellinks.h
+++ b/konq-plugins/rellinks/plugin_rellinks.h
@@ -158,9 +158,9 @@ private:
     TDEActionMenu *m_links;
 
     /** Map of TDEAction */
-    TDEActionMap kaction_map;
+    TDEActionMap tdeaction_map;
     /** Map of TDEActionMenu */
-    TDEActionMenuMap kactionmenu_map;
+    TDEActionMenuMap tdeactionmenu_map;
 
     /** Map of all the link element which can be managed by rellinks */
     TQMap<TQString,DOMElementMap> element_map;
diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp
index 390f8a7..32f7cc7 100644
--- a/konq-plugins/rsync/rsyncplugin.cpp
+++ b/konq-plugins/rsync/rsyncplugin.cpp
@@ -74,19 +74,19 @@
 
 #include <twin.h>
 #include <kurl.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kprogressbox.h>
 #include <kpassdlg.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kapplication.h>
 #include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
 #include <kstandarddirs.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <kiconviewsearchline.h>
 #include <konq_dirpart.h>
 #include <konq_propsview.h>
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index dfdc27c..2b9c48f 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -23,7 +23,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h
index 40316c1..efc1095 100644
--- a/konq-plugins/sidebar/delicious/bookmarkListItem.h
+++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h
@@ -24,7 +24,7 @@
 
 #include <tqdatetime.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 
 #include <time.h>
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 919c498..f1cb737 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <krfcdate.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/konq-plugins/sidebar/delicious/widget.ui b/konq-plugins/sidebar/delicious/widget.ui
index 7bf7c0b..24befb8 100644
--- a/konq-plugins/sidebar/delicious/widget.ui
+++ b/konq-plugins/sidebar/delicious/widget.ui
@@ -160,6 +160,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h
index 0c19d23..6dd17a0 100644
--- a/konq-plugins/sidebar/mediaplayer/controls.h
+++ b/konq-plugins/sidebar/mediaplayer/controls.h
@@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqguardedptr.h>
 
-#include <kaction.h>
-#include <ktoolbar.h>
+#include <tdeaction.h>
+#include <tdetoolbar.h>
 #include <tqslider.h>
 #include <tqstringlist.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index b37469a..85d6fae 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -22,12 +22,12 @@
 
 #include <tqdialog.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
 #include <tqptrdict.h>
 #include <tqlistbox.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
 #include <tqcheckbox.h>
 #include <kcombobox.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 2548c3f..fc35e54 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -48,9 +48,9 @@
 #include <krun.h>
 #include <kdesktopfile.h>
 #include <kpropertiesdialog.h>
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
+#include <tdeshortcut.h>
 #include <kmimetype.h>
 #include <tdecmoduleinfo.h>
 #include <kmdcodec.h>
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index b832bc5..72aff09 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -27,7 +27,7 @@
 #include <tdefileitem.h>
 #include <kurl.h>
 #include <kservice.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdirwatch.h>
 
 #include <tqmap.h>
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index bbffb01..344c814 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -28,10 +28,10 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kiconloader.h>
-#include <kaction.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdeshortcut.h>
 #include <ksimpleconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h
index 42268de..e5b0d17 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.h
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.h
@@ -26,7 +26,7 @@
 #include <tqmap.h>
 #include <tqwidget.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdefileitem.h>
 #include <kmimetype.h>
 #include <kurl.h>
diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp
index 22bb3a7..f3a704a 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.cpp
+++ b/konq-plugins/sidebar/newsticker/nspanel.cpp
@@ -26,7 +26,7 @@
 #include <tqfontmetrics.h>
 #include <tqtimer.h>
 #include <kdebug.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include "nspanel.h"
 
 
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index 36b503e..7da5818 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -31,7 +31,7 @@
 #include <dcopref.h>
 #include <dcopobject.h>
 #include <tdeio/job.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 
 class TQBuffer;
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 12be5c7..f06c876 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
 #include <kapplication.h>
diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
index a12d714..80e88e7 100644
--- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
@@ -20,14 +20,14 @@
 #include <dcopclient.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <tdehtml_part.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprotocolmanager.h>
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index 1c9187f..4e2d770 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -24,7 +24,7 @@
 
 #include <krun.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <ktrader.h>
@@ -32,7 +32,7 @@
 #include <tdeio/job.h>
 #include <kservice.h>
 #include <kinstance.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <dcopref.h>
 #include <tdehtml_part.h>
 #include <kgenericfactory.h>
diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index 8e2ff26..73e3cd7 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -29,7 +29,7 @@
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdehtml_part.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index 9048d67..cb77ab5 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -37,7 +37,7 @@
 #include <kactivelabel.h>
 #include <tqstylesheet.h>
 #include <tqiodevice.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeio/job.h>
 #include <kapplication.h>
 #include <kurllabel.h>
diff --git a/konq-plugins/webarchiver/archiveviewbase.ui b/konq-plugins/webarchiver/archiveviewbase.ui
index b989c51..e952cb3 100644
--- a/konq-plugins/webarchiver/archiveviewbase.ui
+++ b/konq-plugins/webarchiver/archiveviewbase.ui
@@ -123,6 +123,6 @@
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kactivelabel.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index 6c79f72..bf0b39b 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -32,7 +32,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 
 #include <tdefiledialog.h>
diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp
index 5b562c7..498b4a5 100644
--- a/ksig/ksig.cpp
+++ b/ksig/ksig.cpp
@@ -17,13 +17,13 @@
 
 #include <kapplication.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
 #include <ktextedit.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <klocale.h>
 
 #include <tqsplitter.h>
diff --git a/ksig/ksig.h b/ksig/ksig.h
index 7e484be..a6163ac 100644
--- a/ksig/ksig.h
+++ b/ksig/ksig.h
@@ -20,7 +20,7 @@
 
 #include "siglistview.h"
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class KTextEdit;
 class TQSplitter;
diff --git a/ksig/siglistview.h b/ksig/siglistview.h
index 5508de5..8354725 100644
--- a/ksig/siglistview.h
+++ b/ksig/siglistview.h
@@ -18,7 +18,7 @@
 #ifndef SIGLISTVIEW_H
 #define SIGLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index 5eadaf9..4ec4867 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -35,7 +35,7 @@
 #include <tqframe.h>
 
 #include <kstatusbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurldrag.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
diff --git a/noatun-plugins/dub/dub/dub.h b/noatun-plugins/dub/dub/dub.h
index bd44224..fcee29c 100644
--- a/noatun-plugins/dub/dub/dub.h
+++ b/noatun-plugins/dub/dub/dub.h
@@ -25,7 +25,7 @@
 
 // KDE includes
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 #include <noatun/plugin.h>
 #include <noatun/playlist.h>
diff --git a/noatun-plugins/dub/dub/dubapp.h b/noatun-plugins/dub/dub/dubapp.h
index 1ddf273..60f6d16 100644
--- a/noatun-plugins/dub/dub/dubapp.h
+++ b/noatun-plugins/dub/dub/dubapp.h
@@ -20,9 +20,9 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 
 // forward declaration of the Dub classes
 class DubView;
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h
index 9d38a86..3f32cec 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.h
+++ b/noatun-plugins/dub/dub/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>
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index f79b88e..5db1338 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -6,7 +6,7 @@
 #include <kmessagebox.h>
 #include <tqvgroupbox.h>
 #include <tqgrid.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineedit.h>
 #include <kbuttonbox.h>
 #include <klocale.h>
diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h
index a5b411b..71bcfb8 100644
--- a/noatun-plugins/lyrics/lyrics.h
+++ b/noatun-plugins/lyrics/lyrics.h
@@ -4,10 +4,10 @@
 #include <noatun/plugin.h>
 #include <noatun/player.h>
 #include <noatun/app.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqvaluevector.h>
 #include <tdehtml_part.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include "cmodule.h"
 
 class HistoryManager;
diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp
index 0a9e28d..62cd27a 100644
--- a/noatun-plugins/nexscope/gui.cpp
+++ b/noatun-plugins/nexscope/gui.cpp
@@ -4,7 +4,7 @@
 #include <tqdragobject.h>
 #include <tdefiledialog.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "gui.h"
 #include "renderers.h"
diff --git a/noatun-plugins/nexscope/gui.h b/noatun-plugins/nexscope/gui.h
index 0630486..c817eee 100644
--- a/noatun-plugins/nexscope/gui.h
+++ b/noatun-plugins/nexscope/gui.h
@@ -1,8 +1,8 @@
 #ifndef GUI_H
 #define GUI_H
 
-#include <kmainwindow.h>
-#include <klistview.h>
+#include <tdemainwindow.h>
+#include <tdelistview.h>
 #include <tqsplitter.h>
 #include <tqdict.h>
 #include <dcopobject.h>
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index 83cc1bb..57e3527 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -8,7 +8,7 @@
 #include <kregexpeditorinterface.h>
 #include <tdeparts/componentfactory.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
diff --git a/noatun-plugins/oblique/menu.h b/noatun-plugins/oblique/menu.h
index 32d7d8d..88c8ea7 100644
--- a/noatun-plugins/oblique/menu.h
+++ b/noatun-plugins/oblique/menu.h
@@ -4,9 +4,9 @@
 #ifndef MENU_H
 #define MENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpropertiesdialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "file.h"
 #include "oblique.h"
diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h
index c55e606..0bfb49c 100644
--- a/noatun-plugins/oblique/tree.h
+++ b/noatun-plugins/oblique/tree.h
@@ -5,7 +5,7 @@
 #define TREE_H
 
 #include <tqwidget.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "base.h"
 #include "query.h"
diff --git a/noatun-plugins/oblique/view.h b/noatun-plugins/oblique/view.h
index 397fc62..a9b3cdf 100644
--- a/noatun-plugins/oblique/view.h
+++ b/noatun-plugins/oblique/view.h
@@ -4,8 +4,8 @@
 #ifndef VIEW_H
 #define VIEW_H
 
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <klineedit.h>
 
 #include "tree.h"
diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp
index 6c51903..44a1a77 100644
--- a/noatun-plugins/wavecapture/wavecapture.cpp
+++ b/noatun-plugins/wavecapture/wavecapture.cpp
@@ -27,10 +27,10 @@
 #include <arts/mcoputils.h>
 
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>