summaryrefslogtreecommitdiffstats
path: root/tdehtml/tdehtml_settings.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
commited99a30644c19b0a3cf0d2147243532df4daa16b (patch)
tree7f3f2850e59824fdf100a642367a82b1e7f0204f /tdehtml/tdehtml_settings.cc
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml/tdehtml_settings.cc')
-rw-r--r--tdehtml/tdehtml_settings.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/tdehtml/tdehtml_settings.cc b/tdehtml/tdehtml_settings.cc
index 8e36f5891..7f799e311 100644
--- a/tdehtml/tdehtml_settings.cc
+++ b/tdehtml/tdehtml_settings.cc
@@ -21,14 +21,14 @@
#include "tdehtml_settings.h"
#include "tdehtmldefaults.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqregexp.h>
#include <tqvaluevector.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
/**
* @internal