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/xml | |
| parent | e5f2d46e9caf6942f365f1b454087dda71a340f7 (diff) | |
| download | tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml/xml')
| -rw-r--r-- | tdehtml/xml/dom_docimpl.cpp | 4 | ||||
| -rw-r--r-- | tdehtml/xml/dom_nodeimpl.cpp | 2 | ||||
| -rw-r--r-- | tdehtml/xml/xml_tokenizer.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp index 47836b41e..423a2a51e 100644 --- a/tdehtml/xml/dom_docimpl.cpp +++ b/tdehtml/xml/dom_docimpl.cpp @@ -46,7 +46,7 @@ #include <tqptrstack.h> #include <tqpaintdevicemetrics.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> #include "rendering/counter_tree.h" @@ -60,7 +60,7 @@ #include "tdehtmlview.h" #include "tdehtml_part.h" -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstringhandler.h> #include <krfcdate.h> #include "tdehtml_settings.h" diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp index ac8ca630e..7e2e1bc5f 100644 --- a/tdehtml/xml/dom_nodeimpl.cpp +++ b/tdehtml/xml/dom_nodeimpl.cpp @@ -33,7 +33,7 @@ #include "xml/dom_nodeimpl.h" #include "xml/dom_restyler.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include "rendering/render_text.h" diff --git a/tdehtml/xml/xml_tokenizer.cpp b/tdehtml/xml/xml_tokenizer.cpp index 44f90673f..2ee90097b 100644 --- a/tdehtml/xml/xml_tokenizer.cpp +++ b/tdehtml/xml/xml_tokenizer.cpp @@ -36,7 +36,7 @@ #include "tdehtml_part.h" #include <tqvariant.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> using namespace DOM; using namespace tdehtml; |