summaryrefslogtreecommitdiffstats
path: root/languages/php
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:06:29 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:06:29 -0600
commitc0b24fe164924298d7e6ae33964b3c65fadbcba3 (patch)
tree2ba50375d78b077b266b224e4413150ef3e60a15 /languages/php
parent33d15e862e09fbcbb05e209f832414bd8a01291e (diff)
downloadtdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.tar.gz
tdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'languages/php')
-rw-r--r--languages/php/phpconfigwidget.cpp2
-rw-r--r--languages/php/phperrorview.cpp2
-rw-r--r--languages/php/phpnewclassdlg.cpp2
-rw-r--r--languages/php/phpsupportpart.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp
index 01cd950c..27ef1baf 100644
--- a/languages/php/phpconfigwidget.cpp
+++ b/languages/php/phpconfigwidget.cpp
@@ -7,7 +7,7 @@
#include <iostream>
#include <tqradiobutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kstandarddirs.h>
#include "phpinfodlg.h"
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 47d869b7..d3134a89 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -41,7 +41,7 @@
#include <kiconloader.h>
#include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqtimer.h>
#include <tqregexp.h>
diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp
index ddc3b507..3ed6d952 100644
--- a/languages/php/phpnewclassdlg.cpp
+++ b/languages/php/phpnewclassdlg.cpp
@@ -18,7 +18,7 @@
#include "phpnewclassdlg.h"
#include <klineedit.h>
#include <kcompletion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <tqtoolbutton.h>
#include <iostream>
#include <tqregexp.h>
diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h
index 572be8c8..ac4ca8dc 100644
--- a/languages/php/phpsupportpart.h
+++ b/languages/php/phpsupportpart.h
@@ -26,7 +26,7 @@
#include <kdialogbase.h>
#include "kdevlanguagesupport.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kdevgenericfactory.h>
#include <tdetexteditor/editinterface.h>