diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
| commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
| tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /libkmime | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libkmime')
| -rw-r--r-- | libkmime/kmime_codec_identity.cpp | 2 | ||||
| -rw-r--r-- | libkmime/kmime_content.cpp | 4 | ||||
| -rw-r--r-- | libkmime/kmime_header_parsing.cpp | 2 | ||||
| -rw-r--r-- | libkmime/kmime_headers.cpp | 2 | ||||
| -rw-r--r-- | libkmime/kmime_mdn.cpp | 2 | ||||
| -rw-r--r-- | libkmime/kmime_util.cpp | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/libkmime/kmime_codec_identity.cpp b/libkmime/kmime_codec_identity.cpp index 529084d56..27fe8f42e 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 20862496d..037d8f4d8 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 70d0b657d..5c9423b72 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 649e1e614..2679971a9 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 bba37023c..4040d8934 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 38f282752..d93c49901 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 ) |