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

---
 libkmime/kmime_codec_identity.cpp | 2 +-
 libkmime/kmime_content.cpp        | 4 ++--
 libkmime/kmime_header_parsing.cpp | 2 +-
 libkmime/kmime_headers.cpp        | 2 +-
 libkmime/kmime_mdn.cpp            | 2 +-
 libkmime/kmime_util.cpp           | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'libkmime')

diff --git a/libkmime/kmime_codec_identity.cpp b/libkmime/kmime_codec_identity.cpp
index 529084d5..27fe8f42 100644
--- a/libkmime/kmime_codec_identity.cpp
+++ b/libkmime/kmime_codec_identity.cpp
@@ -32,7 +32,7 @@
 #include "kmime_codec_identity.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <cassert>
 #include <cstring>
diff --git a/libkmime/kmime_content.cpp b/libkmime/kmime_content.cpp
index 20862496..037d8f4d 100644
--- a/libkmime/kmime_content.cpp
+++ b/libkmime/kmime_content.cpp
@@ -18,8 +18,8 @@
 
 #include <kcharsets.h>
 #include <kmdcodec.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqtextcodec.h>
diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp
index 70d0b657..5c9423b7 100644
--- a/libkmime/kmime_header_parsing.cpp
+++ b/libkmime/kmime_header_parsing.cpp
@@ -36,7 +36,7 @@
 #include "kmime_util.h"
 #include "kmime_warning.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include <tqtextcodec.h>
diff --git a/libkmime/kmime_headers.cpp b/libkmime/kmime_headers.cpp
index 649e1e61..2679971a 100644
--- a/libkmime/kmime_headers.cpp
+++ b/libkmime/kmime_headers.cpp
@@ -31,7 +31,7 @@
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 #include <krfcdate.h>
 
diff --git a/libkmime/kmime_mdn.cpp b/libkmime/kmime_mdn.cpp
index bba37023..4040d893 100644
--- a/libkmime/kmime_mdn.cpp
+++ b/libkmime/kmime_mdn.cpp
@@ -34,7 +34,7 @@
 #include "kmime_version.h"
 #include "kmime_util.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqcstring.h>
diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp
index 38f28275..d93c4990 100644
--- a/libkmime/kmime_util.cpp
+++ b/libkmime/kmime_util.cpp
@@ -21,8 +21,8 @@
 #include "kmime_util.h"
 
 #include <kmdcodec.h> // for KCodec::{quotedPrintableDe,base64{En,De}}code
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <tdeversion.h>
 #if KDE_IS_VERSION( 3, 1, 90 )
-- 
cgit v1.2.3