From 20adf64e6b87ea937e7aeacf1f1a31d708ff2c78 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:44:05 -0600
Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 bibletime/backend/bt_osishtml.cpp                          | 2 +-
 bibletime/backend/cdisplaytemplatemgr.cpp                  | 2 +-
 bibletime/backend/cdisplaytemplatemgr.h                    | 2 +-
 bibletime/backend/chtmlexportrendering.cpp                 | 2 +-
 bibletime/backend/clanguagemgr.cpp                         | 2 +-
 bibletime/backend/cswordbackend.cpp                        | 2 +-
 bibletime/backend/cswordlexiconmoduleinfo.cpp              | 2 +-
 bibletime/backend/cswordmoduleinfo.cpp                     | 4 ++--
 bibletime/backend/ctextrendering.cpp                       | 2 +-
 bibletime/bibletime.cpp                                    | 4 ++--
 bibletime/bibletime_init.cpp                               | 6 +++---
 bibletime/bibletime_slots.cpp                              | 6 +++---
 bibletime/frontend/btinstallmgr.cpp                        | 6 +++---
 bibletime/frontend/cbtconfig.cpp                           | 4 ++--
 bibletime/frontend/cexportmanager.cpp                      | 2 +-
 bibletime/frontend/cinfodisplay.cpp                        | 2 +-
 bibletime/frontend/cinputdialog.cpp                        | 2 +-
 bibletime/frontend/cmanageindiceswidget.cpp                | 2 +-
 bibletime/frontend/cmdiarea.cpp                            | 2 +-
 bibletime/frontend/cmoduleindexdialog.cpp                  | 2 +-
 bibletime/frontend/coptionsdialog.cpp                      | 4 ++--
 bibletime/frontend/coptionsdialog.h                        | 2 +-
 bibletime/frontend/cprofile.cpp                            | 2 +-
 bibletime/frontend/cswordsetupdialog.cpp                   | 4 ++--
 bibletime/frontend/cswordsetupinstallsourcesdialog.cpp     | 2 +-
 bibletime/frontend/cswordsetupmodulelistview.cpp           | 2 +-
 bibletime/frontend/display/cdisplay.cpp                    | 2 +-
 bibletime/frontend/display/chtmlreaddisplay.cpp            | 2 +-
 bibletime/frontend/display/chtmlwritedisplay.cpp           | 2 +-
 bibletime/frontend/display/cplainwritedisplay.cpp          | 2 +-
 bibletime/frontend/display/creaddisplay.cpp                | 2 +-
 bibletime/frontend/displaywindow/cbiblereadwindow.cpp      | 2 +-
 bibletime/frontend/displaywindow/cbookreadwindow.cpp       | 2 +-
 bibletime/frontend/displaywindow/cbuttons.cpp              | 2 +-
 bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp | 2 +-
 bibletime/frontend/displaywindow/cdisplaywindow.cpp        | 2 +-
 bibletime/frontend/displaywindow/chtmlwritewindow.cpp      | 2 +-
 bibletime/frontend/displaywindow/clexiconreadwindow.cpp    | 2 +-
 bibletime/frontend/displaywindow/cmodulechooserbutton.cpp  | 4 ++--
 bibletime/frontend/displaywindow/cplainwritewindow.cpp     | 4 ++--
 bibletime/frontend/displaywindow/creadwindow.cpp           | 2 +-
 bibletime/frontend/displaywindow/cwritewindow.cpp          | 4 ++--
 bibletime/frontend/keychooser/cbiblekeychooser.cpp         | 2 +-
 bibletime/frontend/keychooser/ckeyreferencewidget.cpp      | 4 ++--
 bibletime/frontend/keychooser/clexiconkeychooser.cpp       | 2 +-
 bibletime/frontend/keychooser/crefselectdialog.cpp         | 2 +-
 bibletime/frontend/mainindex/cindexitem.cpp                | 2 +-
 bibletime/frontend/mainindex/cmainindex.cpp                | 6 +++---
 bibletime/frontend/manageindicesform.cpp                   | 2 +-
 bibletime/frontend/searchdialog/cmodulechooser.cpp         | 2 +-
 bibletime/frontend/searchdialog/cmoduleresultview.cpp      | 2 +-
 bibletime/frontend/searchdialog/crangechooser.cpp          | 2 +-
 bibletime/frontend/searchdialog/csearchanalysis.cpp        | 2 +-
 bibletime/frontend/searchdialog/csearchdialog.cpp          | 2 +-
 bibletime/frontend/searchdialog/csearchdialogpages.cpp     | 4 ++--
 bibletime/frontend/searchdialog/csearchresultview.cpp      | 2 +-
 bibletime/frontend/searchdialog/searchoptionsform.cpp      | 2 +-
 bibletime/frontend/searchdialog/searchresultsform.cpp      | 2 +-
 bibletime/main.cpp                                         | 4 ++--
 bibletime/util/cresmgr.cpp                                 | 4 ++--
 bibletime/util/ctoolclass.cpp                              | 6 +++---
 61 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/bibletime/backend/bt_osishtml.cpp b/bibletime/backend/bt_osishtml.cpp
