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

---
 src/bookmarksdlg.cpp | 2 +-
 src/bookreader.cpp   | 8 ++++----
 src/bookwidget.cpp   | 2 +-
 src/main.cpp         | 2 +-
 src/theme.cpp        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/bookmarksdlg.cpp b/src/bookmarksdlg.cpp
index 856876b..49b3a8a 100644
--- a/src/bookmarksdlg.cpp
+++ b/src/bookmarksdlg.cpp
@@ -17,7 +17,7 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqvariant.h>
 #include <tqpushbutton.h>
 #include <tqheader.h>
diff --git a/src/bookreader.cpp b/src/bookreader.cpp
index 7168197..885e70f 100644
--- a/src/bookreader.cpp
+++ b/src/bookreader.cpp
@@ -26,12 +26,12 @@
 #include <tdeversion.h>
 #include <kencodingfiledialog.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <kstatusbar.h>
 #include <ksplashscreen.h>
diff --git a/src/bookwidget.cpp b/src/bookwidget.cpp
index ccbfef1..c645524 100644
--- a/src/bookwidget.cpp
+++ b/src/bookwidget.cpp
@@ -25,7 +25,7 @@
 #include <tqtextstream.h>
 #include <tqtextcodec.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include "bookwidget.h"
 #include "theme.h"
diff --git a/src/main.cpp b/src/main.cpp
index bb08f7d..fadd9a2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,7 +21,7 @@
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksplashscreen.h>
 #include "bookreader.h"
 
diff --git a/src/theme.cpp b/src/theme.cpp
index 6188720..39fc091 100644
--- a/src/theme.cpp
+++ b/src/theme.cpp
@@ -20,7 +20,7 @@
 #include <tqstring.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include "theme.h"