From d55ead645c5c41c83402a92f42c04edecd5cddaa Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Feb 2013 17:03:16 -0600
Subject: [PATCH] Rename common header files for consistency with class
 renaming

---
 bibletime/bibletime.cpp                                |  4 ++--
 bibletime/bibletime_init.cpp                           |  4 ++--
 bibletime/bibletime_slots.cpp                          | 10 +++++-----
 bibletime/bibletimeapp.h                               |  2 +-
 bibletime/frontend/btinstallmgr.cpp                    |  2 +-
 bibletime/frontend/cbtconfig.cpp                       |  2 +-
 bibletime/frontend/cexportmanager.cpp                  |  2 +-
 bibletime/frontend/cmdiarea.cpp                        |  2 +-
 bibletime/frontend/cmoduleindexdialog.cpp              |  2 +-
 bibletime/frontend/cswordsetupdialog.cpp               |  2 +-
 bibletime/frontend/display/cdisplay.cpp                |  2 +-
 bibletime/frontend/display/chtmlreaddisplay.cpp        |  2 +-
 bibletime/frontend/keychooser/cbooktreechooser.cpp     |  2 +-
 bibletime/frontend/kstartuplogo.cpp                    |  2 +-
 bibletime/frontend/searchdialog/cmodulechooser.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 |  2 +-
 bibletime/main.cpp                                     |  6 +++---
 bibletime/util/ctoolclass.cpp                          |  2 +-
 21 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/bibletime/bibletime.cpp b/bibletime/bibletime.cpp
index f6d5573..57bb7ca 100644
--- a/bibletime/bibletime.cpp
+++ b/bibletime/bibletime.cpp
@@ -42,9 +42,9 @@
 //KDE includes
 #include <tdeversion.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tdeaccel.h>
 #include <kmenubar.h>
diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp
index 91311e3..b0ab556 100644
--- a/bibletime/bibletime_init.cpp
+++ b/bibletime/bibletime_init.cpp
@@ -47,10 +47,10 @@
 #include <tqvbox.h>
 
 //KDE includes
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigbase.h>
 #include <tdeversion.h>
 #include <kglobal.h>
diff --git a/bibletime/bibletime_slots.cpp b/bibletime/bibletime_slots.cpp
index 52d5a64..ad3a1eb 100644
--- a/bibletime/bibletime_slots.cpp
+++ b/bibletime/bibletime_slots.cpp
@@ -43,14 +43,14 @@
 
 //KDE includes
 #include <tdeaction.h>
-#include <kapplication.h>
-#include <kaboutkde.h>
-#include <kaboutdialog.h>
+#include <tdeapplication.h>
+#include <tdeabouttde.h>
+#include <tdeaboutdialog.h>
 #include <kbugreport.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kstandarddirs.h>
 #include <kmenubar.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kedittoolbar.h>
diff --git a/bibletime/bibletimeapp.h b/bibletime/bibletimeapp.h
index 2e743d6..cf3b136 100644
--- a/bibletime/bibletimeapp.h
+++ b/bibletime/bibletimeapp.h
@@ -16,7 +16,7 @@
 #include "util/cpointers.h"
 
 //KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 /** The BibleTimeApp class is used to clean up all instances of the backend and to delete all created module objects.
   * @author The BibleTime team
diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp
index 9c9cb2e..060fbc3 100644
--- a/bibletime/frontend/btinstallmgr.cpp
+++ b/bibletime/frontend/btinstallmgr.cpp
@@ -17,7 +17,7 @@
 #include <tqfileinfo.h>
 
 //KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp
index b8f2e8e..996f0eb 100644
--- a/bibletime/frontend/cbtconfig.cpp
+++ b/bibletime/frontend/cbtconfig.cpp
@@ -26,7 +26,7 @@
 
 //KDE includes
 #include <tdeversion.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #if TDE_VERSION >= 0x030200
 #include <tdeactioncollection.h>
 #else
diff --git a/bibletime/frontend/cexportmanager.cpp b/bibletime/frontend/cexportmanager.cpp
index 3eb762c..9079f15 100644
--- a/bibletime/frontend/cexportmanager.cpp
+++ b/bibletime/frontend/cexportmanager.cpp
@@ -34,7 +34,7 @@
 #include <kprogress.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 //Sword includes
 #include <swkey.h>
diff --git a/bibletime/frontend/cmdiarea.cpp b/bibletime/frontend/cmdiarea.cpp
index 6a61bf8..9610a9f 100644
--- a/bibletime/frontend/cmdiarea.cpp
+++ b/bibletime/frontend/cmdiarea.cpp
@@ -20,7 +20,7 @@
 
 //KDE includes
 #include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 //QT includes
