summaryrefslogtreecommitdiffstats
path: root/buildtools/qmake
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:06:29 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:06:29 -0600
commitc0b24fe164924298d7e6ae33964b3c65fadbcba3 (patch)
tree2ba50375d78b077b266b224e4413150ef3e60a15 /buildtools/qmake
parent33d15e862e09fbcbb05e209f832414bd8a01291e (diff)
downloadtdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.tar.gz
tdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'buildtools/qmake')
-rw-r--r--buildtools/qmake/createscopedlg.cpp4
-rw-r--r--buildtools/qmake/newwidgetdlg.cpp2
-rw-r--r--buildtools/qmake/projectconfigurationdlg.cpp2
-rw-r--r--buildtools/qmake/trollprojectpart.cpp4
-rw-r--r--buildtools/qmake/trollprojectwidget.cpp4
5 files changed, 8 insertions, 8 deletions
diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp
index 4f65dd17..267bd471 100644
--- a/buildtools/qmake/createscopedlg.cpp
+++ b/buildtools/qmake/createscopedlg.cpp
@@ -14,11 +14,11 @@
#include <klineedit.h>
#include <kurlrequester.h>
#include <tqcheckbox.h>
-#include <kfile.h>
+#include <tdefile.h>
#include <kcombobox.h>
#include <kmessagebox.h>
#include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kurlcompletion.h>
#include "urlutil.h"
diff --git a/buildtools/qmake/newwidgetdlg.cpp b/buildtools/qmake/newwidgetdlg.cpp
index ab3e72f7..99d39a93 100644
--- a/buildtools/qmake/newwidgetdlg.cpp
+++ b/buildtools/qmake/newwidgetdlg.cpp
@@ -14,7 +14,7 @@
#include <tqstringlist.h>
#include <tqcheckbox.h>
#include <tqmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klineedit.h>
#include <kpushbutton.h>
#include <domutil.h>
diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp
index e5e80b2e..8f4ffc70 100644
--- a/buildtools/qmake/projectconfigurationdlg.cpp
+++ b/buildtools/qmake/projectconfigurationdlg.cpp
@@ -20,7 +20,7 @@
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <knotifyclient.h>
#include <klineedit.h>
#include <kinputdialog.h>
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 58c4ba22..69c030b7 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -31,12 +31,12 @@
#include <kaction.h>
#include <tdeparts/part.h>
#include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kapplication.h>
#include <kurlrequesterdlg.h>
#include <kurlrequester.h>
#include <kurlcompletion.h>
-#include <kfile.h>
+#include <tdefile.h>
#include <makeoptionswidget.h>
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 5b1f528b..77301f95 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -39,7 +39,7 @@
#include <tqinputdialog.h>
#include <tqwhatsthis.h>
#include <tqvaluestack.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <tqtooltip.h>
#include <kdebug.h>
#include <klistview.h>
@@ -57,7 +57,7 @@
#include <kdirwatch.h>
#include <kurlrequesterdlg.h>
#include <kurlrequester.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <kurlcompletion.h>
#include "kdevcore.h"