index 0726bf5..997873c 100644
--- a/bibletime/backend/bt_osishtml.cpp
+++ b/bibletime/backend/bt_osishtml.cpp
@@ -28,7 +28,7 @@
 #include <utilxml.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 //TQt includes
 #include <tqstring.h>
diff --git a/bibletime/backend/cdisplaytemplatemgr.cpp b/bibletime/backend/cdisplaytemplatemgr.cpp
index 453fcaa..2d0cad3 100644
--- a/bibletime/backend/cdisplaytemplatemgr.cpp
+++ b/bibletime/backend/cdisplaytemplatemgr.cpp
@@ -27,7 +27,7 @@
 #include <tqfileinfo.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <iostream>
diff --git a/bibletime/backend/cdisplaytemplatemgr.h b/bibletime/backend/cdisplaytemplatemgr.h
index 5926fd9..7adb5cf 100644
--- a/bibletime/backend/cdisplaytemplatemgr.h
+++ b/bibletime/backend/cdisplaytemplatemgr.h
@@ -21,7 +21,7 @@
 #include <tqstringlist.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**
  * Manages the display templates used in the filters and display classes.
diff --git a/bibletime/backend/chtmlexportrendering.cpp b/bibletime/backend/chtmlexportrendering.cpp
index dc69b46..6a04b82 100644
--- a/bibletime/backend/chtmlexportrendering.cpp
+++ b/bibletime/backend/chtmlexportrendering.cpp
@@ -24,7 +24,7 @@
 #include "util/scoped_resource.h"
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace Rendering {
 
diff --git a/bibletime/backend/clanguagemgr.cpp b/bibletime/backend/clanguagemgr.cpp
index 53086b4..8f73ec3 100644
--- a/bibletime/backend/clanguagemgr.cpp
+++ b/bibletime/backend/clanguagemgr.cpp
@@ -21,7 +21,7 @@
 #include <tqptrlist.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 //initialize static language list
 CLanguageMgr::LanguageList CLanguageMgr::m_langList;
diff --git a/bibletime/backend/cswordbackend.cpp b/bibletime/backend/cswordbackend.cpp
index 65df642..1c218b3 100644
--- a/bibletime/backend/cswordbackend.cpp
+++ b/bibletime/backend/cswordbackend.cpp
@@ -37,7 +37,7 @@
 #include <tqfileinfo.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 
 //Sword includes
diff --git a/bibletime/backend/cswordlexiconmoduleinfo.cpp b/bibletime/backend/cswordlexiconmoduleinfo.cpp
index 18365d1..de4ed52 100644
--- a/bibletime/backend/cswordlexiconmoduleinfo.cpp
+++ b/bibletime/backend/cswordlexiconmoduleinfo.cpp
@@ -21,7 +21,7 @@
 //Sword includes
 #include <swmodule.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 //STL includes
diff --git a/bibletime/backend/cswordmoduleinfo.cpp b/bibletime/backend/cswordmoduleinfo.cpp
index f39ecd7..6dec4c6 100644
--- a/bibletime/backend/cswordmoduleinfo.cpp
+++ b/bibletime/backend/cswordmoduleinfo.cpp
@@ -33,8 +33,8 @@
 #include <tqfileinfo.h>
 
 //KDE includes
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
diff --git a/bibletime/backend/ctextrendering.cpp b/bibletime/backend/ctextrendering.cpp
index c5fe9f5..7a79078 100644
--- a/bibletime/backend/ctextrendering.cpp
+++ b/bibletime/backend/ctextrendering.cpp
@@ -28,7 +28,7 @@
 #include <tqregexp.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 using namespace Rendering;
diff --git a/bibletime/bibletime.cpp b/bibletime/bibletime.cpp
index 57bb7ca..6dd5198 100644
--- a/bibletime/bibletime.cpp
+++ b/bibletime/bibletime.cpp
@@ -45,9 +45,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdetoolbar.h>
 #include <krandomsequence.h>
 
diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp
index b0ab556..f8fb318 100644
--- a/bibletime/bibletime_init.cpp
+++ b/bibletime/bibletime_init.cpp
@@ -53,14 +53,14 @@
 #include <tdeapplication.h>
 #include <tdeconfigbase.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstddirs.h>
 #include <kstdaction.h>
 #include <tdetoolbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeversion.h>
 
diff --git a/bibletime/bibletime_slots.cpp b/bibletime/bibletime_slots.cpp
index ad3a1eb..123eeaa 100644
--- a/bibletime/bibletime_slots.cpp
+++ b/bibletime/bibletime_slots.cpp
@@ -49,10 +49,10 @@
 #include <kbugreport.h>
 #include <tdeaboutapplication.h>
 #include <kstandarddirs.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kedittoolbar.h>
 #include <tdepopupmenu.h>
 #include <khelpmenu.h>
diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp
index 060fbc3..d0ccb6d 100644
--- a/bibletime/frontend/btinstallmgr.cpp
+++ b/bibletime/frontend/btinstallmgr.cpp
@@ -18,12 +18,12 @@
 
 //KDE includes
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //Sword includes
 #include <filemgr.h>
diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp
index 996f0eb..14a4b47 100644
--- a/bibletime/frontend/cbtconfig.cpp
+++ b/bibletime/frontend/cbtconfig.cpp
@@ -34,8 +34,8 @@
 #endif
 #include <tdeconfig.h>
 #include <kcharsets.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
 #include <kstaticdeleter.h>
 
diff --git a/bibletime/frontend/cexportmanager.cpp b/bibletime/frontend/cexportmanager.cpp
index 9079f15..9aaedee 100644
--- a/bibletime/frontend/cexportmanager.cpp
+++ b/bibletime/frontend/cexportmanager.cpp
@@ -33,7 +33,7 @@
 //KDE includes
 #include <kprogress.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 //Sword includes
diff --git a/bibletime/frontend/cinfodisplay.cpp b/bibletime/frontend/cinfodisplay.cpp
index 251ec83..ba24636 100644
--- a/bibletime/frontend/cinfodisplay.cpp
+++ b/bibletime/frontend/cinfodisplay.cpp
@@ -38,7 +38,7 @@
 #include <tqregexp.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
 
 
diff --git a/bibletime/frontend/cinputdialog.cpp b/bibletime/frontend/cinputdialog.cpp
index f3aa4b8..6691966 100644
--- a/bibletime/frontend/cinputdialog.cpp
+++ b/bibletime/frontend/cinputdialog.cpp
@@ -20,7 +20,7 @@
 #include <tqlayout.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 
 CInputDialog::CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *parent, const char *name, const bool modal ) : KDialog(parent,name,modal) {
diff --git a/bibletime/frontend/cmanageindiceswidget.cpp b/bibletime/frontend/cmanageindiceswidget.cpp
index e69f198..3bf855f 100644
--- a/bibletime/frontend/cmanageindiceswidget.cpp
+++ b/bibletime/frontend/cmanageindiceswidget.cpp
@@ -33,7 +33,7 @@
 #include <tqcheckbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 
diff --git a/bibletime/frontend/cmdiarea.cpp b/bibletime/frontend/cmdiarea.cpp
index 9610a9f..64d98a8 100644
--- a/bibletime/frontend/cmdiarea.cpp
+++ b/bibletime/frontend/cmdiarea.cpp
@@ -21,7 +21,7 @@
 //KDE includes
 #include <tdepopupmenu.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //QT includes
 #include <tqobjectlist.h>
diff --git a/bibletime/frontend/cmoduleindexdialog.cpp b/bibletime/frontend/cmoduleindexdialog.cpp
index 3eb9c66..a2d48df 100644
--- a/bibletime/frontend/cmoduleindexdialog.cpp
+++ b/bibletime/frontend/cmoduleindexdialog.cpp
@@ -20,7 +20,7 @@
 //KDE includes
 #include <tdeapplication.h>
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 CModuleIndexDialog* CModuleIndexDialog::getInstance() {
 	static CModuleIndexDialog* instance = 0;
diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp
index 7f33814..013411d 100644
--- a/bibletime/frontend/coptionsdialog.cpp
+++ b/bibletime/frontend/coptionsdialog.cpp
@@ -49,8 +49,8 @@
 
 //KDE includes
 #include <kapp.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kkeydialog.h>
 #include <tdehtml_part.h>
diff --git a/bibletime/frontend/coptionsdialog.h b/bibletime/frontend/coptionsdialog.h
index 33b850e..bb492a1 100644
--- a/bibletime/frontend/coptionsdialog.h
+++ b/bibletime/frontend/coptionsdialog.h
@@ -32,7 +32,7 @@
 #include <tdeaccel.h>
 #include <kcolorbutton.h>
 #include <kapp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class TQHBox;
 class TQCheckBox;
diff --git a/bibletime/frontend/cprofile.cpp b/bibletime/frontend/cprofile.cpp
index f3d3c5e..1ff05e8 100644
--- a/bibletime/frontend/cprofile.cpp
+++ b/bibletime/frontend/cprofile.cpp
@@ -20,7 +20,7 @@
 
 //KDE includes
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define CURRENT_SYNTAX_VERSION 2
 
diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp
index 038a97a..f642d37 100644
--- a/bibletime/frontend/cswordsetupdialog.cpp
+++ b/bibletime/frontend/cswordsetupdialog.cpp
@@ -39,10 +39,10 @@
 #include <tdeconfig.h>
 #include <kdirselectdialog.h>
 #include <keditlistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kurl.h>
 
diff --git a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
index 681c0db..040d91f 100644
--- a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
+++ b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqfileinfo.h>
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdirselectdialog.h>
 
 namespace BookshelfManager {
diff --git a/bibletime/frontend/cswordsetupmodulelistview.cpp b/bibletime/frontend/cswordsetupmodulelistview.cpp
index d77d765..f2e4a1d 100644
--- a/bibletime/frontend/cswordsetupmodulelistview.cpp
+++ b/bibletime/frontend/cswordsetupmodulelistview.cpp
@@ -22,7 +22,7 @@
 #include <tqtooltip.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 using namespace sword;
diff --git a/bibletime/frontend/display/cdisplay.cpp b/bibletime/frontend/display/cdisplay.cpp
index 9accc71..23e70fd 100644
--- a/bibletime/frontend/display/cdisplay.cpp
+++ b/bibletime/frontend/display/cdisplay.cpp
@@ -27,7 +27,7 @@
 //KDE includes
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 CDisplayConnections::CDisplayConnections( CDisplay* display ) : m_display(display) {}
diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp
index ac65f84..1452390 100644
--- a/bibletime/frontend/display/chtmlreaddisplay.cpp
+++ b/bibletime/frontend/display/chtmlreaddisplay.cpp
@@ -43,7 +43,7 @@
 //KDE includes
 #include <tdeapplication.h>
 #include <tdehtmlview.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdehtml_events.h>
 
 #include <dom/dom2_range.h>
diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp
index 5a7d9a8..c35be5f 100644
--- a/bibletime/frontend/display/chtmlwritedisplay.cpp
+++ b/bibletime/frontend/display/chtmlwritedisplay.cpp
@@ -22,7 +22,7 @@
 //KDE includes
 #include <tdeaction.h>
 #include <tdetoolbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefontcombo.h>
 #include <kcolorbutton.h>
 #include <tdepopupmenu.h>
diff --git a/bibletime/frontend/display/cplainwritedisplay.cpp b/bibletime/frontend/display/cplainwritedisplay.cpp
index c11130b..950f724 100644
--- a/bibletime/frontend/display/cplainwritedisplay.cpp
+++ b/bibletime/frontend/display/cplainwritedisplay.cpp
@@ -21,7 +21,7 @@
 
 //KDE includes
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent) : TQTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) {
 	setTextFormat(TQt::PlainText);
diff --git a/bibletime/frontend/display/creaddisplay.cpp b/bibletime/frontend/display/creaddisplay.cpp
index 71c4f47..0c34dab 100644
--- a/bibletime/frontend/display/creaddisplay.cpp
+++ b/bibletime/frontend/display/creaddisplay.cpp
@@ -32,7 +32,7 @@
 #include <tqpopupmenu.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 CReadDisplay::CReadDisplay(CReadWindow* readWindow) :
 CDisplay(readWindow),
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
index c143774..df42c8d 100644
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
@@ -35,7 +35,7 @@
 
 //KDE includes
 #include <tdeaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 using namespace Profile;
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
index b7f4110..04da211 100644
--- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
@@ -28,7 +28,7 @@
 
 //KDE includes
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 
 using namespace Profile;
diff --git a/bibletime/frontend/displaywindow/cbuttons.cpp b/bibletime/frontend/displaywindow/cbuttons.cpp
index 007d3a1..42085fd 100644
--- a/bibletime/frontend/displaywindow/cbuttons.cpp
+++ b/bibletime/frontend/displaywindow/cbuttons.cpp
@@ -22,7 +22,7 @@
 
 //KDE includes
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 // CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *parent, const char *name )
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
index ff70654..63d9aaa 100644
--- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
@@ -26,7 +26,7 @@
 //KDE includes
 #include <tdeaction.h>
 #include <tdeaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 using namespace Profile;
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
index ae421f9..865a7ee 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
@@ -44,7 +44,7 @@
 //KDE includes
 #include <tdeversion.h>
 #include <tdeaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace Profile;
 
diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
index a167c4c..301ff75 100644
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
@@ -21,7 +21,7 @@
 
 //KDE includes
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace Profile;
 
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
index b5be4d6..b43f8a0 100644
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
@@ -31,7 +31,7 @@
 //KDE includes
 #include <tdeaccel.h>
 #include <tdetoolbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeversion.h>
 // #include <tdeactionclasses.h>
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
index 9aac0af..69ec064 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
+++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
@@ -23,8 +23,8 @@
 #include <tqvaluelist.h>
 
 //KDE includes
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name )
diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.cpp b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
index 1c795de..01037f9 100644
--- a/bibletime/frontend/displaywindow/cplainwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
@@ -23,8 +23,8 @@
 //KDE includes
 #include <tdeaction.h>
 #include <tdeaccel.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 using namespace Profile;
 
diff --git a/bibletime/frontend/displaywindow/creadwindow.cpp b/bibletime/frontend/displaywindow/creadwindow.cpp
index 20138ec..f568590 100644
--- a/bibletime/frontend/displaywindow/creadwindow.cpp
+++ b/bibletime/frontend/displaywindow/creadwindow.cpp
@@ -31,7 +31,7 @@
 #include <tdeaction.h>
 #include <tdeaccel.h>
 #include <tdestdaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace Profile;
 
diff --git a/bibletime/frontend/displaywindow/cwritewindow.cpp b/bibletime/frontend/displaywindow/cwritewindow.cpp
index aff121a..9915364 100644
--- a/bibletime/frontend/displaywindow/cwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/cwritewindow.cpp
@@ -17,8 +17,8 @@
 #include "frontend/cprofilewindow.h"
 
 //KDE includes
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 using namespace Profile;
 
diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.cpp b/bibletime/frontend/keychooser/cbiblekeychooser.cpp
index af8f320..bd6d003 100644
--- a/bibletime/frontend/keychooser/cbiblekeychooser.cpp
+++ b/bibletime/frontend/keychooser/cbiblekeychooser.cpp
@@ -26,7 +26,7 @@
 #include <tqpushbutton.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name )
 : CKeyChooser(modules, key, parent, name),
diff --git a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp b/bibletime/frontend/keychooser/ckeyreferencewidget.cpp
index b6a0503..ccf590c 100644
--- a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp
+++ b/bibletime/frontend/keychooser/ckeyreferencewidget.cpp
@@ -25,9 +25,9 @@
 #include <tqpixmap.h>
 #include <tqapplication.h>
 #include <kcompletion.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdecompletionbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kguiitem.h>
 
diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.cpp b/bibletime/frontend/keychooser/clexiconkeychooser.cpp
index 9c8c174..bf07939 100644
--- a/bibletime/frontend/keychooser/clexiconkeychooser.cpp
+++ b/bibletime/frontend/keychooser/clexiconkeychooser.cpp
@@ -29,7 +29,7 @@
 #include <tqlistbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name )
 : CKeyChooser(modules, key, parent, name),
diff --git a/bibletime/frontend/keychooser/crefselectdialog.cpp b/bibletime/frontend/keychooser/crefselectdialog.cpp
index ab618bc..65feea0 100644
--- a/bibletime/frontend/keychooser/crefselectdialog.cpp
+++ b/bibletime/frontend/keychooser/crefselectdialog.cpp
@@ -21,7 +21,7 @@
 #include "backend/cswordversekey.h"
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 //CRefSelectDialog::CRefSelectDialog(TQWidget *parent)
diff --git a/bibletime/frontend/mainindex/cindexitem.cpp b/bibletime/frontend/mainindex/cindexitem.cpp
index 4ab41c0..ec177b9 100644
--- a/bibletime/frontend/mainindex/cindexitem.cpp
+++ b/bibletime/frontend/mainindex/cindexitem.cpp
@@ -42,7 +42,7 @@
 
 //KDE includes
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
diff --git a/bibletime/frontend/mainindex/cmainindex.cpp b/bibletime/frontend/mainindex/cmainindex.cpp
index debedbf..24f297a 100644
--- a/bibletime/frontend/mainindex/cmainindex.cpp
+++ b/bibletime/frontend/mainindex/cmainindex.cpp
@@ -34,11 +34,11 @@
 #include <tqregexp.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 
 using namespace Printing;
 
diff --git a/bibletime/frontend/manageindicesform.cpp b/bibletime/frontend/manageindicesform.cpp
index 788960e..4b96573 100644
--- a/bibletime/frontend/manageindicesform.cpp
+++ b/bibletime/frontend/manageindicesform.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './manageindicesform.ui'
 **
diff --git a/bibletime/frontend/searchdialog/cmodulechooser.cpp b/bibletime/frontend/searchdialog/cmodulechooser.cpp
index 987d76c..8cdb315 100644
--- a/bibletime/frontend/searchdialog/cmodulechooser.cpp
+++ b/bibletime/frontend/searchdialog/cmodulechooser.cpp
@@ -38,7 +38,7 @@
 //KDE includes
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 namespace Search {
diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.cpp b/bibletime/frontend/searchdialog/cmoduleresultview.cpp
index bfec486..f34cdd7 100644
--- a/bibletime/frontend/searchdialog/cmoduleresultview.cpp
+++ b/bibletime/frontend/searchdialog/cmoduleresultview.cpp
@@ -22,7 +22,7 @@
 //TQt includes
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 
diff --git a/bibletime/frontend/searchdialog/crangechooser.cpp b/bibletime/frontend/searchdialog/crangechooser.cpp
index 8c5f409..d9d5456 100644
--- a/bibletime/frontend/searchdialog/crangechooser.cpp
+++ b/bibletime/frontend/searchdialog/crangechooser.cpp
@@ -38,7 +38,7 @@
 //KDE includes
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 namespace Search {
diff --git a/bibletime/frontend/searchdialog/csearchanalysis.cpp b/bibletime/frontend/searchdialog/csearchanalysis.cpp
index 49993cc..12f5eb3 100644
--- a/bibletime/frontend/searchdialog/csearchanalysis.cpp
+++ b/bibletime/frontend/searchdialog/csearchanalysis.cpp
@@ -39,7 +39,7 @@
 //KDE includes
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 namespace Search {
diff --git a/bibletime/frontend/searchdialog/csearchdialog.cpp b/bibletime/frontend/searchdialog/csearchdialog.cpp
index 2537345..3b9739a 100644
--- a/bibletime/frontend/searchdialog/csearchdialog.cpp
+++ b/bibletime/frontend/searchdialog/csearchdialog.cpp
@@ -42,7 +42,7 @@
 //KDE includes
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 namespace Search {
diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.cpp b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
index 3f948e5..80cd1b0 100644
--- a/bibletime/frontend/searchdialog/csearchdialogpages.cpp
+++ b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
@@ -35,10 +35,10 @@
 #include <tqeventloop.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <tdeapplication.h>
 
diff --git a/bibletime/frontend/searchdialog/csearchresultview.cpp b/bibletime/frontend/searchdialog/csearchresultview.cpp
index 6018fa9..1571b13 100644
--- a/bibletime/frontend/searchdialog/csearchresultview.cpp
+++ b/bibletime/frontend/searchdialog/csearchresultview.cpp
@@ -21,7 +21,7 @@
 //TQt includes
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 
diff --git a/bibletime/frontend/searchdialog/searchoptionsform.cpp b/bibletime/frontend/searchdialog/searchoptionsform.cpp
index cac251b..88f79e8 100644
--- a/bibletime/frontend/searchdialog/searchoptionsform.cpp
+++ b/bibletime/frontend/searchdialog/searchoptionsform.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './searchoptionsform.ui'
 **
diff --git a/bibletime/frontend/searchdialog/searchresultsform.cpp b/bibletime/frontend/searchdialog/searchresultsform.cpp
index 2986e16..60e3e91 100644
--- a/bibletime/frontend/searchdialog/searchresultsform.cpp
+++ b/bibletime/frontend/searchdialog/searchresultsform.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './searchresultsform.ui'
 **
diff --git a/bibletime/main.cpp b/bibletime/main.cpp
index a34a185..c706cf9 100644
--- a/bibletime/main.cpp
+++ b/bibletime/main.cpp
@@ -36,12 +36,12 @@
 //KDE includes
 #include <tdecmdlineargs.h>
 #include <kcrash.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 bool showDebugMessages = false;
 BibleTime* bibletime_ptr = 0;
diff --git a/bibletime/util/cresmgr.cpp b/bibletime/util/cresmgr.cpp
index c2f0ccb..0b848db 100644
--- a/bibletime/util/cresmgr.cpp
+++ b/bibletime/util/cresmgr.cpp
@@ -15,8 +15,8 @@
 #include "backend/cswordbackend.h"
 
 //KDE includes
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 namespace CResMgr {
 	namespace modules {
diff --git a/bibletime/util/ctoolclass.cpp b/bibletime/util/ctoolclass.cpp
index 016efdb..c911a27 100644
--- a/bibletime/util/ctoolclass.cpp
+++ b/bibletime/util/ctoolclass.cpp
@@ -24,11 +24,11 @@
 #include <tqregexp.h>
 
 //KDE includes
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
 #include <tdeapplication.h>