Add Entry alias for std::variant<Game, AddApp>

oblivioncth · Nov 12, 2023 · 9a46e14 · 9a46e14
1 parent 3dc1dc9
commit 9a46e14
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/include/fp/fp-db.h b/lib/include/fp/fp-db.h
@@ -368,7 +368,7 @@ class FP_FP_EXPORT Db : public QObject
     DbError entryUsesDataPack(bool& resultBuffer, const QUuid& gameId);
 
     // Helper
-    DbError getEntry(std::variant<Game, AddApp>& entry, const QUuid& entryId);
+    DbError getEntry(Entry& entry, const QUuid& entryId);
     DbError getGameData(GameData& data, const QUuid& gameId);
     DbError updateGameDataOnDiskState(QList<int> packIds, bool onDisk);
 

diff --git a/lib/include/fp/fp-items.h b/lib/include/fp/fp-items.h
@@ -17,7 +17,7 @@ namespace Fp
 //-Enums----------------------------------------------------------------------------------------------------------
 enum class ImageType {Logo, Screenshot};
 
-//-Namespace Global Classes-----------------------------------------------------------------------------------------
+//-Namespace Classes---------------------------------------------------------------------------------------------
 class FP_FP_EXPORT Game
 {
 //-Inner Classes----------------------------------------------------------------------------------------------------
@@ -402,6 +402,9 @@ class FP_FP_EXPORT Playlist::Builder
     Playlist build();
 };
 
+//-Namespace Types---------------------------------------------------------------------------------------------
+using Entry = std::variant<Game, AddApp>;
+
 }
 
 #endif // FLASHPOINT_ITEMS_H
diff --git a/lib/src/fp-db.cpp b/lib/src/fp-db.cpp
@@ -746,7 +746,7 @@ DbError Db::entryUsesDataPack(bool& resultBuffer, const QUuid& gameId)
     return DbError();
 }
 
-DbError Db::getEntry(std::variant<Game, AddApp>& entry, const QUuid& entryId)
+DbError Db::getEntry(Entry& entry, const QUuid& entryId)
 {
     // Find title
     Db::EntryFilter mainFilter{.type = Fp::Db::EntryType::PrimaryThenAddApp, .id = entryId};