diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
| commit | ed99a30644c19b0a3cf0d2147243532df4daa16b (patch) | |
| tree | 7f3f2850e59824fdf100a642367a82b1e7f0204f /tdehtml/misc | |
| parent | e5f2d46e9caf6942f365f1b454087dda71a340f7 (diff) | |
| download | tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml/misc')
| -rw-r--r-- | tdehtml/misc/arena.cpp | 2 | ||||
| -rw-r--r-- | tdehtml/misc/decoder.cpp | 4 | ||||
| -rw-r--r-- | tdehtml/misc/htmlhashes.cpp | 2 | ||||
| -rw-r--r-- | tdehtml/misc/htmltags.h | 2 | ||||
| -rw-r--r-- | tdehtml/misc/knsplugininstaller.cpp | 6 | ||||
| -rw-r--r-- | tdehtml/misc/loader.cpp | 4 | ||||
| -rw-r--r-- | tdehtml/misc/loader_jpeg.cpp | 2 | ||||
| -rw-r--r-- | tdehtml/misc/maketags | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/tdehtml/misc/arena.cpp b/tdehtml/misc/arena.cpp index cfbce24ab..e2513ba36 100644 --- a/tdehtml/misc/arena.cpp +++ b/tdehtml/misc/arena.cpp @@ -45,7 +45,7 @@ #include <config.h> #include <stdlib.h> #include <string.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "arena.h" #ifdef HAVE_GETPAGESIZE diff --git a/tdehtml/misc/decoder.cpp b/tdehtml/misc/decoder.cpp index 6000aa9cf..28c8a5e9d 100644 --- a/tdehtml/misc/decoder.cpp +++ b/tdehtml/misc/decoder.cpp @@ -39,12 +39,12 @@ using namespace tdehtml; #include <tqregexp.h> #include <tqtextcodec.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <ctype.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> diff --git a/tdehtml/misc/htmlhashes.cpp b/tdehtml/misc/htmlhashes.cpp index e073f0964..376007819 100644 --- a/tdehtml/misc/htmlhashes.cpp +++ b/tdehtml/misc/htmlhashes.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> +#include <tdeglobal.h> #include "htmlhashes.h" #include "htmltags.c" diff --git a/tdehtml/misc/htmltags.h b/tdehtml/misc/htmltags.h index d8fbb3236..bf9a8ded8 100644 --- a/tdehtml/misc/htmltags.h +++ b/tdehtml/misc/htmltags.h @@ -5,7 +5,7 @@ #define TDEHTML_TAGS_H #include "dom/dom_string.h" -#include <kglobal.h> +#include <tdeglobal.h> KDE_NO_EXPORT const char* getTagName(unsigned short id); diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp index 0edcc34ea..b8b94cd6b 100644 --- a/tdehtml/misc/knsplugininstaller.cpp +++ b/tdehtml/misc/knsplugininstaller.cpp @@ -24,11 +24,11 @@ #include "knsplugininstaller.moc" #include <kdebug.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <netaccess.h> #include <tqbuttongroup.h> diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp index b7f42aa29..7621b5e4f 100644 --- a/tdehtml/misc/loader.cpp +++ b/tdehtml/misc/loader.cpp @@ -59,7 +59,7 @@ #include <tdeapplication.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kimageio.h> #include <kcharsets.h> #include <kiconloader.h> @@ -71,7 +71,7 @@ #ifdef IMAGE_TITLES #include <tqfile.h> #include <tdefilemetainfo.h> -#include <ktempfile.h> +#include <tdetempfile.h> #endif #include "html/html_documentimpl.h" diff --git a/tdehtml/misc/loader_jpeg.cpp b/tdehtml/misc/loader_jpeg.cpp index 72816817f..9ee5378f9 100644 --- a/tdehtml/misc/loader_jpeg.cpp +++ b/tdehtml/misc/loader_jpeg.cpp @@ -37,7 +37,7 @@ #include <stdio.h> #include <setjmp.h> #include <tqdatetime.h> -#include <kglobal.h> +#include <tdeglobal.h> extern "C" { #define XMD_H diff --git a/tdehtml/misc/maketags b/tdehtml/misc/maketags index b2b472892..8a6abf0ed 100644 --- a/tdehtml/misc/maketags +++ b/tdehtml/misc/maketags @@ -41,7 +41,7 @@ print header <<EOF; #define TDEHTML_TAGS_H #include "dom/dom_string.h" -#include <kglobal.h> +#include <tdeglobal.h> KDE_NO_EXPORT const char* getTagName(unsigned short id); |