diff options
| author | Laurent Montel <[email protected]> | 2019-12-06 13:31:43 +0100 |
|---|---|---|
| committer | Laurent Montel <[email protected]> | 2019-12-06 13:31:43 +0100 |
| commit | 31dd81bb0c7cd77e65c095ec4b49ad95935946c6 (patch) | |
| tree | 8f0eaa8f704406aceb7b1fb2af902d205bf55262 /src/settings | |
| parent | 69838a1cdd6a10d9d6ca6572962c438a97d46b36 (diff) | |
Make it compile against last kf5 version without deprecated methods
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.cpp | 14 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.cpp | 5 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.cpp | 5 |
3 files changed, 23 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index ccc32a8a6..00781f657 100644 --- a/src/settings/kcm/kcmdolphingeneral.cpp +++ b/src/settings/kcm/kcmdolphingeneral.cpp @@ -26,6 +26,7 @@ #include <KLocalizedString> #include <KPluginFactory> #include <KPluginLoader> +#include <kconfigwidgets_version.h> #include <QTabWidget> #include <QVBoxLayout> @@ -48,18 +49,29 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV // initialize 'Behavior' tab BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(QUrl::fromLocalFile(QDir::homePath()), tabWidget); tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior")); +#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 64, 0) connect(behaviorPage, &BehaviorSettingsPage::changed, this, QOverload<>::of(&DolphinGeneralConfigModule::changed)); +#else + connect(behaviorPage, &BehaviorSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged); +#endif // initialize 'Previews' tab PreviewsSettingsPage* previewsPage = new PreviewsSettingsPage(tabWidget); tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews")); +#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 64, 0) connect(previewsPage, &PreviewsSettingsPage::changed, this, QOverload<>::of(&DolphinGeneralConfigModule::changed)); +#else + connect(previewsPage, &PreviewsSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged); +#endif // initialize 'Confirmations' tab ConfirmationsSettingsPage* confirmationsPage = new ConfirmationsSettingsPage(tabWidget); tabWidget->addTab(confirmationsPage, i18nc("@title:tab Confirmations settings", "Confirmations")); +#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 64, 0) connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, QOverload<>::of(&DolphinGeneralConfigModule::changed)); - +#else + connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged); +#endif m_pages.append(behaviorPage); m_pages.append(previewsPage); m_pages.append(confirmationsPage); diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp index 6b88dadac..9bb3e99fc 100644 --- a/src/settings/kcm/kcmdolphinnavigation.cpp +++ b/src/settings/kcm/kcmdolphinnavigation.cpp @@ -20,6 +20,7 @@ #include "kcmdolphinnavigation.h" #include "settings/navigation/navigationsettingspage.h" +#include <kconfigwidgets_version.h> #include <KPluginFactory> #include <KPluginLoader> @@ -40,7 +41,11 @@ DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, co topLayout->setContentsMargins(0, 0, 0, 0); m_navigation = new NavigationSettingsPage(this); +#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 64, 0) connect(m_navigation, &NavigationSettingsPage::changed, this, QOverload<>::of(&DolphinNavigationConfigModule::changed)); +#else + connect(m_navigation, &NavigationSettingsPage::changed, this, &DolphinNavigationConfigModule::markAsChanged); +#endif topLayout->addWidget(m_navigation, 0, nullptr); } diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp index d5457f1fd..be3066345 100644 --- a/src/settings/kcm/kcmdolphinservices.cpp +++ b/src/settings/kcm/kcmdolphinservices.cpp @@ -21,6 +21,7 @@ #include "settings/services/servicessettingspage.h" +#include <kconfigwidgets_version.h> #include <KPluginFactory> #include <KPluginLoader> @@ -40,7 +41,11 @@ DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const topLayout->setContentsMargins(0, 0, 0, 0); m_services = new ServicesSettingsPage(this); +#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 64, 0) connect(m_services, &ServicesSettingsPage::changed, this, QOverload<>::of(&DolphinServicesConfigModule::changed)); +#else + connect(m_services, &ServicesSettingsPage::changed, this, &DolphinServicesConfigModule::markAsChanged); +#endif topLayout->addWidget(m_services, 0, nullptr); } |
