Rename many classes and header files to avoid conflicts with KDE4

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;

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;

bibletime/bibletime.h

@@ -24,7 +24,7 @@
 #include "backend/cswordmoduleinfo.h"
 
 //KDE includes
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 //forward: BT classes
 class CMDIArea;

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

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>
 

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"

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>

bibletime/frontend/cmanageindiceswidget.cpp

@@ -34,7 +34,7 @@
 
 //KDE includes
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 namespace BookshelfManager {

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>
 

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>
 

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>

bibletime/frontend/cswordsetupmodulelistview.h

@@ -20,7 +20,7 @@
 #include <tqmap.h>
 
 //KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 class CSwordModuleInfo;
 class CSwordBackend;

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) {

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) {

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;
 

bibletime/frontend/displaywindow/cbiblereadwindow.h

@@ -22,7 +22,7 @@
 #include <tqwidget.h>
 
 //KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 
 
 class CTransliterationButton;

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>
 

bibletime/frontend/displaywindow/cbuttons.cpp

@@ -21,7 +21,7 @@
 #include <tqtooltip.h>
 
 //KDE includes
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 
 

bibletime/frontend/displaywindow/cbuttons.h

@@ -20,7 +20,7 @@
 #include <tqdict.h>
 
 //KDE includes
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 class TDEPopupMenu;
 

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;
 

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;

bibletime/frontend/displaywindow/cdisplaywindow.h

@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 
 //KDE includes
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 //Forward declarations

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;

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()) );

bibletime/frontend/displaywindow/clexiconreadwindow.h

@@ -19,7 +19,7 @@
 #include <tqwidget.h>
 
 //KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 
 class CSwordKey;
 class CSwordLDKey;

bibletime/frontend/displaywindow/cmodulechooserbar.h

@@ -24,7 +24,7 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 /**
   * @author The BibleTime team

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;

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>
 

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;

bibletime/frontend/keychooser/cbooktreechooser.h

@@ -30,7 +30,7 @@
 #include <tqstringlist.h>
 
 //KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 class CSwordKey;
 class CSwordBookModuleInfo;

bibletime/frontend/mainindex/cindexitem.h

@@ -21,7 +21,7 @@
 #include <tqdom.h>
 
 //KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TDEConfig;
 class CFolderBase;

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>
 

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;
 

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>

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>

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 {

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 {

bibletime/frontend/searchdialog/cmoduleresultview.h

@@ -19,7 +19,7 @@
 //TQt includes
 
 //KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 //forward declarations
 class TQLabel;

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;

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;

bibletime/frontend/searchdialog/csearchdialogpages.h

@@ -25,7 +25,7 @@
 #include <tqvgroupbox.h>
 
 //KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 //forward declarations
 class TQLabel;

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 {

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;

bibletime/frontend/util/csortlistviewitem.h

@@ -15,7 +15,7 @@
 
 #include <tqmap.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace util {
 

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