Rename many classes and header files to avoid conflicts with KDE4

45 files changed, 72 insertions, 72 deletions

diff --git a/bibletime/backend/cswordbiblemoduleinfo.h b/bibletime/backend/cswordbiblemoduleinfo.h
index 7cf6280..2cb0160 100644
--- a/bibletime/backend/cswordbiblemoduleinfo.h
+++ b/bibletime/backend/cswordbiblemoduleinfo.h
@@ -107,7 +107,7 @@ private:
 	CSwordVerseKey m_lowerBound;
 	CSwordVerseKey m_upperBound;
 
-	TQStringList* m_bookList; //This booklist is cached
+	TQStringList* m_bookList; //This bootdelist is cached
 	TQString m_cachedLocale;
 	short int m_hasOT;
 	short int m_hasNT;
diff --git a/bibletime/bibletime.cpp b/bibletime/bibletime.cpp
index 5617b59..f6d5573 100644
--- a/bibletime/bibletime.cpp
+++ b/bibletime/bibletime.cpp
@@ -41,14 +41,14 @@
 
 //KDE includes
 #include <tdeversion.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <krandomsequence.h>
 
 using namespace Profile;
diff --git a/bibletime/bibletime.h b/bibletime/bibletime.h
index 87c2088..ec94699 100644
--- a/bibletime/bibletime.h
+++ b/bibletime/bibletime.h
@@ -24,7 +24,7 @@
 #include "backend/cswordmoduleinfo.h"
 
 //KDE includes
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 //forward: BT classes
 class CMDIArea;
diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp
index 3162668..91311e3 100644
--- a/bibletime/bibletime_init.cpp
+++ b/bibletime/bibletime_init.cpp
@@ -48,8 +48,8 @@
 
 //KDE includes
 #include <kaboutdata.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfigbase.h>
 #include <tdeversion.h>
@@ -59,9 +59,9 @@
 #include <kmenubar.h>
 #include <kstddirs.h>
 #include <kstdaction.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeversion.h>
 
 //Sword includes
diff --git a/bibletime/bibletime_slots.cpp b/bibletime/bibletime_slots.cpp
index 074536f..52d5a64 100644
--- a/bibletime/bibletime_slots.cpp
+++ b/bibletime/bibletime_slots.cpp
@@ -42,7 +42,7 @@
 #include <tqinputdialog.h>
 
 //KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kaboutkde.h>
 #include <kaboutdialog.h>
@@ -54,7 +54,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kedittoolbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <khelpmenu.h>
 #include <ktip.h>
 
diff --git a/bibletime/bibletimeinterface.h b/bibletime/bibletimeinterface.h
index 95ecf11..2a2beb6 100644
--- a/bibletime/bibletimeinterface.h
+++ b/bibletime/bibletimeinterface.h
@@ -18,7 +18,7 @@
 
 //KDE includes
 #include <dcopobject.h>
