summaryrefslogtreecommitdiffstats
path: root/tdehtml/ecma/kjs_window.cpp
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/ecma/kjs_window.cpp
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml/ecma/kjs_window.cpp')
-rw-r--r--tdehtml/ecma/kjs_window.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp
index 1d38de27e..554781cb9 100644
--- a/tdehtml/ecma/kjs_window.cpp
+++ b/tdehtml/ecma/kjs_window.cpp
@@ -36,9 +36,9 @@
#include <tqpaintdevicemetrics.h>
#include <tqapplication.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmdcodec.h>
#include <tdeparts/browserinterface.h>
#include <twin.h>
@@ -50,7 +50,7 @@
#ifndef KONQ_EMBEDDED
#include <kbookmarkmanager.h>
#endif
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <assert.h>
#include <tqstyle.h>
#include <tqobjectlist.h>