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 /parts/tools | |
parent | ef5399ae5a952065c7a0679d4a875d154c972945 (diff) | |
download | tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'parts/tools')
-rw-r--r-- | parts/tools/kapplicationtree.cpp | 4 | ||||
-rw-r--r-- | parts/tools/tools_part.cpp | 2 | ||||
-rw-r--r-- | parts/tools/toolsconfig.cpp | 2 | ||||
-rw-r--r-- | parts/tools/toolsconfigwidget.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index 4affd6dc..8c13a4ea 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -38,9 +38,9 @@ #include <kcombobox.h> #include <kdesktopfile.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kmimemagic.h> #include <krun.h> diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index 1d1b4505..8734eadc 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -14,7 +14,7 @@ #include <kdesktopfile.h> #include <kdialogbase.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include <kprocess.h> #include <tdetexteditor/document.h> diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp index 9d6e0f95..f21713e9 100644 --- a/parts/tools/toolsconfig.cpp +++ b/parts/tools/toolsconfig.cpp @@ -11,7 +11,7 @@ #include <kdesktopfile.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "tools_part.h" #include "kapplicationtree.h" diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp index f6cec15a..11b352af 100644 --- a/parts/tools/toolsconfigwidget.cpp +++ b/parts/tools/toolsconfigwidget.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <kdesktopfile.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurl.h> #include <kurldrag.h> |