Rename many classes and header files to avoid conflicts with KDE4

41 files changed, 55 insertions, 55 deletions

diff --git a/konqueror/KonqMainWindowIface.h b/konqueror/KonqMainWindowIface.h
index c6ce6443d..4776dd39e 100644
--- a/konqueror/KonqMainWindowIface.h
+++ b/konqueror/KonqMainWindowIface.h
@@ -24,7 +24,7 @@
 #include <dcopobject.h>
 #include <tqvaluelist.h>
 #include <dcopref.h>
-#include <kmainwindowiface.h>
+#include <tdemainwindowiface.h>
 
 class KonqMainWindow;
 class KDCOPActionProxy;
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index b9c596db9..4e671ce57 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -9,7 +9,7 @@
 #include <kmessagebox.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kurifilter.h>
 #include <ktrader.h>
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index ff125a916..087561076 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <tqfile.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdirlister.h>
diff --git a/konqueror/keditbookmarks/TODO b/konqueror/keditbookmarks/TODO
index 98e379560..399cfa74e 100644
--- a/konqueror/keditbookmarks/TODO
+++ b/konqueror/keditbookmarks/TODO
@@ -64,19 +64,19 @@ on startup:
    ==31246==    at 0x4026A4DF: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786)
    ==31246==    by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905)
    ==31246==    by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702)
-   ==31246==    by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872)
+   ==31246==    by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (tdelistview.cpp:1872)
    ==31246==
    ==31246== Conditional jump or move depends on uninitialised value(s)
    ==31246==    at 0x4026A4E4: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786)
    ==31246==    by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905)
    ==31246==    by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702)
-   ==31246==    by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872)
+   ==31246==    by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (tdelistview.cpp:1872)
    ==31246==
    ==31246== Conditional jump or move depends on uninitialised value(s)
    ==31246==    at 0x4026A4E8: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786)
    ==31246==    by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905)
    ==31246==    by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702)
-   ==31246==    by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872)
+   ==31246==    by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (tdelistview.cpp:1872)
    ==31246==
 
 lots of crap when using file->open
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 81d47f07e..dc7670813 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -42,7 +42,7 @@
 #include <kdebug.h>
 #include <kapplication.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index 7780196ca..31d76edd7 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -34,7 +34,7 @@
 
 #include <kapplication.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 
diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp
index c30d890e3..c22d2e628 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.cpp
+++ b/konqueror/keditbookmarks/bookmarkiterator.cpp
@@ -28,7 +28,7 @@
 
 #include <tqtimer.h>
 
-BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) {
+BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_btdelist(bks) {
     connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ), 
             TQT_SLOT( slotCancelTest(BookmarkIterator *) ));
     delayedEmitNextOne();