diff --git a/bibletime/frontend/cmoduleindexdialog.cpp b/bibletime/frontend/cmoduleindexdialog.cpp
index cf8652b..3eb9c66 100644
--- a/bibletime/frontend/cmoduleindexdialog.cpp
+++ b/bibletime/frontend/cmoduleindexdialog.cpp
@@ -18,7 +18,7 @@
 #include <tqstring.h>
 
 //KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprogress.h>
 #include <klocale.h>
 
diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp
index df00e8d..038a97a 100644
--- a/bibletime/frontend/cswordsetupdialog.cpp
+++ b/bibletime/frontend/cswordsetupdialog.cpp
@@ -35,7 +35,7 @@
 #include <tqdict.h>
 
 //KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdirselectdialog.h>
 #include <keditlistbox.h>
diff --git a/bibletime/frontend/display/cdisplay.cpp b/bibletime/frontend/display/cdisplay.cpp
index 167ec92..9accc71 100644
--- a/bibletime/frontend/display/cdisplay.cpp
+++ b/bibletime/frontend/display/cdisplay.cpp
@@ -25,7 +25,7 @@
 #include <tqtimer.h>
 
 //KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 
diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp
index 53f137c..ac65f84 100644
--- a/bibletime/frontend/display/chtmlreaddisplay.cpp
+++ b/bibletime/frontend/display/chtmlreaddisplay.cpp
@@ -41,7 +41,7 @@
 #endif
 
 //KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdehtmlview.h>
 #include <kglobalsettings.h>
 #include <tdehtml_events.h>
diff --git a/bibletime/frontend/keychooser/cbooktreechooser.cpp b/bibletime/frontend/keychooser/cbooktreechooser.cpp
index 8168eb6..8ca946c 100644
--- a/bibletime/frontend/keychooser/cbooktreechooser.cpp
+++ b/bibletime/frontend/keychooser/cbooktreechooser.cpp
@@ -21,7 +21,7 @@
 #include <tqcursor.h>
 
 //KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 ////////////
 
diff --git a/bibletime/frontend/kstartuplogo.cpp b/bibletime/frontend/kstartuplogo.cpp
index bb44792..8fe7fea 100644
--- a/bibletime/frontend/kstartuplogo.cpp
+++ b/bibletime/frontend/kstartuplogo.cpp
@@ -19,7 +19,7 @@
 #include <tqpixmap.h>
 
 //KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 //#include <kimageio.h>
 
diff --git a/bibletime/frontend/searchdialog/cmodulechooser.cpp b/bibletime/frontend/searchdialog/cmodulechooser.cpp
index b3bf576..987d76c 100644
--- a/bibletime/frontend/searchdialog/cmodulechooser.cpp
+++ b/bibletime/frontend/searchdialog/cmodulechooser.cpp
@@ -36,7 +36,7 @@
 #include <tqmessagebox.h>
 
 //KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/bibletime/frontend/searchdialog/crangechooser.cpp b/bibletime/frontend/searchdialog/crangechooser.cpp
index d141900..8c5f409 100644
--- a/bibletime/frontend/searchdialog/crangechooser.cpp
+++ b/bibletime/frontend/searchdialog/crangechooser.cpp
@@ -36,7 +36,7 @@
 #include <tqmessagebox.h>
 
 //KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/bibletime/frontend/searchdialog/csearchanalysis.cpp b/bibletime/frontend/searchdialog/csearchanalysis.cpp
index 010e356..49993cc 100644
--- a/bibletime/frontend/searchdialog/csearchanalysis.cpp
+++ b/bibletime/frontend/searchdialog/csearchanalysis.cpp
@@ -37,7 +37,7 @@
 #include <tqmessagebox.h>
 
 //KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/bibletime/frontend/searchdialog/csearchdialog.cpp b/bibletime/frontend/searchdialog/csearchdialog.cpp
index 3899805..2537345 100644
--- a/bibletime/frontend/searchdialog/csearchdialog.cpp
+++ b/bibletime/frontend/searchdialog/csearchdialog.cpp
@@ -40,7 +40,7 @@
 #include <tqmessagebox.h>
 
 //KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.cpp b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
index 4cd61fb..3f948e5 100644
--- a/bibletime/frontend/searchdialog/csearchdialogpages.cpp
+++ b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
@@ -40,7 +40,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 //Lucence includes
 //#include "CLucene.h"
diff --git a/bibletime/main.cpp b/bibletime/main.cpp
index 1458cfb..a34a185 100644
--- a/bibletime/main.cpp
+++ b/bibletime/main.cpp
@@ -34,13 +34,13 @@
 #include <tqdir.h>
 
 //KDE includes
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kcrash.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 bool showDebugMessages = false;
diff --git a/bibletime/util/ctoolclass.cpp b/bibletime/util/ctoolclass.cpp
index 988c3ea..016efdb 100644
--- a/bibletime/util/ctoolclass.cpp
+++ b/bibletime/util/ctoolclass.cpp
@@ -31,7 +31,7 @@
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 TQString CToolClass::locatehtml(const TQString &filename) {