diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:22 -0600 |
| commit | bd3c603465110b74a0ddcee72e6f020a78d44e59 (patch) | |
| tree | f556266a927227ba3f30e337c4ccf06facc55ea3 /buildtools/qmake | |
| parent | ef5399ae5a952065c7a0679d4a875d154c972945 (diff) | |
| download | tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'buildtools/qmake')
| -rw-r--r-- | buildtools/qmake/createscopedlg.cpp | 4 | ||||
| -rw-r--r-- | buildtools/qmake/projectconfigurationdlg.cpp | 4 | ||||
| -rw-r--r-- | buildtools/qmake/qmakedefaultopts.cpp | 2 | ||||
| -rw-r--r-- | buildtools/qmake/qmakescopeitem.cpp | 2 | ||||
| -rw-r--r-- | buildtools/qmake/scope.cpp | 4 | ||||
| -rw-r--r-- | buildtools/qmake/trollprojectpart.cpp | 4 | ||||
| -rw-r--r-- | buildtools/qmake/trollprojectwidget.cpp | 2 | ||||
| -rw-r--r-- | buildtools/qmake/trollprojectwidget.h | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp index 267bd471..dfb8683a 100644 --- a/buildtools/qmake/createscopedlg.cpp +++ b/buildtools/qmake/createscopedlg.cpp @@ -16,8 +16,8 @@ #include <tqcheckbox.h> #include <tdefile.h> #include <kcombobox.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kurlcompletion.h> diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index a74b0793..e2ebe9a2 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -42,8 +42,8 @@ #include <tqtabwidget.h> #include <kpushbutton.h> #include <kcombobox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "trollprojectwidget.h" #include "trollprojectpart.h" diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp index e0e7fa63..8c34c34b 100644 --- a/buildtools/qmake/qmakedefaultopts.cpp +++ b/buildtools/qmake/qmakedefaultopts.cpp @@ -12,7 +12,7 @@ #include "qmakedefaultopts.h" #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqregexp.h> #include <kprocess.h> diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index 36c3d5e2..70e9a6ba 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -18,7 +18,7 @@ #include <tqregexp.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdirwatch.h> diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index 2c862fb3..6cf86bf8 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -23,8 +23,8 @@ #include <kdirwatch.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <stdlib.h> #include "urlutil.h" diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 50e12595..bd3b5c1a 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -22,8 +22,8 @@ #include <kdebug.h> #include <kdialogbase.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdirwatch.h> #include <kstatusbar.h> #include <tqmessagebox.h> diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 0e0ca572..c7d21796 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -43,7 +43,7 @@ #include <tqtooltip.h> #include <kdebug.h> #include <tdelistview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kregexp.h> #include <kurl.h> diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index fdc6ce74..a3ced6a1 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -27,7 +27,7 @@ #include <tqvbox.h> #include <tqtoolbutton.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> #include <tqbutton.h> #include <tqfileinfo.h> |