From bd8e03f773a3373492ceb72ea2beb80b87e1fa6e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:10:47 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 src/bookreader.cpp | 6 +++---
 src/bookreader.h   | 2 +-
 src/settingsdlg.ui | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/bookreader.cpp b/src/bookreader.cpp
index 8d30cf7..7168197 100644
--- a/src/bookreader.cpp
+++ b/src/bookreader.cpp
@@ -17,8 +17,8 @@
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
@@ -36,7 +36,7 @@
 #include <kstatusbar.h>
 #include <ksplashscreen.h>
 #include <kstandarddirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kurl.h>
 #include <kurldrag.h>
diff --git a/src/bookreader.h b/src/bookreader.h
index af5e3a9..0bc5179 100644
--- a/src/bookreader.h
+++ b/src/bookreader.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include "bookwidget.h"
 
 
diff --git a/src/settingsdlg.ui b/src/settingsdlg.ui
index a708f27..d6afd5f 100644
--- a/src/settingsdlg.ui
+++ b/src/settingsdlg.ui
@@ -162,6 +162,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
 </includehints>
 </UI>
-- 
cgit v1.2.1