From fb37084b3e7c396cd10bf4d3253fee730320988a Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Tue, 8 Oct 2019 15:22:49 +0200
Subject: 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
---
 src/core/kemailsettings.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'src/core/kemailsettings.cpp')

diff --git a/src/core/kemailsettings.cpp b/src/core/kemailsettings.cpp
index 0d4028df..c6aa5d20 100644
--- a/src/core/kemailsettings.cpp
+++ b/src/core/kemailsettings.cpp
@@ -78,6 +78,7 @@ QString KEMailSettings::getSetting(KEMailSettings::Setting s) const
     case OutServerPass: {
         return cg.readEntry("OutgoingPassword");
     }
+#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0)
     case OutServerType: {
         return cg.readEntry("OutgoingServerType");
     }
@@ -87,6 +88,12 @@ QString KEMailSettings::getSetting(KEMailSettings::Setting s) const
     case OutServerTLS: {
         return cg.readEntry("OutgoingServerTLS", QVariant(false)).toString();
     }
+#else
+    case OutServerType_DEPRECATED_DO_NOT_USE:
+    case OutServerCommand_DEPRECATED_DO_NOT_USE:
+    case OutServerTLS_DEPRECATED_DO_NOT_USE:
+        break;
+#endif
     case InServer: {
         return cg.readEntry("IncomingServer");
     }
@@ -96,6 +103,7 @@ QString KEMailSettings::getSetting(KEMailSettings::Setting s) const
     case InServerPass: {
         return cg.readEntry("IncomingPassword");
     }
+#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0)
     case InServerType: {
         return cg.readEntry("IncomingServerType");
     }
@@ -105,6 +113,7 @@ QString KEMailSettings::getSetting(KEMailSettings::Setting s) const
     case InServerTLS: {
         return cg.readEntry("IncomingServerTLS", QVariant(false)).toString();
     }
+#endif
     };
     return QString();
 }
@@ -148,6 +157,7 @@ void KEMailSettings::setSetting(KEMailSettings::Setting s, const QString  &v)
         cg.writeEntry("OutgoingPassword", v);
         break;
     }
+#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0)
     case OutServerType: {
         cg.writeEntry("OutgoingServerType", v);
         break;
@@ -160,6 +170,12 @@ void KEMailSettings::setSetting(KEMailSettings::Setting s, const QString  &v)
         cg.writeEntry("OutgoingServerTLS", (v == QLatin1String("true")));
         break;
     }
+#else
+    case OutServerType_DEPRECATED_DO_NOT_USE:
+    case OutServerCommand_DEPRECATED_DO_NOT_USE:
+    case OutServerTLS_DEPRECATED_DO_NOT_USE:
+        break;
+#endif
     case InServer: {
         cg.writeEntry("IncomingServer", v);
         break;
@@ -172,6 +188,7 @@ void KEMailSettings::setSetting(KEMailSettings::Setting s, const QString  &v)
         cg.writeEntry("IncomingPassword", v);
         break;
     }
+#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0)
     case InServerType: {
         cg.writeEntry("IncomingServerType", v);
         break;
@@ -184,6 +201,7 @@ void KEMailSettings::setSetting(KEMailSettings::Setting s, const QString  &v)
         cg.writeEntry("IncomingServerTLS", (v == QLatin1String("true")));
         break;
     }
+#endif
     };
     cg.sync();
 }
@@ -207,7 +225,7 @@ void KEMailSettings::setProfile(const QString &s)
     }
 }
 
-#ifndef KDE_NO_DEPRECATED
+#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 0)
 QString KEMailSettings::currentProfileName() const
 {
     return p->m_sCurrentProfile;
-- 
cgit v1.2.1