summaryrefslogtreecommitdiffstats
path: root/languages/php
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/php
parentef5399ae5a952065c7a0679d4a875d154c972945 (diff)
downloadtdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz
tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'languages/php')
-rw-r--r--languages/php/phperrorview.cpp2
-rw-r--r--languages/php/phpnewclassdlg.cpp2
-rw-r--r--languages/php/phpsupportpart.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 704afb0d..156595c7 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.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>
diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp
index 4e5b7c43..e97147cc 100644
--- a/languages/php/phpnewclassdlg.cpp
+++ b/languages/php/phpnewclassdlg.cpp
@@ -23,7 +23,7 @@
#include <iostream>
#include <tqregexp.h>
#include <tqtextedit.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kinstance.h>
#include <kdebug.h>
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index 48d9e5f2..d25afffd 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -36,8 +36,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdehtmlview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <kregexp.h>
#include <kstatusbar.h>