-#include <kmainwindowiface.h>
+#include <tdemainwindowiface.h>
 
 /** DCOP interface definition for BibleTime.
 * This is the interface definition for BibleTime's DCOP client interface. The main window class "BibleTime"
diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp
index 6c5e747..b8f2e8e 100644
--- a/bibletime/frontend/cbtconfig.cpp
+++ b/bibletime/frontend/cbtconfig.cpp
@@ -28,15 +28,15 @@
 #include <tdeversion.h>
 #include <kapplication.h>
 #if TDE_VERSION >= 0x030200
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #else
-#include <kaction.h>
+#include <tdeaction.h>
 #endif
 #include <tdeconfig.h>
 #include <kcharsets.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kstaticdeleter.h>
 
 #include <tdehtml_settings.h>
diff --git a/bibletime/frontend/cmanageindiceswidget.cpp b/bibletime/frontend/cmanageindiceswidget.cpp
index d1528a5..e69f198 100644
--- a/bibletime/frontend/cmanageindiceswidget.cpp
+++ b/bibletime/frontend/cmanageindiceswidget.cpp
@@ -34,7 +34,7 @@
 
 //KDE includes
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 namespace BookshelfManager {
diff --git a/bibletime/frontend/cmdiarea.cpp b/bibletime/frontend/cmdiarea.cpp
index 3939717..6a61bf8 100644
--- a/bibletime/frontend/cmdiarea.cpp
+++ b/bibletime/frontend/cmdiarea.cpp
@@ -19,7 +19,7 @@
 #include "config.h"
 
 //KDE includes
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kapplication.h>
 #include <klocale.h>
 
diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp
index fc6d8b1..7f33814 100644
--- a/bibletime/frontend/coptionsdialog.cpp
+++ b/bibletime/frontend/coptionsdialog.cpp
@@ -58,9 +58,9 @@
 #include <kiconloader.h>
 #include <ktabctl.h>
 #include <kapp.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kkeydialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfigbase.h>
 #include <tdeconfig.h>
 
diff --git a/bibletime/frontend/coptionsdialog.h b/bibletime/frontend/coptionsdialog.h
index 1d67853..33b850e 100644
--- a/bibletime/frontend/coptionsdialog.h
+++ b/bibletime/frontend/coptionsdialog.h
@@ -28,8 +28,8 @@
 
 //KDE includes
 #include <kdialogbase.h>
-#include <kfontdialog.h>
-#include <kaccel.h>
+#include <tdefontdialog.h>
+#include <tdeaccel.h>
 #include <kcolorbutton.h>
 #include <kapp.h>
 #include <klocale.h>
diff --git a/bibletime/frontend/cswordsetupmodulelistview.h b/bibletime/frontend/cswordsetupmodulelistview.h
index ed8f32a..6944b98 100644
--- a/bibletime/frontend/cswordsetupmodulelistview.h
+++ b/bibletime/frontend/cswordsetupmodulelistview.h
@@ -20,7 +20,7 @@
 #include <tqmap.h>
 
 //KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 class CSwordModuleInfo;
 class CSwordBackend;
diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp
index 7c93755..5a7d9a8 100644
--- a/bibletime/frontend/display/chtmlwritedisplay.cpp
+++ b/bibletime/frontend/display/chtmlwritedisplay.cpp
@@ -20,12 +20,12 @@
 #include <tqtooltip.h>
 
 //KDE includes
-#include <kaction.h>
-#include <ktoolbar.h>
+#include <tdeaction.h>
+#include <tdetoolbar.h>
 #include <klocale.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <kcolorbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent)
 : CPlainWriteDisplay(parentWindow,parent) {
diff --git a/bibletime/frontend/display/cplainwritedisplay.cpp b/bibletime/frontend/display/cplainwritedisplay.cpp
index 2619974..c11130b 100644
--- a/bibletime/frontend/display/cplainwritedisplay.cpp
+++ b/bibletime/frontend/display/cplainwritedisplay.cpp
@@ -20,7 +20,7 @@
 //TQt includes
 
 //KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent) : TQTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) {
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
index ae60dd8..c143774 100644
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
@@ -34,9 +34,9 @@
 #include <tqtimer.h>
 
 //KDE includes
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 using namespace Profile;
 
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.h b/bibletime/frontend/displaywindow/cbiblereadwindow.h
index 7eb7fbe..5d52c51 100644
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.h
+++ b/bibletime/frontend/displaywindow/cbiblereadwindow.h
@@ -22,7 +22,7 @@
 #include <tqwidget.h>
 
 //KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 
 
 class CTransliterationButton;
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
index b62495f..b7f4110 100644
--- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
@@ -27,7 +27,7 @@
 #include <tqsplitter.h>
 
 //KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <tdeversion.h>
 
diff --git a/bibletime/frontend/displaywindow/cbuttons.cpp b/bibletime/frontend/displaywindow/cbuttons.cpp
index 01bd359..007d3a1 100644
--- a/bibletime/frontend/displaywindow/cbuttons.cpp
+++ b/bibletime/frontend/displaywindow/cbuttons.cpp
@@ -21,7 +21,7 @@
 #include <tqtooltip.h>
 
 //KDE includes
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 
 
diff --git a/bibletime/frontend/displaywindow/cbuttons.h b/bibletime/frontend/displaywindow/cbuttons.h
index f94dd7a..cd2f873 100644
--- a/bibletime/frontend/displaywindow/cbuttons.h
+++ b/bibletime/frontend/displaywindow/cbuttons.h
@@ -20,7 +20,7 @@
 #include <tqdict.h>
 
 //KDE includes
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 class TDEPopupMenu;
 
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
index c3fb66a..ff70654 100644
--- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
@@ -24,10 +24,10 @@
 //TQt includes
 
 //KDE includes
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 using namespace Profile;
 
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
index e1b114f..ae421f9 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
@@ -43,7 +43,7 @@
 
 //KDE includes
 #include <tdeversion.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <klocale.h>
 
 using namespace Profile;
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.h b/bibletime/frontend/displaywindow/cdisplaywindow.h
index 6152e09..2f5345a 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.h
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.h
@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 
 //KDE includes
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 //Forward declarations
diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
index a3e8885..a167c4c 100644
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
@@ -20,7 +20,7 @@
 //TQt includes
 
 //KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 using namespace Profile;
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
index caab96b..b5be4d6 100644
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
@@ -29,12 +29,12 @@
 //TQt includes
 
 //KDE includes
-#include <kaccel.h>
-#include <ktoolbar.h>
+#include <tdeaccel.h>
+#include <tdetoolbar.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeversion.h>
-// #include <kactionclasses.h>
+// #include <tdeactionclasses.h>
 
 CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name) : CReadWindow(moduleList, parent,name) {
 	setKey( CSwordKey::createInstance(moduleList.first()) );
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.h b/bibletime/frontend/displaywindow/clexiconreadwindow.h
index f0e50f4..38cf759 100644
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.h
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.h
@@ -19,7 +19,7 @@
 #include <tqwidget.h>
 
 //KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 
 class CSwordKey;
 class CSwordLDKey;
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.h b/bibletime/frontend/displaywindow/cmodulechooserbar.h
index 33373d0..44f69ed 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbar.h
+++ b/bibletime/frontend/displaywindow/cmodulechooserbar.h
@@ -24,7 +24,7 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 /**
   * @author The BibleTime team
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.h b/bibletime/frontend/displaywindow/cmodulechooserbutton.h
index c38eb5e..79d21c6 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.h
+++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.h
@@ -21,8 +21,8 @@
 #include <tqtoolbutton.h>
 
 //KDE includes
-#include <ktoolbarbutton.h>
-#include <kpopupmenu.h>
+#include <tdetoolbarbutton.h>
+#include <tdepopupmenu.h>
 
 class TDEPopupMenu;
 class CModuleChooserBar;
diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.cpp b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
index 4c94885..1c795de 100644
--- a/bibletime/frontend/displaywindow/cplainwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
@@ -21,8 +21,8 @@
 #include <tqregexp.h>
 
 //KDE includes
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/bibletime/frontend/displaywindow/creadwindow.cpp b/bibletime/frontend/displaywindow/creadwindow.cpp
index 87183f0..20138ec 100644
--- a/bibletime/frontend/displaywindow/creadwindow.cpp
+++ b/bibletime/frontend/displaywindow/creadwindow.cpp
@@ -27,10 +27,10 @@
 #include "util/cresmgr.h"
 
 //KDE includes
-#include <kpopupmenu.h>
-#include <kaction.h>
-#include <kaccel.h>
-#include <kstdaccel.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
+#include <tdestdaccel.h>
 #include <klocale.h>
 
 using namespace Profile;
diff --git a/bibletime/frontend/keychooser/cbooktreechooser.h b/bibletime/frontend/keychooser/cbooktreechooser.h
index 84a097c..360ddae 100644
--- a/bibletime/frontend/keychooser/cbooktreechooser.h
+++ b/bibletime/frontend/keychooser/cbooktreechooser.h
@@ -30,7 +30,7 @@
 #include <tqstringlist.h>
 
 //KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 class CSwordKey;
 class CSwordBookModuleInfo;
diff --git a/bibletime/frontend/mainindex/cindexitem.h b/bibletime/frontend/mainindex/cindexitem.h
index 0447d31..35f7482 100644
--- a/bibletime/frontend/mainindex/cindexitem.h
+++ b/bibletime/frontend/mainindex/cindexitem.h
@@ -21,7 +21,7 @@
 #include <tqdom.h>
 
 //KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TDEConfig;
 class CFolderBase;
diff --git a/bibletime/frontend/mainindex/cmainindex.cpp b/bibletime/frontend/mainindex/cmainindex.cpp
index 8bf0f30..debedbf 100644
--- a/bibletime/frontend/mainindex/cmainindex.cpp
+++ b/bibletime/frontend/mainindex/cmainindex.cpp
@@ -36,7 +36,7 @@
 //KDE includes
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kglobalsettings.h>
 
diff --git a/bibletime/frontend/mainindex/cmainindex.h b/bibletime/frontend/mainindex/cmainindex.h
index 2b396b3..0719e64 100644
--- a/bibletime/frontend/mainindex/cmainindex.h
+++ b/bibletime/frontend/mainindex/cmainindex.h
@@ -26,8 +26,8 @@
 #include <tqtooltip.h>
 
 //KDE includes
-#include <kaction.h>
-#include <klistview.h>
+#include <tdeaction.h>
+#include <tdelistview.h>
 
 class CSearchDialog;
 
diff --git a/bibletime/frontend/manageindicesform.cpp b/bibletime/frontend/manageindicesform.cpp
index db30c37..788960e 100644
--- a/bibletime/frontend/manageindicesform.cpp
+++ b/bibletime/frontend/manageindicesform.cpp
@@ -14,7 +14,7 @@
 #include <tqframe.h>
 #include <tqcheckbox.h>
 #include <tqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 #include <tqtooltip.h>
diff --git a/bibletime/frontend/manageindicesform.ui b/bibletime/frontend/manageindicesform.ui
index 0ec7fe8..48ab9c8 100644
--- a/bibletime/frontend/manageindicesform.ui
+++ b/bibletime/frontend/manageindicesform.ui
@@ -109,6 +109,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/bibletime/frontend/searchdialog/cmodulechooser.h b/bibletime/frontend/searchdialog/cmodulechooser.h
index efe54b8..ea0c3a0 100644
--- a/bibletime/frontend/searchdialog/cmodulechooser.h
+++ b/bibletime/frontend/searchdialog/cmodulechooser.h
@@ -33,7 +33,7 @@
 //KDE includes
 #include <kdialog.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace Search {
 	namespace Options {
diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.cpp b/bibletime/frontend/searchdialog/cmoduleresultview.cpp
index e1bc09d..bfec486 100644
--- a/bibletime/frontend/searchdialog/cmoduleresultview.cpp
+++ b/bibletime/frontend/searchdialog/cmoduleresultview.cpp
@@ -23,8 +23,8 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 
 
 namespace Search {
diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.h b/bibletime/frontend/searchdialog/cmoduleresultview.h
index 7947012..15b1bf9 100644
--- a/bibletime/frontend/searchdialog/cmoduleresultview.h
+++ b/bibletime/frontend/searchdialog/cmoduleresultview.h
@@ -19,7 +19,7 @@
 //TQt includes
 
 //KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 //forward declarations
 class TQLabel;
diff --git a/bibletime/frontend/searchdialog/crangechooser.h b/bibletime/frontend/searchdialog/crangechooser.h
index 2fbaa53..da014b6 100644
--- a/bibletime/frontend/searchdialog/crangechooser.h
+++ b/bibletime/frontend/searchdialog/crangechooser.h
@@ -31,7 +31,7 @@
 //KDE includes
 #include <kdialog.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 //forward declarations
 class CSearchAnalysisItem;
diff --git a/bibletime/frontend/searchdialog/csearchanalysis.h b/bibletime/frontend/searchdialog/csearchanalysis.h
index 04ea676..fd2d0b0 100644
--- a/bibletime/frontend/searchdialog/csearchanalysis.h
+++ b/bibletime/frontend/searchdialog/csearchanalysis.h
@@ -33,7 +33,7 @@
 //KDE includes
 #include <kdialog.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class TQTextEdit;
diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.h b/bibletime/frontend/searchdialog/csearchdialogpages.h
index 85a8588..23f351d 100644
--- a/bibletime/frontend/searchdialog/csearchdialogpages.h
+++ b/bibletime/frontend/searchdialog/csearchdialogpages.h
@@ -25,7 +25,7 @@
 #include <tqvgroupbox.h>
 
 //KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 //forward declarations
 class TQLabel;
diff --git a/bibletime/frontend/searchdialog/csearchresultview.cpp b/bibletime/frontend/searchdialog/csearchresultview.cpp
index 5f319ca..6018fa9 100644
--- a/bibletime/frontend/searchdialog/csearchresultview.cpp
+++ b/bibletime/frontend/searchdialog/csearchresultview.cpp
@@ -22,8 +22,8 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 
 namespace Search {
 	namespace Result {
diff --git a/bibletime/frontend/searchdialog/csearchresultview.h b/bibletime/frontend/searchdialog/csearchresultview.h
index 67effa7..a2e7422 100644
--- a/bibletime/frontend/searchdialog/csearchresultview.h
+++ b/bibletime/frontend/searchdialog/csearchresultview.h
@@ -16,7 +16,7 @@
 #include "backend/cswordmoduleinfo.h"
 
 //KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 //forward declarations
 class TQLabel;
diff --git a/bibletime/frontend/util/csortlistviewitem.h b/bibletime/frontend/util/csortlistviewitem.h
index a150f8d..c138246 100644
--- a/bibletime/frontend/util/csortlistviewitem.h
+++ b/bibletime/frontend/util/csortlistviewitem.h
@@ -15,7 +15,7 @@
 
 #include <tqmap.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace util {
 
diff --git a/bibletime/util/cresmgr.h b/bibletime/util/cresmgr.h
index 9f2d69a..0e6a043 100644
--- a/bibletime/util/cresmgr.h
+++ b/bibletime/util/cresmgr.h
@@ -17,7 +17,7 @@
 #include <tqkeysequence.h>
 
 //KDE includes
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 /** Provides static functions to easily access the Tooltip texts for all the frontend parts.
   * @author The BibleTime team