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/plugins/hadifix/hadifixconf.cpp    | 4 ++--
 kttsd/plugins/hadifix/hadifixconfigui.ui | 2 +-
 kttsd/plugins/hadifix/voicefileui.ui     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kttsd/plugins/hadifix')

diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp
index 08b8ab0..9b86384 100644
--- a/kttsd/plugins/hadifix/hadifixconf.cpp
+++ b/kttsd/plugins/hadifix/hadifixconf.cpp
@@ -25,11 +25,11 @@
 #include <tqfile.h>
 
 // KDE includes.
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeaboutdata.h>
 #include <tdeaboutapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kcombobox.h>
 #include <kstandarddirs.h>
diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui
index 8a686c2..367200c 100644
--- a/kttsd/plugins/hadifix/hadifixconfigui.ui
+++ b/kttsd/plugins/hadifix/hadifixconfigui.ui
@@ -636,7 +636,7 @@
     <include location="global" impldecl="in declaration">tqpixmap.h</include>
     <include location="global" impldecl="in declaration">kurl.h</include>
     <include location="global" impldecl="in declaration">tqmap.h</include>
-    <include location="global" impldecl="in implementation">kglobal.h</include>
+    <include location="global" impldecl="in implementation">tdeglobal.h</include>
     <include location="global" impldecl="in implementation">tqstringlist.h</include>
     <include location="global" impldecl="in implementation">math.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
diff --git a/kttsd/plugins/hadifix/voicefileui.ui b/kttsd/plugins/hadifix/voicefileui.ui
index 32b4fc5..c333670 100644
--- a/kttsd/plugins/hadifix/voicefileui.ui
+++ b/kttsd/plugins/hadifix/voicefileui.ui
@@ -99,7 +99,7 @@
 </connections>
 <includes>
     <include location="global" impldecl="in implementation">kurlrequesterdlg.h</include>
-    <include location="global" impldecl="in implementation">kmessagebox.h</include>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
     <include location="local" impldecl="in implementation">hadifixproc.h</include>
     <include location="local" impldecl="in implementation">voicefileui.ui.h</include>
 </includes>
-- 
cgit v1.2.1