From 01c1096c620ab471ce87c6a1079bd2e7229e2933 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 11 Oct 2021 21:46:51 +0400 Subject: [PATCH] Save Data::Session* in GameData. --- Telegram/CMakeLists.txt | 1 + Telegram/SourceFiles/data/data_game.cpp | 13 +++++++++++++ Telegram/SourceFiles/data/data_game.h | 20 ++------------------ Telegram/SourceFiles/data/data_session.cpp | 2 +- 4 files changed, 17 insertions(+), 19 deletions(-) create mode 100644 Telegram/SourceFiles/data/data_game.cpp diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index cb92894cba..bf06350e47 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -407,6 +407,7 @@ PRIVATE data/data_file_origin.cpp data/data_file_origin.h data/data_flags.h + data/data_game.cpp data/data_game.h data/data_group_call.cpp data/data_group_call.h diff --git a/Telegram/SourceFiles/data/data_game.cpp b/Telegram/SourceFiles/data/data_game.cpp new file mode 100644 index 0000000000..6861e69af7 --- /dev/null +++ b/Telegram/SourceFiles/data/data_game.cpp @@ -0,0 +1,13 @@ +/* +This file is part of Telegram Desktop, +the official desktop application for the Telegram messaging service. + +For license and copyright information please follow this link: +https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL +*/ +#include "data/data_game.h" + +GameData::GameData(not_null owner, const GameId &id) +: owner(owner) +, id(id) { +} diff --git a/Telegram/SourceFiles/data/data_game.h b/Telegram/SourceFiles/data/data_game.h index b74771fc94..ab41833252 100644 --- a/Telegram/SourceFiles/data/data_game.h +++ b/Telegram/SourceFiles/data/data_game.h @@ -11,25 +11,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_document.h" struct GameData { - GameData(const GameId &id) : id(id) { - } - GameData( - const GameId &id, - const uint64 &accessHash, - const QString &shortName, - const QString &title, - const QString &description, - PhotoData *photo, - DocumentData *document) - : id(id) - , accessHash(accessHash) - , shortName(shortName) - , title(title) - , description(description) - , photo(photo) - , document(document) { - } + GameData(not_null owner, const GameId &id); + const not_null owner; GameId id = 0; uint64 accessHash = 0; QString shortName; diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index 2fabbf3ac5..83b8aea699 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp @@ -3041,7 +3041,7 @@ void Session::webpageApplyFields( not_null Session::game(GameId id) { auto i = _games.find(id); if (i == _games.cend()) { - i = _games.emplace(id, std::make_unique(id)).first; + i = _games.emplace(id, std::make_unique(this, id)).first; } return i->second.get(); }