@@ -60,12 +60,12 @@ const KBookmark BookmarkIterator::curBk() const {
 void BookmarkIterator::nextOne() {
     // kdDebug() << "BookmarkIterator::nextOne" << endl;
 
-    if (m_bklist.isEmpty()) {
+    if (m_btdelist.isEmpty()) {
         emit deleteSelf(this);
         return;
     }
 
-    TQValueListIterator<KBookmark> head = m_bklist.begin();
+    TQValueListIterator<KBookmark> head = m_btdelist.begin();
     KBookmark bk = (*head);
 
     bool viable = bk.hasParent() && isApplicable(bk);
@@ -75,7 +75,7 @@ void BookmarkIterator::nextOne() {
         doAction();
     }
 
-    m_bklist.remove(head);
+    m_btdelist.remove(head);
 
     if (!viable)
         delayedEmitNextOne();
diff --git a/konqueror/keditbookmarks/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h
index 0931ccaf7..a7d06952a 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.h
+++ b/konqueror/keditbookmarks/bookmarkiterator.h
@@ -53,7 +53,7 @@ protected:
 
 private:
    KBookmark m_bk;
-   TQValueList<KBookmark> m_bklist;
+   TQValueList<KBookmark> m_btdelist;
 };
 
 class BookmarkIteratorHolder
diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h
index b2cdfce60..c7031a377 100644
--- a/konqueror/keditbookmarks/kebsearchline.h
+++ b/konqueror/keditbookmarks/kebsearchline.h
@@ -19,7 +19,7 @@
 #ifndef __kebsearchline_h
 #define __kebsearchline_h
 
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <tqobject.h>
 
 class KEBSearchLine : public TDEListViewSearchLine
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 55f28b90a..6efd1440b 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <kapplication.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
@@ -48,7 +48,7 @@
 #include <kmessagebox.h>
 #include <klineedit.h>
 #include <krun.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 #include <kbookmarkdrag.h>
 #include <kbookmarkmanager.h>
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index 1ada9506c..13bf2a15b 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -28,7 +28,7 @@
 
 #include <klocale.h>
 #include <kbookmark.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 #include "toplevel.h"
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 72ababe34..97e7ec0e2 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -110,7 +110,7 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) {
     return true;
 }
 
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
     TDELocale::setMainCatalogue("konqueror");
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 97386a3e7..5a7b5ce04 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -34,7 +34,7 @@
 #include <kcharsets.h>
 #include <kbookmarkmanager.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 TestLinkItrHolder *TestLinkItrHolder::s_self = 0;
 
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 24ab4fbbb..aafd988ca 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -42,7 +42,7 @@
 
 #include <kapplication.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 
diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h
index 31f10a01a..7dd056d8d 100644
--- a/konqueror/keditbookmarks/toplevel.h
+++ b/konqueror/keditbookmarks/toplevel.h
@@ -22,7 +22,7 @@
 #ifndef __toplevel_h
 #define __toplevel_h
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kcommand.h>
 #include <kbookmark.h>
 
diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc
index ed5a5002b..a8b6640d9 100644
--- a/konqueror/konq_actions.cc
+++ b/konqueror/konq_actions.cc
@@ -21,14 +21,14 @@
 
 #include <assert.h>
 
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <kanimwidget.h>
 #include <kdebug.h>
 #include <kstringhandler.h>
 
 #include <konq_pixmapprovider.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kapplication.h>
 
 #include "konq_view.h"
diff --git a/konqueror/konq_actions.h b/konqueror/konq_actions.h
index 8b24c28a6..134c8996f 100644
--- a/konqueror/konq_actions.h
+++ b/konqueror/konq_actions.h
@@ -21,7 +21,7 @@
 #define __konq_actions_h__
 
 #include <konq_historymgr.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqptrlist.h>
 
 class HistoryEntry;
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index 6b814a647..3d99ed337 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -27,7 +27,7 @@
 #include <kicontheme.h>
 #include <klineedit.h>
 #include <konq_pixmapprovider.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kurldrag.h>
 #include <konq_mainwindow.h>
 #include <kstringhandler.h>
diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc
index bfc37f6e1..99f31dba2 100644
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cc
@@ -43,7 +43,7 @@
 #include "konq_viewmgr.h"
 
 #include <konq_pixmapprovider.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <assert.h>
 
 
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index afe4f8c5a..48b5ae599 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -85,7 +85,7 @@
 #include "konq_main.h"
 #include <konq_undo.h>
 #include <kprotocolinfo.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <tdesycoca.h>
@@ -97,11 +97,11 @@
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <tdeio/scheduler.h>
 #include <tdeio/netaccess.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kstringhandler.h>
 #include <kuser.h>
 #include <netwm.h>
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 453762c38..9226c9e16 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@@ -28,7 +28,7 @@
 #include <tqheader.h>
 #include <tqlineedit.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
 #include <tdeio/global.h>
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index 6e8d08fe7..70cbcafd5 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -40,9 +40,9 @@
 #include "konq_misc.h"
 #include "konq_settingsxt.h"
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <konq_pixmapprovider.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <tqtabbar.h>
 #include <tqwhatsthis.h>
 #include <tqstyle.h>
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index a556ac529..136c34093 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -29,7 +29,7 @@
 #include <tqfileinfo.h>
 #include <tqptrlist.h>
 
-#include <kaccelgen.h>
+#include <tdeaccelgen.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kapplication.h>
@@ -40,7 +40,7 @@
 #include <kmessagebox.h>
 
 #include <assert.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // #define DEBUG_VIEWMGR
 
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
index b17b16b75..9502f3388 100644
--- a/konqueror/kttsplugin/tdehtmlkttsd.cpp
+++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp
@@ -19,7 +19,7 @@
 #include <dom/dom_string.h>
 #include <kdebug.h>
 #include "tdehtmlkttsd.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <tqmessagebox.h>
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index 60a3ec2b0..ef77cc1bd 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <tdefilemetainfo.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kservicetype.h>
 #include <kuserprofile.h>
 #include <tdeio/metainfojob.h>
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index 43a6468fc..b872be4a7 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -23,7 +23,7 @@
 #include "konq_infolistviewwidget.h"
 #include "konq_listviewsettings.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdirlister.h>
diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h
index c96bff5a0..6ea4e79dd 100644
--- a/konqueror/listview/konq_listviewitems.h
+++ b/konqueror/listview/konq_listviewitems.h
@@ -20,7 +20,7 @@
 #ifndef __konq_listviewitems_h__
 #define __konq_listviewitems_h__
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstring.h>
 #include <kicontheme.h>
 
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index af7058748..8eb2cd6bf 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -29,7 +29,7 @@
 #include <kdirlister.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurldrag.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
@@ -1508,7 +1508,7 @@ bool KonqBaseListViewWidget::caseInsensitiveSort() const
     return m_pBrowserView->m_pProps->isCaseInsensitiveSort();
 }
 
