From eadd7704efa27fb6e1190cc3caf1ff34e0564126 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 31 Aug 2021 14:50:49 +0300 Subject: [PATCH] Removed Main::Session forward declaration from data_types. --- Telegram/SourceFiles/api/api_chat_invite.h | 4 ++++ Telegram/SourceFiles/api/api_sending.h | 4 ++++ Telegram/SourceFiles/data/data_changes.h | 4 ++++ Telegram/SourceFiles/data/data_types.cpp | 2 -- Telegram/SourceFiles/data/data_types.h | 4 ---- Telegram/SourceFiles/facades.h | 4 ++++ Telegram/SourceFiles/history/view/history_view_context_menu.h | 4 ++++ Telegram/SourceFiles/storage/localimageloader.h | 4 ++++ Telegram/SourceFiles/storage/serialize_peer.h | 4 ++++ 9 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/api/api_chat_invite.h b/Telegram/SourceFiles/api/api_chat_invite.h index be5912761..de5965130 100644 --- a/Telegram/SourceFiles/api/api_chat_invite.h +++ b/Telegram/SourceFiles/api/api_chat_invite.h @@ -12,6 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL class UserData; class ChannelData; +namespace Main { +class Session; +} // namespace Main + namespace Window { class SessionController; } // namespace Window diff --git a/Telegram/SourceFiles/api/api_sending.h b/Telegram/SourceFiles/api/api_sending.h index b48a24141..fc07ecb45 100644 --- a/Telegram/SourceFiles/api/api_sending.h +++ b/Telegram/SourceFiles/api/api_sending.h @@ -7,6 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +namespace Main { +class Session; +} // namespace Main + class History; class PhotoData; class DocumentData; diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h index 105c82858..6694507c0 100644 --- a/Telegram/SourceFiles/data/data_changes.h +++ b/Telegram/SourceFiles/data/data_changes.h @@ -17,6 +17,10 @@ namespace Dialogs { class Entry; } // namespace Dialogs +namespace Main { +class Session; +} // namespace Main + namespace Data { namespace details { diff --git a/Telegram/SourceFiles/data/data_types.cpp b/Telegram/SourceFiles/data/data_types.cpp index ceb06eccf..10c1debc6 100644 --- a/Telegram/SourceFiles/data/data_types.cpp +++ b/Telegram/SourceFiles/data/data_types.cpp @@ -7,11 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "data/data_types.h" -#include "data/data_session.h" #include "ui/widgets/input_fields.h" #include "storage/cache/storage_cache_types.h" #include "base/openssl_help.h" -#include "main/main_session.h" namespace Data { namespace { diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h index 66ae7d183..680ce3aa8 100644 --- a/Telegram/SourceFiles/data/data_types.h +++ b/Telegram/SourceFiles/data/data_types.h @@ -28,10 +28,6 @@ namespace Ui { class InputField; } // namespace Ui -namespace Main { -class Session; -} // namespace Main - namespace Images { enum class Option; using Options = base::flags