diff options
| author | Friedrich W. H. Kossebau <kossebau@kde.org> | 2019-10-08 15:22:49 +0200 |
|---|---|---|
| committer | Friedrich W. H. Kossebau <kossebau@kde.org> | 2019-10-18 21:23:32 +0200 |
| commit | fb37084b3e7c396cd10bf4d3253fee730320988a (patch) | |
| tree | 3c58974a533b9ec963d315481d38671ba8f10613 /src/core/kemailsettings.h | |
| parent | 3f68be12f87e83b67f9270eb139d894bf65ebef1 (diff) | |
| download | kconfig-fb37084b3e7c396cd10bf4d3253fee730320988a.tar.gz kconfig-fb37084b3e7c396cd10bf4d3253fee730320988a.tar.bz2 | |
Use ECMGenerateExportHeader to manage deprecated API better
Summary:
Allows
* projects linking to KConfigCore/Gui to hide deprecated API up to a
given version or silence deprecation warnings after a given version,
using
* -DKCONFIGCORE_DISABLE_DEPRECATED_BEFORE_AND_AT
* -DKCONFIGCORE_NO_DEPRECATED
* -DKCONFIGCORE_DEPRECATED_WARNINGS_SINCE
* -DKCONFIGCORE_NO_DEPRECATED_WARNINGS
* -DKCONFIGGUI_DISABLE_DEPRECATED_BEFORE_AND_AT
* -DKCONFIGGUI_NO_DEPRECATED
* -DKCONFIGGUI_DEPRECATED_WARNINGS_SINCE
* -DKCONFIGGUI_NO_DEPRECATED_WARNINGS
or
* -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT
* -DKF_NO_DEPRECATED
* -DKF_DEPRECATED_WARNINGS_SINCE
* -DKF_NO_DEPRECATED_WARNINGS
* to build KConfigCore/Gui optionally with deprecated API excluded from
the build, using "EXCLUDE_DEPRECATED_BEFORE_AND_AT" cmake argument.
Test Plan:
Builds with EXCLUDE_DEPRECATED_BEFORE_AND_AT set to 0, 4.0.0, 5.0.0,
5.11.0, 5.24.0, 5.39.0, 5.42.0, CURRENT.
Reviewers: #frameworks, mlaurent
Reviewed By: mlaurent
Subscribers: mlaurent, kde-frameworks-devel
Tags: #frameworks
Differential Revision: https://phabricator.kde.org/D24496
Diffstat (limited to 'src/core/kemailsettings.h')
| -rw-r--r-- | src/core/kemailsettings.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/core/kemailsettings.h b/src/core/kemailsettings.h index 7d4fb8cf..801e63b7 100644 --- a/src/core/kemailsettings.h +++ b/src/core/kemailsettings.h @@ -69,7 +69,7 @@ public: OutServer, OutServerLogin, OutServerPass, -#ifndef KDE_NO_DEPRECATED +#if KCONFIGCORE_ENABLE_DEPRECATED_SINCE(5, 0) /** * @deprecated since Frameworks 5.0 */ @@ -82,11 +82,15 @@ public: * @deprecated since Frameworks 5.0 */ OutServerTLS, +#else + OutServerType_DEPRECATED_DO_NOT_USE, + OutServerCommand_DEPRECATED_DO_NOT_USE, + OutServerTLS_DEPRECATED_DO_NOT_USE, #endif InServer, InServerLogin, InServerPass, -#ifndef KDE_NO_DEPRECATED +#if KCONFIGCORE_ENABLE_DEPRECATED_SINCE(5, 0) /** * @deprecated since Frameworks 5.0 */ @@ -131,13 +135,15 @@ public: **/ QStringList profiles() const; -#ifndef KDE_NO_DEPRECATED +#if KCONFIGCORE_ENABLE_DEPRECATED_SINCE(5, 0) /** - * @deprecated since Frameworks 5.0 * Returns the name of the current profile. * @returns what profile we're currently using + * @deprecated Since 5.0 **/ - KCONFIGCORE_DEPRECATED QString currentProfileName() const; + KCONFIGCORE_DEPRECATED_VERSION(5, 0, "API planned to be changed") + QString currentProfileName() const; + // see https://git.reviewboard.kde.org/r/111910/ #endif /** |