diff --git a/CMakeLists.txt b/CMakeLists.txt index d6aca23..a1489ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ set(LIBFP_QX_COMPONENTS include(OB/FetchQx) ob_fetch_qx( - REF "87475b929b645665f92bdb0f6551aa63887c791f" + REF "6608e0a92d667846333c2349344771eb3c1a1c60" COMPONENTS ${LIBFP_QX_COMPONENTS} ) diff --git a/lib/include/fp/fp-items.h b/lib/include/fp/fp-items.h index 40e283b..ffbca19 100644 --- a/lib/include/fp/fp-items.h +++ b/lib/include/fp/fp-items.h @@ -307,7 +307,7 @@ class FP_FP_EXPORT PlaylistGame //-Instance Variables----------------------------------------------------------------------------------------------- private: - int mId; + std::optional mId; QUuid mPlaylistId; int mOrder; QUuid mGameId; @@ -318,7 +318,7 @@ class FP_FP_EXPORT PlaylistGame //-Instance Functions------------------------------------------------------------------------------------------------------ public: - int id() const; + std::optional id() const; QUuid playlistId() const; int order() const; QUuid gameId() const; @@ -336,7 +336,7 @@ class FP_FP_EXPORT PlaylistGame::Builder //-Instance Functions------------------------------------------------------------------------------------------ public: - Builder& wId(int id); + Builder& wId(std::optional id); Builder& wPlaylistId(QStringView rawPlaylistId); Builder& wOrder(int order); Builder& wGameId(QStringView rawGameId); diff --git a/lib/src/fp-items.cpp b/lib/src/fp-items.cpp index 405be37..67fb4e3 100644 --- a/lib/src/fp-items.cpp +++ b/lib/src/fp-items.cpp @@ -254,7 +254,7 @@ PlaylistGame::PlaylistGame() {} //-Instance Functions------------------------------------------------------------------------------------------------ //Public: -int PlaylistGame::id() const { return mId; } +std::optional PlaylistGame::id() const { return mId; } QUuid PlaylistGame::playlistId() const { return mPlaylistId; } int PlaylistGame::order() const { return mOrder; } QUuid PlaylistGame::gameId() const { return mGameId; } @@ -269,7 +269,7 @@ PlaylistGame::Builder::Builder() {} //-Instance Functions------------------------------------------------------------------------------------------ //Public: -PlaylistGame::Builder& PlaylistGame::Builder::wId(int id) { mPlaylistGameBlueprint.mId = id; return *this; } +PlaylistGame::Builder& PlaylistGame::Builder::wId(std::optional id) { mPlaylistGameBlueprint.mId = id; return *this; } PlaylistGame::Builder& PlaylistGame::Builder::wPlaylistId(QStringView rawPlaylistId) { mPlaylistGameBlueprint.mPlaylistId = QUuid(rawPlaylistId); return *this; } PlaylistGame::Builder& PlaylistGame::Builder::wOrder(int order) { mPlaylistGameBlueprint.mOrder = order; return *this; } PlaylistGame::Builder& PlaylistGame::Builder::wGameId(QStringView rawGameId) { mPlaylistGameBlueprint.mGameId = QUuid(rawGameId); return *this; } diff --git a/lib/src/fp-playlistmanager.cpp b/lib/src/fp-playlistmanager.cpp index 08af884..d92fae5 100644 --- a/lib/src/fp-playlistmanager.cpp +++ b/lib/src/fp-playlistmanager.cpp @@ -13,7 +13,7 @@ namespace Json struct PlaylistGame { - int id; + std::optional id; QString playlistId; int order; QString gameId;