From 2cd5cdfa4a36c5fbeed715297a89bacfa8753ddb Mon Sep 17 00:00:00 2001
From: Ahmad Samir <a.samirh78@gmail.com>
Date: Wed, 17 Jun 2020 13:45:54 +0200
Subject: KDesktopFile: deprecate resource()

It is redundant since the parent class, KConfig, has locationType().

Add some API docs for fileName(), even though one could use KConfig::name()
from the parent class, I think this would be confusing given a .desktop file
has a Name= entry, so fileName() is less ambiguous.

These seem to be leftovers from a previous refactor that happened a long time
ago.
---
 src/core/CMakeLists.txt   | 2 +-
 src/core/kdesktopfile.cpp | 2 ++
 src/core/kdesktopfile.h   | 9 +++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 6c242253..c91dd040 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -32,7 +32,7 @@ ecm_generate_export_header(KF5ConfigCore
     GROUP_BASE_NAME KF
     VERSION ${KF_VERSION}
     DEPRECATED_BASE_VERSION 0
-    DEPRECATION_VERSIONS 4.0 5.0 5.24 5.42 5.82
+    DEPRECATION_VERSIONS 4.0 5.0 5.24 5.42 5.82 5.89
     EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT}
 )
 
diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp
index d26ed59d..d2823c15 100644
--- a/src/core/kdesktopfile.cpp
+++ b/src/core/kdesktopfile.cpp
@@ -332,11 +332,13 @@ KDesktopFile *KDesktopFile::copyTo(const QString &file) const
     return config;
 }
 
+#if KCONFIGCORE_BUILD_DEPRECATED_SINCE(5, 89)
 QStandardPaths::StandardLocation KDesktopFile::resource() const
 {
     Q_D(const KDesktopFile);
     return d->resourceType;
 }
+#endif
 
 QString KDesktopFile::fileName() const
 {
diff --git a/src/core/kdesktopfile.h b/src/core/kdesktopfile.h
index 5cd739f1..445d98f6 100644
--- a/src/core/kdesktopfile.h
+++ b/src/core/kdesktopfile.h
@@ -238,9 +238,18 @@ public:
      */
     KDesktopFile *copyTo(const QString &file) const;
 
+    /**
+     * Returns the name of the .desktop file that was used to construct this KDesktopFile.
+     */
     QString fileName() const;
 
+#if KCONFIGCORE_ENABLE_DEPRECATED_SINCE(5, 89)
+    /**
+     * @deprecated Since 5.89, use locationType() instead.
+     */
+    KCONFIGCORE_DEPRECATED_VERSION(5, 89, "Use locationType() instead.")
     QStandardPaths::StandardLocation resource() const;
+#endif
 
 private:
     Q_DISABLE_COPY(KDesktopFile)
-- 
cgit v1.2.1