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/widgets | |
| 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/widgets')
7 files changed, 8 insertions, 8 deletions
diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.cpp b/digikam/libs/widgets/common/filesaveoptionsbox.cpp index 946515c..24547da 100644 --- a/digikam/libs/widgets/common/filesaveoptionsbox.cpp +++ b/digikam/libs/widgets/common/filesaveoptionsbox.cpp @@ -37,9 +37,9 @@ #include <klocale.h> #include <kdialog.h> #include <knuminput.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> // Local includes. diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp index 678aed2..66987ca 100644 --- a/digikam/libs/widgets/common/searchtextbar.cpp +++ b/digikam/libs/widgets/common/searchtextbar.cpp @@ -35,7 +35,7 @@ #include <kapplication.h> #include <kiconloader.h> #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> // Local includes. diff --git a/digikam/libs/widgets/common/sidebar.cpp b/digikam/libs/widgets/common/sidebar.cpp index d0c606f..2d608a7 100644 --- a/digikam/libs/widgets/common/sidebar.cpp +++ b/digikam/libs/widgets/common/sidebar.cpp @@ -34,7 +34,7 @@ // KDE includes. #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kiconloader.h> diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp index ad065ac..7c75aa6 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -42,7 +42,7 @@ #include <kcursor.h> #include <kapplication.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> // Local includes. diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp index 1359147..8fca857 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -43,7 +43,7 @@ #include <kprogress.h> #include <kapplication.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kseparator.h> diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp index ad3cb1b..51ef558 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp @@ -37,7 +37,7 @@ #include <kapplication.h> #include <klocale.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> // Local includes. diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp index 9391deb..39d105e 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.cpp +++ b/digikam/libs/widgets/metadata/metadatawidget.cpp @@ -45,7 +45,7 @@ #include <kdialogbase.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobalsettings.h> #include <kprinter.h> #include <kglobal.h> |