From 488631824dd6036ea476fba4fbb716347755945f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 8 Feb 2021 14:01:32 +0100
Subject: [PATCH] [libcalamares] Make the KPMCore global storage filesystem
 handlers inline

---
 src/libcalamares/partition/Global.cpp | 13 -------------
 src/libcalamares/partition/Global.h   | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/libcalamares/partition/Global.cpp b/src/libcalamares/partition/Global.cpp
index 7203f6b55..5be9036c7 100644
--- a/src/libcalamares/partition/Global.cpp
+++ b/src/libcalamares/partition/Global.cpp
@@ -63,16 +63,3 @@ CalamaresUtils::Partition::useFilesystemGS( const QString& filesystemType, bool
         useFilesystemGS( *gs, filesystemType, used );
     }
 }
-
-#ifdef WITH_KPMCORE4API
-bool
-CalamaresUtils::Partition::isFilesystemUsedGS( FileSystem::Type filesystem )
-{
-    return isFilesystemUsedGS( untranslatedFS( filesystem ) );
-}
-void
-CalamaresUtils::Partition::useFilesystemGS( FileSystem::Type filesystem, bool used )
-{
-    useFilesystemGS( untranslatedFS( filesystem ), used );
-}
-#endif
diff --git a/src/libcalamares/partition/Global.h b/src/libcalamares/partition/Global.h
index 3164d06fc..a013c4e2f 100644
--- a/src/libcalamares/partition/Global.h
+++ b/src/libcalamares/partition/Global.h
@@ -19,6 +19,8 @@
 #include "DllMacro.h"
 
 #ifdef WITH_KPMCORE4API
+#include "FileSystem.h"
+
 #include <kpmcore/fs/filesystem.h>
 #endif
 
@@ -52,12 +54,21 @@ bool DLLEXPORT isFilesystemUsedGS( const QString& filesystemType );
  * See useFilesystemGS(const QString&, bool); this method uses the filesystem type
  * enumeration to pick the name.
  */
-void DLLEXPORT useFilesystemGS( FileSystem::Type filesystem, bool used );
+void
+useFilesystemGS( FileSystem::Type filesystem, bool used )
+{
+    useFilesystemGS( untranslatedFS( filesystem ), used );
+}
+
 /* @brief Reads from global storage whether the typesystem type is used
  *
  * See isFilesystemUsedGS(const QString&).
  */
-bool DLLEXPORT isFilesystemUsedGS( FileSystem::Type filesystem );
+bool
+isFilesystemUsedGS( FileSystem::Type filesystem )
+{
+    return isFilesystemUsedGS( untranslatedFS( filesystem ) );
+}
 
 #endif
 }  // namespace Partition