summaryrefslogtreecommitdiffstats
path: root/languages/java
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 /languages/java
parentef5399ae5a952065c7a0679d4a875d154c972945 (diff)
downloadtdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz
tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'languages/java')
-rw-r--r--languages/java/configproblemreporter.ui.h2
-rw-r--r--languages/java/javasupportpart.cpp4
-rw-r--r--languages/java/problemreporter.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h
index dd2325d1..ef0510d3 100644
--- a/languages/java/configproblemreporter.ui.h
+++ b/languages/java/configproblemreporter.ui.h
@@ -7,7 +7,7 @@
*****************************************************************************/
#include <tdeconfig.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
void ConfigureProblemReporter::init()
{
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 7217e3fd..2b5daf11 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -40,13 +40,13 @@
#include <tqregexp.h>
#include <tqlabel.h>
#include <tqvbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
#include <kstatusbar.h>
#include <tdeconfig.h>
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index 42a044ff..72e1f83f 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -34,7 +34,7 @@
#include <tdetexteditor/view.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstatusbar.h>
#include <kurl.h>
#include <tdeapplication.h>