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

---
 libemailfunctions/email.cpp         | 2 +-
 libemailfunctions/kasciistricmp.h   | 4 ++--
 libemailfunctions/networkstatus.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libemailfunctions')

diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp
index b4d81f0b..03999f87 100644
--- a/libemailfunctions/email.cpp
+++ b/libemailfunctions/email.cpp
@@ -21,7 +21,7 @@
 #include "email.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kidna.h>
 #include <kmime_util.h>
 
diff --git a/libemailfunctions/kasciistricmp.h b/libemailfunctions/kasciistricmp.h
index a7abc104..10c1551e 100644
--- a/libemailfunctions/kasciistricmp.h
+++ b/libemailfunctions/kasciistricmp.h
@@ -19,8 +19,8 @@
 #include <tdeversion.h>
 
 #if KDE_IS_VERSION(3,3,89)
-// get kasciistricmp from kglobal.h
-#include <kglobal.h>
+// get kasciistricmp from tdeglobal.h
+#include <tdeglobal.h>
 #else
 // define kasciistricmp to this tdepim symbol (renamed to avoid problems when upgrading tdelibs later)
 int tdepim_kasciistricmp( const char *str1, const char *str2 );
diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp
index eb99bcff..878a564a 100644
--- a/libemailfunctions/networkstatus.cpp
+++ b/libemailfunctions/networkstatus.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstaticdeleter.h>
 
 #include <dcopref.h>
-- 
cgit v1.2.3