summaryrefslogtreecommitdiffstats
path: root/libemailfunctions
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /libemailfunctions
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libemailfunctions')
-rw-r--r--libemailfunctions/email.cpp2
-rw-r--r--libemailfunctions/kasciistricmp.h4
-rw-r--r--libemailfunctions/networkstatus.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp
index b4d81f0b2..03999f879 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 a7abc104e..10c1551e8 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 eb99bcff5..878a564af 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>