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/fileselector | |
| parent | ef5399ae5a952065c7a0679d4a875d154c972945 (diff) | |
| download | tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'parts/fileselector')
| -rw-r--r-- | parts/fileselector/fileselector_part.cpp | 6 | ||||
| -rw-r--r-- | parts/fileselector/fileselector_widget.cpp | 4 | ||||
| -rw-r--r-- | parts/fileselector/fileselector_widget.h | 2 | ||||
| -rw-r--r-- | parts/fileselector/kbookmarkhandler.cpp | 2 | ||||
| -rw-r--r-- | parts/fileselector/tdeactionselector.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index 3e8d1f6b..a6b4a6bb 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -7,16 +7,16 @@ #include <tqvbox.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kstandarddirs.h> #include <ktextbrowser.h> #include <tdeconfig.h> #include <tdefileitem.h> #include <kdevgenericfactory.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <kdialogbase.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdevapi.h> #include <kdevcore.h> diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index df40ab2a..fa637c43 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -57,10 +57,10 @@ #include <kurlcompletion.h> #include <kprotocolinfo.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <tdeaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdetoolbarbutton.h> #include <tqtoolbar.h> #include <tdepopupmenu.h> diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index e47f00c9..5ff80ed9 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -27,7 +27,7 @@ #include <kurl.h> #include <tdetoolbar.h> #include <tqframe.h> -#include <kdiroperator.h> +#include <tdediroperator.h> class KDevMainWindow; class KDevPartController; diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp index 004411ff..935b9d86 100644 --- a/parts/fileselector/kbookmarkhandler.cpp +++ b/parts/fileselector/kbookmarkhandler.cpp @@ -28,7 +28,7 @@ #include <tdepopupmenu.h> #include <ksavefile.h> #include <kstandarddirs.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <tdeaction.h> #include "kbookmarkhandler.h" diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp index a4c75543..f6fd628d 100644 --- a/parts/fileselector/tdeactionselector.cpp +++ b/parts/fileselector/tdeactionselector.cpp @@ -19,7 +19,7 @@ #include "tdeactionselector.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialog.h> // for spacingHint() #include <kdebug.h> |