diff --git a/CMakeLists.txt b/CMakeLists.txt index a03edea07..4745f689a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -456,6 +456,7 @@ set(TDLIB_SOURCE td/telegram/StickerFormat.cpp td/telegram/StickerMaskPosition.cpp td/telegram/StickerPhotoSize.cpp + td/telegram/StickerSetId.cpp td/telegram/StickersManager.cpp td/telegram/StickerType.cpp td/telegram/StorageManager.cpp @@ -804,7 +805,6 @@ set(TDLIB_SOURCE td/telegram/SendCodeHelper.hpp td/telegram/StickerMaskPosition.hpp td/telegram/StickerPhotoSize.hpp - td/telegram/StickerSetId.hpp td/telegram/StickersManager.hpp td/telegram/TranscriptionInfo.hpp td/telegram/VideoNotesManager.hpp diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp index 0c274e5e6..ea4c3945e 100644 --- a/td/telegram/ContactsManager.cpp +++ b/td/telegram/ContactsManager.cpp @@ -44,7 +44,6 @@ #include "td/telegram/SecretChatLayer.h" #include "td/telegram/SecretChatsManager.h" #include "td/telegram/ServerMessageId.h" -#include "td/telegram/StickerSetId.hpp" #include "td/telegram/StickersManager.h" #include "td/telegram/Td.h" #include "td/telegram/TdDb.h" diff --git a/td/telegram/StickerMaskPosition.hpp b/td/telegram/StickerMaskPosition.hpp index 1a4e2a695..cb013410c 100644 --- a/td/telegram/StickerMaskPosition.hpp +++ b/td/telegram/StickerMaskPosition.hpp @@ -7,7 +7,6 @@ #pragma once #include "td/telegram/StickerMaskPosition.h" -#include "td/telegram/StickerSetId.hpp" #include "td/utils/tl_helpers.h" diff --git a/td/telegram/StickerPhotoSize.hpp b/td/telegram/StickerPhotoSize.hpp index 011e253f0..4994a7d23 100644 --- a/td/telegram/StickerPhotoSize.hpp +++ b/td/telegram/StickerPhotoSize.hpp @@ -7,7 +7,6 @@ #pragma once #include "td/telegram/StickerPhotoSize.h" -#include "td/telegram/StickerSetId.hpp" #include "td/utils/tl_helpers.h" diff --git a/td/telegram/StickerSetId.hpp b/td/telegram/StickerSetId.cpp similarity index 61% rename from td/telegram/StickerSetId.hpp rename to td/telegram/StickerSetId.cpp index 7b8a63cb7..f1a7b8d36 100644 --- a/td/telegram/StickerSetId.hpp +++ b/td/telegram/StickerSetId.cpp @@ -4,8 +4,6 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#pragma once - #include "td/telegram/StickerSetId.h" #include "td/telegram/StickersManager.h" @@ -14,14 +12,16 @@ namespace td { -template -void store(const StickerSetId &sticker_set_id, StorerT &storer) { - storer.context()->td().get_actor_unsafe()->stickers_manager_->store_sticker_set_id(sticker_set_id, storer); +void StickerSetId::store(LogEventStorerCalcLength &storer) const { + storer.context()->td().get_actor_unsafe()->stickers_manager_->store_sticker_set_id(*this, storer); } -template -void parse(StickerSetId &sticker_set_id, ParserT &parser) { - parser.context()->td().get_actor_unsafe()->stickers_manager_->parse_sticker_set_id(sticker_set_id, parser); +void StickerSetId::store(LogEventStorerUnsafe &storer) const { + storer.context()->td().get_actor_unsafe()->stickers_manager_->store_sticker_set_id(*this, storer); +} + +void StickerSetId::parse(LogEventParser &parser) { + parser.context()->td().get_actor_unsafe()->stickers_manager_->parse_sticker_set_id(*this, parser); } } // namespace td diff --git a/td/telegram/StickerSetId.h b/td/telegram/StickerSetId.h index 33cbade8a..fc62f349e 100644 --- a/td/telegram/StickerSetId.h +++ b/td/telegram/StickerSetId.h @@ -6,6 +6,8 @@ // #pragma once +#include "td/telegram/logevent/LogEvent.h" + #include "td/utils/common.h" #include "td/utils/HashTableUtils.h" #include "td/utils/StringBuilder.h" @@ -40,6 +42,12 @@ class StickerSetId { bool operator!=(const StickerSetId &other) const { return id != other.id; } + + void store(LogEventStorerCalcLength &storer) const; + + void store(LogEventStorerUnsafe &storer) const; + + void parse(LogEventParser &parser); }; struct StickerSetIdHash { diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp index 2e4b764b8..13ad84faf 100644 --- a/td/telegram/StickersManager.cpp +++ b/td/telegram/StickersManager.cpp @@ -32,7 +32,6 @@ #include "td/telegram/PhotoSizeSource.h" #include "td/telegram/secret_api.h" #include "td/telegram/SecretChatLayer.h" -#include "td/telegram/StickerSetId.hpp" #include "td/telegram/StickersManager.hpp" #include "td/telegram/Td.h" #include "td/telegram/td_api.h"