-// based on isExecuteArea from klistview.cpp
+// based on isExecuteArea from tdelistview.cpp
 int KonqBaseListViewWidget::executeArea( TQListViewItem *_item )
 {
    if ( !_item )
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 1fc8b0eb7..5c9cade44 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 #include <tdefileitem.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeparts/browserextension.h>
 #include <konq_propsview.h>
 #include "konq_listviewitems.h"
diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h
index 3f08cc3d5..01b85ddf6 100644
--- a/konqueror/listview/konq_treeviewwidget.h
+++ b/konqueror/listview/konq_treeviewwidget.h
@@ -23,7 +23,7 @@
 #include "konq_treeviewitem.h"
 #include <tqdict.h>
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KonqListView;
 
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 5e669972b..846fae1be 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -25,12 +25,12 @@
  */
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kcharsets.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <dcopclient.h>
 #include <kgenericfactory.h>
 #include <kprotocolmanager.h>
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index 8558b71ba..bf30ce023 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -20,7 +20,7 @@
 #include <konq_events.h>
 #include <kdebug.h>
 #include <tqapplication.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
                           TQObject *parent, const char *name, bool universalMode )
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 4638d0bad..4dc29dbd4 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -38,7 +38,7 @@
 #include <konq_events.h>
 #include <tdefileitem.h>
 #include <tdeio/netaccess.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kurlrequesterdlg.h>
 #include <kinputdialog.h>
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index 4457d12e2..36612a033 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -24,7 +24,7 @@
 
 #include <kdockwidget.h>
 #include <kurl.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tdeparts/part.h>
 #include <tdemultitabbar.h>
 
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 5b170b102..9194e8f0c 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -20,8 +20,8 @@
 #include <tqcursor.h>
 #include <tqpopupmenu.h>
 
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>
 #include <kbookmarkdrag.h>
 #include <kiconloader.h>
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 5d27e010f..ba3428c96 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -21,7 +21,7 @@
 #include <tqpopupmenu.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 813ece3df..6c84fdf37 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -31,7 +31,7 @@
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 028a531fa..4d1a7ba93 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -30,7 +30,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h
index f8626298c..6498d0ffe 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -20,7 +20,7 @@
 #ifndef konq_tree_h
 #define konq_tree_h
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include "konq_sidebartreetoplevelitem.h"
 #include "konqsidebar_tree.h"
 #include <kdirnotify.h>
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 04454ecb1..1903c2328 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -6,7 +6,7 @@
 #include <ksimpleconfig.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 #include <tqclipboard.h>
 #include <tqdragobject.h>
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index 65566c4c3..494f1050a 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -24,7 +24,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <konqsidebarplugin.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqobject.h>