summaryrefslogtreecommitdiffstats
path: root/parts/regexptest
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 22:00:22 -0600
committerTimothy Pearson <[email protected]>2013-02-15 22:00:22 -0600
commitbd3c603465110b74a0ddcee72e6f020a78d44e59 (patch)
treef556266a927227ba3f30e337c4ccf06facc55ea3 /parts/regexptest
parentef5399ae5a952065c7a0679d4a875d154c972945 (diff)
downloadtdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz
tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'parts/regexptest')
-rw-r--r--parts/regexptest/regexptestdlg.cpp4
-rw-r--r--parts/regexptest/regexptestpart.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index 95988bde..eddaa84d 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -24,8 +24,8 @@
#include <tdeversion.h>
#include <kregexp.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include <tdetexteditor/viewcursorinterface.h>
#include <tdetexteditor/editinterface.h>
diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp
index 49d8b702..12cf860c 100644
--- a/parts/regexptest/regexptestpart.cpp
+++ b/parts/regexptest/regexptestpart.cpp
@@ -11,7 +11,7 @@
#include "regexptestpart.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdevgenericfactory.h>
#include <kdevplugininfo.h>
#include <tdeaction.h>