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

---
 kttsd/filters/main.cpp                              | 2 +-
 kttsd/filters/sbd/sbdconf.cpp                       | 4 ++--
 kttsd/filters/sbd/sbdproc.cpp                       | 2 +-
 kttsd/filters/stringreplacer/stringreplacerconf.cpp | 6 +++---
 kttsd/filters/stringreplacer/stringreplacerproc.cpp | 4 ++--
 kttsd/filters/talkerchooser/talkerchooserconf.cpp   | 2 +-
 kttsd/filters/xmltransformer/xmltransformerconf.cpp | 2 +-
 kttsd/filters/xmltransformer/xmltransformerproc.cpp | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kttsd/filters')

diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp
index a97349d..daf1c4c 100644
--- a/kttsd/filters/main.cpp
+++ b/kttsd/filters/main.cpp
@@ -28,7 +28,7 @@ using namespace std;
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp
index b6c4f8e..d17e4b8 100644
--- a/kttsd/filters/sbd/sbdconf.cpp
+++ b/kttsd/filters/sbd/sbdconf.cpp
@@ -32,8 +32,8 @@
 #include <tqradiobutton.h>
 
 // KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kdialog.h>
diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp
index c534b47..d868d5c 100644
--- a/kttsd/filters/sbd/sbdproc.cpp
+++ b/kttsd/filters/sbd/sbdproc.cpp
@@ -28,7 +28,7 @@
 
 // KDE includes.
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 // KTTS includes.
diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
index ba71c70..00abecb 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
@@ -33,8 +33,8 @@
 #include <tqradiobutton.h>
 
 // KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kdialog.h>
@@ -46,7 +46,7 @@
 #include <ktrader.h>
 #include <tdeparts/componentfactory.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // KTTS includes.
 #include "filterconf.h"
diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.cpp b/kttsd/filters/stringreplacer/stringreplacerproc.cpp
index d26bd8c..f558d6d 100644
--- a/kttsd/filters/stringreplacer/stringreplacerproc.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerproc.cpp
@@ -28,9 +28,9 @@
 
 // KDE includes.
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 // KTTS includes.
diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
index 90cc4a3..ff9a6e8 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp
+++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 
 // KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
index 766e97c..ab45284 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 
 // KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
index 9105983..9a48f9c 100644
--- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
@@ -28,7 +28,7 @@
 // KDE includes.
 #include <tdeversion.h>
 #include <tdeconfig.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <kdebug.h>
-- 
cgit v1.2.3