summaryrefslogtreecommitdiffstats
path: root/buildtools/custommakefiles
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 22:00:22 -0600
committerTimothy Pearson <[email protected]>2013-02-15 22:00:22 -0600
commitbd3c603465110b74a0ddcee72e6f020a78d44e59 (patch)
treef556266a927227ba3f30e337c4ccf06facc55ea3 /buildtools/custommakefiles
parentef5399ae5a952065c7a0679d4a875d154c972945 (diff)
downloadtdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz
tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'buildtools/custommakefiles')
-rw-r--r--buildtools/custommakefiles/custommakeconfigwidget.cpp2
-rw-r--r--buildtools/custommakefiles/custommanagerwidget.cpp2
-rw-r--r--buildtools/custommakefiles/customotherconfigwidget.cpp2
-rw-r--r--buildtools/custommakefiles/customprojectpart.cpp4
-rw-r--r--buildtools/custommakefiles/selectnewfilesdialog.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp
index 354e8777..6a12cdfb 100644
--- a/buildtools/custommakefiles/custommakeconfigwidget.cpp
+++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp
@@ -24,7 +24,7 @@
#include <tqvalidator.h>
#include <klineedit.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <environmentvariableswidget.h>
diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp
index 6c09541b..85f77d52 100644
--- a/buildtools/custommakefiles/custommanagerwidget.cpp
+++ b/buildtools/custommakefiles/custommanagerwidget.cpp
@@ -22,7 +22,7 @@
#include <kurlcompletion.h>
#include <tdefiledialog.h>
#include <keditlistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "customprojectpart.h"
diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp
index 67f168c2..945d7c91 100644
--- a/buildtools/custommakefiles/customotherconfigwidget.cpp
+++ b/buildtools/custommakefiles/customotherconfigwidget.cpp
@@ -25,7 +25,7 @@
#include <tqgroupbox.h>
#include <tqvalidator.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <environmentvariableswidget.h>
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index 889e68b3..92f2fe24 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -33,9 +33,9 @@
#include <keditlistbox.h>
#include <kdevgenericfactory.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeparts/part.h>
#include <tdepopupmenu.h>
#include <tdeversion.h>
diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp
index ce418ad4..a223c87a 100644
--- a/buildtools/custommakefiles/selectnewfilesdialog.cpp
+++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp
@@ -16,7 +16,7 @@
#include <tdelistview.h>
#include <tqheader.h>
#include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "selectnewfilesdialogbase.h"