From c96f95eaac4e5415ddb92103a5c29ab55597408d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:53:57 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 ksayit/Freeverb_plugin/ksayitfreeverblib.cpp | 2 +-
 ksayit/KTTSD_Lib/kttsdlib.cpp                | 4 ++--
 ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp       | 4 ++--
 ksayit/src/contextmenuhandler.cpp            | 4 ++--
 ksayit/src/docbookclasses.cpp                | 6 +++---
 ksayit/src/docbookgenerator.cpp              | 4 ++--
 ksayit/src/docbookparser.cpp                 | 2 +-
 ksayit/src/doctreeviewimpl.cpp               | 6 +++---
 ksayit/src/ksayit.cpp                        | 6 +++---
 ksayit/src/ksayitbookmarkhandler.cpp         | 4 ++--
 ksayit/src/ksayitsystemtray.cpp              | 4 ++--
 ksayit/src/ksayitsystemtray.h                | 2 +-
 ksayit/src/ksayitviewimpl.cpp                | 4 ++--
 ksayit/src/main.cpp                          | 4 ++--
 ksayit/src/saxhandler.cpp                    | 4 ++--
 ksayit/src/voicesetupdlg.cpp                 | 6 +++---
 16 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'ksayit')

diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
index 02560b6..1141e68 100644
--- a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
+++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
@@ -16,7 +16,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdemacros.h>
 #include <arts/artsmodules.h>
 
diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp
index ff2e023..32e66e4 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlib.cpp
@@ -16,8 +16,8 @@
 #include <tqstringlist.h>
 
 // KDE includes
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
index c176d78..1dc4196 100644
--- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
@@ -17,8 +17,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // App specific includes
 #include "kttsdlibsetupimpl.h"
diff --git a/ksayit/src/contextmenuhandler.cpp b/ksayit/src/contextmenuhandler.cpp
index 9961b18..d6c5ddb 100644
--- a/ksayit/src/contextmenuhandler.cpp
+++ b/ksayit/src/contextmenuhandler.cpp
@@ -16,8 +16,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 // App specific includes
diff --git a/ksayit/src/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp
index 914d99a..6b9e8d9 100644
--- a/ksayit/src/docbookclasses.cpp
+++ b/ksayit/src/docbookclasses.cpp
@@ -18,10 +18,10 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // App specific includes
 #include "parasaxparser.h"
diff --git a/ksayit/src/docbookgenerator.cpp b/ksayit/src/docbookgenerator.cpp
index d9ab809..475ffaf 100644
--- a/ksayit/src/docbookgenerator.cpp
+++ b/ksayit/src/docbookgenerator.cpp
@@ -16,8 +16,8 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // App specific includes
 #include "docbookgenerator.h"
diff --git a/ksayit/src/docbookparser.cpp b/ksayit/src/docbookparser.cpp
index 4cdad6a..7f0c74f 100644
--- a/ksayit/src/docbookparser.cpp
+++ b/ksayit/src/docbookparser.cpp
@@ -17,7 +17,7 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // App specific includes
 #include "docbookparser.h"
diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp
index 9f343b2..f72a717 100644
--- a/ksayit/src/doctreeviewimpl.cpp
+++ b/ksayit/src/doctreeviewimpl.cpp
@@ -23,10 +23,10 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 
 // App specific includes
diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp
index 82ceb31..f1cbbfc 100644
--- a/ksayit/src/ksayit.cpp
+++ b/ksayit/src/ksayit.cpp
@@ -24,13 +24,13 @@
 #include <tqfile.h>
 
 // include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>
diff --git a/ksayit/src/ksayitbookmarkhandler.cpp b/ksayit/src/ksayitbookmarkhandler.cpp
index d764681..476c8b0 100644
--- a/ksayit/src/ksayitbookmarkhandler.cpp
+++ b/ksayit/src/ksayitbookmarkhandler.cpp
@@ -15,8 +15,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 // App specific includes
diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp
index 9700b97..4a8ac59 100644
--- a/ksayit/src/ksayitsystemtray.cpp
+++ b/ksayit/src/ksayitsystemtray.cpp
@@ -20,8 +20,8 @@
 #include <tqtranslator.h>
 
 // KDE includes
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // App specific includes
 #include "ksayitsystemtray.h"
diff --git a/ksayit/src/ksayitsystemtray.h b/ksayit/src/ksayitsystemtray.h
index ddade16..02e35bd 100644
--- a/ksayit/src/ksayitsystemtray.h
+++ b/ksayit/src/ksayitsystemtray.h
@@ -27,7 +27,7 @@
 #include <ksystemtray.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 
diff --git a/ksayit/src/ksayitviewimpl.cpp b/ksayit/src/ksayitviewimpl.cpp
index e3eb5ee..72b9e03 100644
--- a/ksayit/src/ksayitviewimpl.cpp
+++ b/ksayit/src/ksayitviewimpl.cpp
@@ -26,9 +26,9 @@ using namespace std;
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // App specific includes
 #include "ksayitviewimpl.h"
diff --git a/ksayit/src/main.cpp b/ksayit/src/main.cpp
index b8ba783..66aead2 100644
--- a/ksayit/src/main.cpp
+++ b/ksayit/src/main.cpp
@@ -23,8 +23,8 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <arts/kartsdispatcher.h>
 #include <dcopclient.h>
 
diff --git a/ksayit/src/saxhandler.cpp b/ksayit/src/saxhandler.cpp
index e8035dc..9410be6 100644
--- a/ksayit/src/saxhandler.cpp
+++ b/ksayit/src/saxhandler.cpp
@@ -14,8 +14,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // App specific includes
 #include "saxhandler.h"
diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp
index f8b30bd..6b1a270 100644
--- a/ksayit/src/voicesetupdlg.cpp
+++ b/ksayit/src/voicesetupdlg.cpp
@@ -28,10 +28,10 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // App specific includes
 #include "voicesetupdlg.h"
-- 
cgit v1.2.1