[libcalamares] Make the KPMCore global storage filesystem handlers inline

This commit is contained in:
Adriaan de Groot 2021-02-08 14:01:32 +01:00
parent 75eb2c3cd4
commit 488631824d
2 changed files with 13 additions and 15 deletions

View File

@ -63,16 +63,3 @@ CalamaresUtils::Partition::useFilesystemGS( const QString& filesystemType, bool
useFilesystemGS( *gs, filesystemType, used ); 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

View File

@ -19,6 +19,8 @@
#include "DllMacro.h" #include "DllMacro.h"
#ifdef WITH_KPMCORE4API #ifdef WITH_KPMCORE4API
#include "FileSystem.h"
#include <kpmcore/fs/filesystem.h> #include <kpmcore/fs/filesystem.h>
#endif #endif
@ -52,12 +54,21 @@ bool DLLEXPORT isFilesystemUsedGS( const QString& filesystemType );
* See useFilesystemGS(const QString&, bool); this method uses the filesystem type * See useFilesystemGS(const QString&, bool); this method uses the filesystem type
* enumeration to pick the name. * 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 /* @brief Reads from global storage whether the typesystem type is used
* *
* See isFilesystemUsedGS(const QString&). * See isFilesystemUsedGS(const QString&).
*/ */
bool DLLEXPORT isFilesystemUsedGS( FileSystem::Type filesystem ); bool
isFilesystemUsedGS( FileSystem::Type filesystem )
{
return isFilesystemUsedGS( untranslatedFS( filesystem ) );
}
#endif #endif
} // namespace Partition } // namespace Partition