summaryrefslogtreecommitdiffstats
path: root/src/newui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:22 -0600
commitbd3c603465110b74a0ddcee72e6f020a78d44e59 (patch)
treef556266a927227ba3f30e337c4ccf06facc55ea3 /src/newui
parentef5399ae5a952065c7a0679d4a875d154c972945 (diff)
downloadtdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz
tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/newui')
-rw-r--r--src/newui/button.cpp2
-rw-r--r--src/newui/buttonbar.cpp2
-rw-r--r--src/newui/ddockwindow.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 332147e3..83fa358d 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -31,7 +31,7 @@
#include <tdeaction.h>
#include <tdepopupmenu.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp
index 13afb6c0..0218a2dc 100644
--- a/src/newui/buttonbar.cpp
+++ b/src/newui/buttonbar.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <tdeconfig.h>
#include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "button.h"
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 6e90e6b3..11e917e1 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -28,10 +28,10 @@
#include <tqpopupmenu.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeapplication.h>