diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:51:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:51:29 -0600 |
| commit | 6b2b4978e02230a28edd9825fc0d9f87fc918f4e (patch) | |
| tree | e14f167ea1fa884a8dbde6cc63b5042613e3bbfc /digikam/libs/dialogs | |
| parent | 9d3426fa00dd02103ba96b4b8f4c84fe347e265f (diff) | |
| download | digikam-6b2b4978e02230a28edd9825fc0d9f87fc918f4e.tar.gz digikam-6b2b4978e02230a28edd9825fc0d9f87fc918f4e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'digikam/libs/dialogs')
| -rw-r--r-- | digikam/libs/dialogs/deletedialog.cpp | 4 | ||||
| -rw-r--r-- | digikam/libs/dialogs/imagedialog.cpp | 2 | ||||
| -rw-r--r-- | digikam/libs/dialogs/imagedlgbase.cpp | 2 | ||||
| -rw-r--r-- | digikam/libs/dialogs/imageguidedlg.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/digikam/libs/dialogs/deletedialog.cpp b/digikam/libs/dialogs/deletedialog.cpp index 7976be0..4801672 100644 --- a/digikam/libs/dialogs/deletedialog.cpp +++ b/digikam/libs/dialogs/deletedialog.cpp @@ -36,12 +36,12 @@ // KDE includes. -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kdialogbase.h> #include <kglobal.h> #include <kiconloader.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <kstdguiitem.h> diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp index d25e01c..908df1f 100644 --- a/digikam/libs/dialogs/imagedialog.cpp +++ b/digikam/libs/dialogs/imagedialog.cpp @@ -33,7 +33,7 @@ #include <kapplication.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> #include <kiconloader.h> diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp index c2e9ee2..6f46d04 100644 --- a/digikam/libs/dialogs/imagedlgbase.cpp +++ b/digikam/libs/dialogs/imagedlgbase.cpp @@ -48,7 +48,7 @@ #include <kapplication.h> #include <kpopupmenu.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> // Local includes. diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp index 9cdd9de..2019ee3 100644 --- a/digikam/libs/dialogs/imageguidedlg.cpp +++ b/digikam/libs/dialogs/imageguidedlg.cpp @@ -49,7 +49,7 @@ #include <kglobalsettings.h> #include <kprogress.h> #include <kcolorbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kseparator.h> // Local includes. |