From 4ad51ffb42db60e79473b6fcdc6ac78d5cac2cb6 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Thu, 23 Nov 2023 18:18:52 +0300 Subject: [PATCH] Removed some include directives. --- Telegram/SourceFiles/apiwrap.cpp | 51 ++++++------------- Telegram/SourceFiles/apiwrap.h | 9 ++-- .../boxes/peers/edit_peer_reactions.cpp | 3 -- .../SourceFiles/core/click_handler_types.cpp | 2 - .../SourceFiles/core/local_url_handlers.cpp | 3 -- Telegram/SourceFiles/data/data_channel.cpp | 5 -- Telegram/SourceFiles/data/data_document.cpp | 7 --- Telegram/SourceFiles/data/data_document.h | 1 - .../SourceFiles/data/data_document_media.cpp | 3 -- .../data/data_document_resolver.cpp | 1 - Telegram/SourceFiles/data/data_photo.cpp | 3 -- .../SourceFiles/data/data_photo_media.cpp | 9 ++-- Telegram/SourceFiles/data/data_photo_media.h | 1 - Telegram/SourceFiles/data/data_session.cpp | 9 ---- Telegram/SourceFiles/data/data_session.h | 3 -- .../data/data_sponsored_messages.cpp | 6 --- Telegram/SourceFiles/data/data_user.cpp | 2 - Telegram/SourceFiles/history/history_item.cpp | 8 --- Telegram/SourceFiles/history/history_item.h | 2 - Telegram/SourceFiles/history/history_widget.h | 3 -- .../history/view/history_view_element.cpp | 7 --- .../history/view/history_view_message.cpp | 9 ---- Telegram/SourceFiles/main/main_account.cpp | 4 -- Telegram/SourceFiles/main/main_session.cpp | 2 - Telegram/SourceFiles/main/main_session.h | 1 - Telegram/SourceFiles/mainwidget.cpp | 31 ----------- Telegram/SourceFiles/mainwidget.h | 4 -- Telegram/SourceFiles/mainwindow.cpp | 9 ---- Telegram/SourceFiles/mainwindow.h | 2 - .../media/player/media_player_float.cpp | 3 -- .../media/player/media_player_float.h | 1 - .../media/player/media_player_panel.cpp | 3 -- .../media/view/media_view_overlay_widget.cpp | 13 ----- .../platform/mac/main_window_mac.mm | 8 --- .../SourceFiles/settings/settings_premium.cpp | 1 - Telegram/SourceFiles/window/main_window.cpp | 6 --- Telegram/SourceFiles/window/main_window.h | 1 - .../SourceFiles/window/window_controller.cpp | 5 -- .../SourceFiles/window/window_controller.h | 1 - .../window/window_session_controller.cpp | 19 ++----- .../window/window_session_controller.h | 15 ++---- 41 files changed, 32 insertions(+), 244 deletions(-) diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index f2405f2e3..3b1287598 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -34,50 +34,35 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_user_names.h" #include "api/api_websites.h" #include "data/notify/data_notify_settings.h" -#include "data/stickers/data_stickers.h" -#include "data/data_drafts.h" #include "data/data_changes.h" -#include "data/data_photo.h" #include "data/data_web_page.h" #include "data/data_folder.h" #include "data/data_forum_topic.h" #include "data/data_forum.h" -#include "data/data_media_types.h" -#include "data/data_sparse_ids.h" #include "data/data_search_controller.h" #include "data/data_scheduled_messages.h" -#include "data/data_channel_admins.h" #include "data/data_session.h" -#include "data/data_stories.h" #include "data/data_channel.h" #include "data/data_chat.h" #include "data/data_user.h" -#include "data/data_cloud_themes.h" #include "data/data_chat_filters.h" #include "data/data_histories.h" -#include "data/data_wall_paper.h" -#include "data/stickers/data_stickers.h" -#include "dialogs/dialogs_key.h" #include "core/core_cloud_password.h" #include "core/application.h" #include "base/unixtime.h" #include "base/random.h" -#include "base/qt/qt_common_adapters.h" #include "base/call_delayed.h" #include "lang/lang_keys.h" -#include "mainwindow.h" #include "mainwidget.h" #include "boxes/add_contact_box.h" #include "mtproto/mtproto_config.h" #include "history/history.h" -#include "history/history_item.h" #include "history/history_item_components.h" #include "history/history_item_helpers.h" #include "main/main_session.h" #include "main/main_session_settings.h" #include "main/main_account.h" #include "ui/boxes/confirm_box.h" -#include "boxes/stickers_box.h" #include "boxes/sticker_set_box.h" #include "boxes/premium_limits_box.h" #include "window/notifications_manager.h" @@ -88,7 +73,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "chat_helpers/message_field.h" #include "ui/item_text_options.h" #include "ui/text/text_utilities.h" -#include "ui/emoji_config.h" #include "ui/chat/attach/attach_prepare.h" #include "ui/toast/toast.h" #include "support/support_helper.h" @@ -96,9 +80,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/localimageloader.h" #include "storage/download_manager_mtproto.h" #include "storage/file_upload.h" -#include "storage/storage_facade.h" -#include "storage/storage_shared_media.h" -#include "storage/storage_media_prepare.h" #include "storage/storage_account.h" namespace { @@ -148,6 +129,15 @@ void ShowChannelsLimitBox(not_null peer) { } } +[[nodiscard]] FileLoadTo FileLoadTaskOptions(const Api::SendAction &action) { + const auto peer = action.history->peer; + return FileLoadTo( + peer->id, + action.options, + action.replyTo, + action.replaceMediaOf); +} + } // namespace ApiWrap::ApiWrap(not_null session) @@ -2061,13 +2051,13 @@ void ApiWrap::deleteHistory( void ApiWrap::applyUpdates( const MTPUpdates &updates, - uint64 sentMessageRandomId) { + uint64 sentMessageRandomId) const { this->updates().applyUpdates(updates, sentMessageRandomId); } int ApiWrap::applyAffectedHistory( PeerData *peer, - const MTPmessages_AffectedHistory &result) { + const MTPmessages_AffectedHistory &result) const { const auto &data = result.c_messages_affectedHistory(); if (const auto channel = peer ? peer->asChannel() : nullptr) { channel->ptsUpdateAndApply(data.vpts().v, data.vpts_count().v); @@ -2089,7 +2079,7 @@ void ApiWrap::applyAffectedMessages( } void ApiWrap::applyAffectedMessages( - const MTPmessages_AffectedMessages &result) { + const MTPmessages_AffectedMessages &result) const { const auto &data = result.c_messages_affectedMessages(); updates().updateAndApply(data.vpts().v, data.vpts_count().v); } @@ -3435,7 +3425,7 @@ void ApiWrap::sendVoiceMessage( crl::time duration, const SendAction &action) { const auto caption = TextWithTags(); - const auto to = fileLoadTaskOptions(action); + const auto to = FileLoadTaskOptions(action); _fileLoader->addTask(std::make_unique( &session(), result, @@ -3453,7 +3443,7 @@ void ApiWrap::editMedia( if (list.files.empty()) return; auto &file = list.files.front(); - const auto to = fileLoadTaskOptions(action); + const auto to = FileLoadTaskOptions(action); _fileLoader->addTask(std::make_unique( &session(), file.path, @@ -3482,7 +3472,7 @@ void ApiWrap::sendFiles( sendMessage(std::move(message)); } - const auto to = fileLoadTaskOptions(action); + const auto to = FileLoadTaskOptions(action); if (album) { album->options = to.options; } @@ -3521,7 +3511,7 @@ void ApiWrap::sendFile( const QByteArray &fileContent, SendMediaType type, const SendAction &action) { - const auto to = fileLoadTaskOptions(action); + const auto to = FileLoadTaskOptions(action); auto caption = TextWithTags(); const auto spoiler = false; const auto information = nullptr; @@ -4180,15 +4170,6 @@ void ApiWrap::sendAlbumIfReady(not_null album) { }); } -FileLoadTo ApiWrap::fileLoadTaskOptions(const SendAction &action) const { - const auto peer = action.history->peer; - return FileLoadTo( - peer->id, - action.options, - action.replyTo, - action.replaceMediaOf); -} - void ApiWrap::reloadContactSignupSilent() { if (_contactSignupSilentRequestId) { return; diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h index bdfc8561f..70ed1affa 100644 --- a/Telegram/SourceFiles/apiwrap.h +++ b/Telegram/SourceFiles/apiwrap.h @@ -9,8 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_common.h" #include "base/timer.h" -#include "base/flat_map.h" -#include "base/flat_set.h" #include "mtproto/sender.h" #include "data/stickers/data_stickers_set.h" #include "data/data_messages.h" @@ -142,10 +140,10 @@ public: void applyUpdates( const MTPUpdates &updates, - uint64 sentMessageRandomId = 0); + uint64 sentMessageRandomId = 0) const; int applyAffectedHistory( PeerData *peer, // May be nullptr, like for deletePhoneCallHistory. - const MTPmessages_AffectedHistory &result); + const MTPmessages_AffectedHistory &result) const; void registerModifyRequest(const QString &key, mtpRequestId requestId); void clearModifyRequest(const QString &key); @@ -505,7 +503,7 @@ private: not_null peer, bool justClear, bool revoke); - void applyAffectedMessages(const MTPmessages_AffectedMessages &result); + void applyAffectedMessages(const MTPmessages_AffectedMessages &result) const; void deleteAllFromParticipantSend( not_null channel, @@ -534,7 +532,6 @@ private: Api::SendOptions options, uint64 randomId, Fn done = nullptr); - FileLoadTo fileLoadTaskOptions(const SendAction &action) const; void getTopPromotionDelayed(TimeId now, TimeId next); void topPromotionDone(const MTPhelp_PromoData &proxy); diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp index cb7c1183e..dd5bc8d79 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp @@ -10,8 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/event_filter.h" #include "chat_helpers/tabbed_panel.h" #include "chat_helpers/tabbed_selector.h" -#include "data/data_message_reactions.h" -#include "data/data_peer.h" #include "data/data_chat.h" #include "data/data_channel.h" #include "data/data_document.h" @@ -24,7 +22,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/fields/input_field.h" #include "ui/layers/generic_box.h" #include "ui/text/text_utilities.h" -#include "ui/widgets/buttons.h" #include "ui/widgets/checkbox.h" #include "ui/wrap/slide_wrap.h" #include "ui/vertical_list.h" diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp index 7dfaedac8..36d1871ff 100644 --- a/Telegram/SourceFiles/core/click_handler_types.cpp +++ b/Telegram/SourceFiles/core/click_handler_types.cpp @@ -11,10 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "core/local_url_handlers.h" #include "mainwidget.h" -#include "mainwindow.h" #include "main/main_session.h" #include "ui/boxes/confirm_box.h" -#include "ui/text/text_entity.h" #include "ui/toast/toast.h" #include "base/qthelp_regex.h" #include "base/qt/qt_key_modifiers.h" diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp index 3ae95884e..2d5f88283 100644 --- a/Telegram/SourceFiles/core/local_url_handlers.cpp +++ b/Telegram/SourceFiles/core/local_url_handlers.cpp @@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_authorizations.h" #include "api/api_confirm_phone.h" -#include "api/api_text_entities.h" #include "api/api_chat_filters.h" #include "api/api_chat_invite.h" #include "api/api_premium.h" @@ -24,7 +23,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/boxes/confirm_box.h" #include "boxes/share_box.h" #include "boxes/connection_box.h" -#include "boxes/gift_premium_box.h" #include "boxes/sticker_set_box.h" #include "boxes/sessions_box.h" #include "boxes/language_box.h" @@ -32,7 +30,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/toast/toast.h" #include "data/data_session.h" #include "data/data_document.h" -#include "data/data_cloud_themes.h" #include "data/data_channel.h" #include "media/player/media_player_instance.h" #include "media/view/media_view_open_common.h" diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp index 06a07844d..6f25e02c8 100644 --- a/Telegram/SourceFiles/data/data_channel.cpp +++ b/Telegram/SourceFiles/data/data_channel.cpp @@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "data/data_channel.h" -#include "data/data_peer_values.h" #include "data/data_changes.h" #include "data/data_channel_admins.h" #include "data/data_user.h" @@ -17,19 +16,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_folder.h" #include "data/data_forum.h" #include "data/data_forum_icons.h" -#include "data/data_location.h" #include "data/data_histories.h" #include "data/data_group_call.h" #include "data/data_message_reactions.h" -#include "data/data_peer_bot_command.h" -#include "data/data_user_names.h" #include "data/notify/data_notify_settings.h" #include "main/main_session.h" #include "main/session/send_as_peers.h" #include "base/unixtime.h" #include "core/application.h" #include "history/history.h" -#include "main/main_session.h" #include "api/api_chat_invite.h" #include "api/api_invite_links.h" #include "apiwrap.h" diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp index 5852a9606..32ff4be75 100644 --- a/Telegram/SourceFiles/data/data_document.cpp +++ b/Telegram/SourceFiles/data/data_document.cpp @@ -19,7 +19,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/file_utilities.h" #include "core/mime_type.h" #include "data/stickers/data_stickers.h" -#include "data/stickers/data_stickers_set.h" #include "media/audio/media_audio.h" #include "media/player/media_player_instance.h" #include "media/streaming/media_streaming_loader_mtproto.h" @@ -29,18 +28,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/streamed_file_downloader.h" #include "storage/file_download_mtproto.h" #include "storage/file_download_web.h" -#include "platform/platform_specific.h" -#include "platform/platform_file_utilities.h" -#include "base/platform/base_platform_info.h" #include "base/options.h" #include "history/history.h" #include "history/history_item.h" #include "history/view/media/history_view_gif.h" #include "window/window_session_controller.h" -#include "storage/cache/storage_cache_database.h" #include "ui/boxes/confirm_box.h" -#include "ui/image/image.h" -#include "ui/text/text_utilities.h" #include "base/base_file_utilities.h" #include "mainwindow.h" #include "core/application.h" diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h index 59891c005..c33c9cbd0 100644 --- a/Telegram/SourceFiles/data/data_document.h +++ b/Telegram/SourceFiles/data/data_document.h @@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_types.h" #include "data/data_cloud_file.h" #include "core/file_location.h" -#include "ui/image/image.h" enum class ChatRestriction; class mtpFileLoader; diff --git a/Telegram/SourceFiles/data/data_document_media.cpp b/Telegram/SourceFiles/data/data_document_media.cpp index 37ebbf843..101f0f8cc 100644 --- a/Telegram/SourceFiles/data/data_document_media.cpp +++ b/Telegram/SourceFiles/data/data_document_media.cpp @@ -10,9 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_document.h" #include "data/data_document_resolver.h" #include "data/data_session.h" -#include "data/data_cloud_themes.h" #include "data/data_file_origin.h" -#include "data/data_auto_download.h" #include "media/clip/media_clip_reader.h" #include "main/main_session.h" #include "main/main_session_settings.h" @@ -26,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "storage/file_download.h" #include "ui/chat/attach/attach_prepare.h" -#include "ui/image/image.h" #include #include diff --git a/Telegram/SourceFiles/data/data_document_resolver.cpp b/Telegram/SourceFiles/data/data_document_resolver.cpp index ee8d11565..05d23ecdf 100644 --- a/Telegram/SourceFiles/data/data_document_resolver.cpp +++ b/Telegram/SourceFiles/data/data_document_resolver.cpp @@ -16,7 +16,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_document.h" #include "data/data_document_media.h" #include "data/data_file_click_handler.h" -#include "data/data_file_origin.h" #include "data/data_session.h" #include "history/view/media/history_view_gif.h" #include "history/history.h" diff --git a/Telegram/SourceFiles/data/data_photo.cpp b/Telegram/SourceFiles/data/data_photo.cpp index 963162fcf..2530ccc75 100644 --- a/Telegram/SourceFiles/data/data_photo.cpp +++ b/Telegram/SourceFiles/data/data_photo.cpp @@ -8,16 +8,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_photo.h" #include "data/data_session.h" -#include "data/data_file_origin.h" #include "data/data_reply_preview.h" #include "data/data_photo_media.h" -#include "ui/image/image.h" #include "main/main_session.h" #include "history/history.h" #include "history/history_item.h" #include "media/streaming/media_streaming_loader_local.h" #include "media/streaming/media_streaming_loader_mtproto.h" -#include "mainwidget.h" #include "storage/file_download.h" #include "core/application.h" diff --git a/Telegram/SourceFiles/data/data_photo_media.cpp b/Telegram/SourceFiles/data/data_photo_media.cpp index be713b4a9..0b66e192a 100644 --- a/Telegram/SourceFiles/data/data_photo_media.cpp +++ b/Telegram/SourceFiles/data/data_photo_media.cpp @@ -7,16 +7,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "data/data_photo_media.h" -#include "data/data_photo.h" -#include "data/data_session.h" #include "data/data_file_origin.h" -#include "data/data_auto_download.h" +#include "data/data_session.h" +#include "history/history.h" +#include "history/history_item.h" #include "main/main_session.h" #include "main/main_session_settings.h" -#include "history/history_item.h" -#include "history/history.h" #include "storage/file_download.h" -#include "ui/image/image.h" #include #include diff --git a/Telegram/SourceFiles/data/data_photo_media.h b/Telegram/SourceFiles/data/data_photo_media.h index f9e3c7708..a5ef88b22 100644 --- a/Telegram/SourceFiles/data/data_photo_media.h +++ b/Telegram/SourceFiles/data/data_photo_media.h @@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "base/flags.h" #include "data/data_photo.h" class FileLoader; diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index 694a1d688..a6fdfc1ee 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp @@ -19,8 +19,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "core/core_settings.h" #include "core/mime_type.h" // Core::IsMimeSticker -#include "core/crash_reports.h" // CrashReports::SetAnnotation -#include "ui/image/image.h" #include "ui/image/image_location_factory.h" // Images::FromPhotoSize #include "ui/text/format_values.h" // Ui::FormatPhone #include "export/export_manager.h" @@ -44,17 +42,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_bot_app.h" #include "data/data_changes.h" #include "data/data_group_call.h" -#include "data/data_media_types.h" #include "data/data_folder.h" #include "data/data_channel.h" #include "data/data_chat.h" #include "data/data_user.h" #include "data/data_file_origin.h" #include "data/data_download_manager.h" -#include "data/data_photo.h" -#include "data/data_document.h" #include "data/data_web_page.h" -#include "data/data_wall_paper.h" #include "data/data_game.h" #include "data/data_poll.h" #include "data/data_replies_list.h" @@ -67,7 +61,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_forum_icons.h" #include "data/data_cloud_themes.h" #include "data/data_stories.h" -#include "data/data_story.h" #include "data/data_streaming.h" #include "data/data_media_rotation.h" #include "data/data_histories.h" @@ -75,13 +68,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_premium_limits.h" #include "data/data_forum.h" #include "data/data_forum_topic.h" -#include "data/stickers/data_custom_emoji.h" #include "base/platform/base_platform_info.h" #include "base/unixtime.h" #include "base/call_delayed.h" #include "base/random.h" #include "spellcheck/spellcheck_highlight_syntax.h" -#include "styles/style_boxes.h" // st::backgroundSize namespace Data { namespace { diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h index 47e4a4012..ea93cc178 100644 --- a/Telegram/SourceFiles/data/data_session.h +++ b/Telegram/SourceFiles/data/data_session.h @@ -8,14 +8,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "storage/storage_databases.h" -#include "dialogs/dialogs_key.h" -#include "dialogs/dialogs_indexed_list.h" #include "dialogs/dialogs_main_list.h" #include "data/data_groups.h" #include "data/data_cloud_file.h" #include "history/history_location_manager.h" #include "base/timer.h" -#include "base/flags.h" class Image; class HistoryItem; diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp index 696afdfe8..556bee6ce 100644 --- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp +++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp @@ -9,20 +9,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_text_entities.h" #include "apiwrap.h" -#include "base/unixtime.h" #include "data/data_bot_app.h" #include "data/data_channel.h" -#include "data/data_peer.h" -#include "data/data_peer_id.h" -#include "data/data_photo.h" #include "data/data_session.h" #include "data/data_user.h" #include "history/history.h" -#include "history/history_item.h" #include "history/view/history_view_element.h" #include "lang/lang_keys.h" #include "main/main_session.h" -#include "ui/image/image_location_factory.h" #include "ui/text/text_utilities.h" // Ui::Text::RichLangValue. namespace Data { diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp index f385b8c13..e16e4f13b 100644 --- a/Telegram/SourceFiles/data/data_user.cpp +++ b/Telegram/SourceFiles/data/data_user.cpp @@ -16,13 +16,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_photo.h" #include "data/data_stories.h" #include "data/data_emoji_statuses.h" -#include "data/data_user_names.h" #include "data/data_wall_paper.h" #include "data/notify/data_notify_settings.h" #include "history/history.h" #include "api/api_peer_photo.h" #include "apiwrap.h" -#include "ui/text/text_options.h" #include "lang/lang_keys.h" #include "styles/style_chat.h" diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index 14f4e90ea..dfdfce87e 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "mainwidget.h" #include "calls/calls_instance.h" // Core::App().calls().joinGroupCall. -#include "history/view/history_view_element.h" #include "history/view/history_view_item_preview.h" #include "history/view/history_view_message.h" #include "history/view/history_view_service_message.h" @@ -20,12 +19,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history_unread_things.h" #include "history/history.h" #include "mtproto/mtproto_config.h" -#include "media/clip/media_clip_reader.h" #include "ui/text/format_values.h" #include "ui/text/text_isolated_emoji.h" #include "ui/text/text_utilities.h" #include "storage/file_upload.h" -#include "storage/storage_facade.h" #include "storage/storage_shared_media.h" #include "main/main_account.h" #include "main/main_domain.h" @@ -35,7 +32,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "apiwrap.h" #include "media/audio/media_audio.h" #include "core/application.h" -#include "mainwindow.h" #include "window/window_controller.h" #include "window/window_session_controller.h" #include "core/click_handler_types.h" @@ -43,15 +39,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer_rpl.h" #include "api/api_text_entities.h" #include "api/api_updates.h" -#include "dialogs/ui/dialogs_message_view.h" #include "data/notify/data_notify_settings.h" #include "data/data_bot_app.h" #include "data/data_scheduled_messages.h" #include "data/data_changes.h" #include "data/data_session.h" #include "data/data_message_reactions.h" -#include "data/data_messages.h" -#include "data/data_media_types.h" #include "data/data_folder.h" #include "data/data_forum.h" #include "data/data_forum_topic.h" @@ -63,7 +56,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_poll.h" // PollData::publicVotes. #include "data/data_sponsored_messages.h" #include "data/data_stories.h" -#include "data/data_wall_paper.h" #include "data/data_web_page.h" #include "chat_helpers/stickers_gift_box_pack.h" #include "payments/payments_checkout_process.h" // CheckoutProcess::Start. diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h index 9839a6d08..c14c65654 100644 --- a/Telegram/SourceFiles/history/history_item.h +++ b/Telegram/SourceFiles/history/history_item.h @@ -8,10 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "base/runtime_composer.h" -#include "base/flags.h" #include "data/data_media_types.h" #include "history/history_item_edition.h" -#include "history/history_item_reply_markup.h" #include diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h index b0132b4d8..34f101d76 100644 --- a/Telegram/SourceFiles/history/history_widget.h +++ b/Telegram/SourceFiles/history/history_widget.h @@ -12,13 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history_view_highlight_manager.h" #include "history/history_view_top_toast.h" #include "history/history.h" -#include "chat_helpers/bot_command.h" #include "chat_helpers/field_autocomplete.h" -#include "data/data_drafts.h" #include "window/section_widget.h" #include "ui/widgets/fields/input_field.h" #include "mtproto/sender.h" -#include "base/flags.h" struct FileLoadResult; enum class SendMediaType; diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp index 38af0db75..5de4648e9 100644 --- a/Telegram/SourceFiles/history/view/history_view_element.cpp +++ b/Telegram/SourceFiles/history/view/history_view_element.cpp @@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_chat_invite.h" #include "history/view/history_view_service_message.h" #include "history/view/history_view_message.h" -#include "history/view/media/history_view_media.h" #include "history/view/media/history_view_media_grouped.h" #include "history/view/media/history_view_similar_channels.h" #include "history/view/media/history_view_sticker.h" @@ -22,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/view/history_view_reply.h" #include "history/view/history_view_spoiler_click_handler.h" #include "history/history.h" -#include "history/history_item.h" #include "history/history_item_components.h" #include "history/history_item_helpers.h" #include "base/unixtime.h" @@ -37,18 +35,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_session_controller.h" #include "ui/effects/path_shift_gradient.h" #include "ui/effects/reaction_fly_animation.h" -#include "ui/effects/ripple_animation.h" -#include "ui/chat/chat_style.h" #include "ui/toast/toast.h" -#include "ui/text/text_options.h" #include "ui/text/text_utilities.h" #include "ui/item_text_options.h" #include "ui/painter.h" #include "data/data_session.h" -#include "data/data_groups.h" #include "data/data_forum.h" #include "data/data_forum_topic.h" -#include "data/data_media_types.h" #include "data/data_sponsored_messages.h" #include "data/data_message_reactions.h" #include "lang/lang_keys.h" diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp index ef46a4d10..238efa500 100644 --- a/Telegram/SourceFiles/history/view/history_view_message.cpp +++ b/Telegram/SourceFiles/history/view/history_view_message.cpp @@ -10,10 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/click_handler_types.h" // ClickHandlerContext #include "core/ui_integration.h" #include "history/view/history_view_cursor_state.h" -#include "history/history_item.h" #include "history/history_item_components.h" #include "history/history_item_helpers.h" -#include "history/view/media/history_view_media.h" #include "history/view/media/history_view_web_page.h" #include "history/view/reactions/history_view_reactions.h" #include "history/view/reactions/history_view_reactions_button.h" @@ -23,17 +21,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history.h" #include "boxes/share_box.h" #include "ui/effects/glare.h" -#include "ui/effects/ripple_animation.h" #include "ui/effects/reaction_fly_animation.h" -#include "ui/chat/message_bubble.h" -#include "ui/chat/chat_style.h" #include "ui/rect.h" #include "ui/round_rect.h" #include "ui/text/text_utilities.h" -#include "ui/text/text_entity.h" -#include "ui/cached_round_corners.h" #include "ui/power_saving.h" -#include "base/unixtime.h" #include "data/data_session.h" #include "data/data_user.h" #include "data/data_channel.h" @@ -47,7 +39,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/painter.h" #include "window/window_session_controller.h" #include "apiwrap.h" -#include "styles/style_widgets.h" #include "styles/style_chat.h" #include "styles/style_chat_helpers.h" #include "styles/style_dialogs.h" diff --git a/Telegram/SourceFiles/main/main_account.cpp b/Telegram/SourceFiles/main/main_account.cpp index 2ad63c37f..90a6a897e 100644 --- a/Telegram/SourceFiles/main/main_account.cpp +++ b/Telegram/SourceFiles/main/main_account.cpp @@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/platform/base_platform_info.h" #include "core/application.h" -#include "core/shortcuts.h" #include "storage/storage_account.h" #include "storage/storage_domain.h" // Storage::StartResult. #include "storage/serialize_common.h" @@ -21,9 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_controller.h" #include "media/audio/media_audio.h" #include "mtproto/mtproto_config.h" -#include "mtproto/mtproto_dc_options.h" -#include "mtproto/mtp_instance.h" -#include "ui/image/image.h" #include "mainwidget.h" #include "api/api_updates.h" #include "main/main_app_config.h" diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp index 72b791fa1..18ec34ba4 100644 --- a/Telegram/SourceFiles/main/main_session.cpp +++ b/Telegram/SourceFiles/main/main_session.cpp @@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "apiwrap.h" #include "api/api_peer_colors.h" #include "api/api_updates.h" -#include "api/api_send_progress.h" #include "api/api_user_privacy.h" #include "main/main_account.h" #include "main/main_domain.h" @@ -29,7 +28,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/file_upload.h" #include "storage/storage_account.h" #include "storage/storage_facade.h" -#include "storage/storage_account.h" #include "data/data_session.h" #include "data/data_changes.h" #include "data/data_user.h" diff --git a/Telegram/SourceFiles/main/main_session.h b/Telegram/SourceFiles/main/main_session.h index 2dd967722..24c165f0b 100644 --- a/Telegram/SourceFiles/main/main_session.h +++ b/Telegram/SourceFiles/main/main_session.h @@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include #include #include #include "base/timer.h" diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index cacb19ff6..77ca1bfe4 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -9,21 +9,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_updates.h" #include "api/api_views.h" -#include "data/data_photo.h" -#include "data/data_document.h" #include "data/data_document_media.h" #include "data/data_document_resolver.h" #include "data/data_forum_topic.h" -#include "data/data_wall_paper.h" #include "data/data_web_page.h" #include "data/data_game.h" #include "data/data_peer_values.h" -#include "data/data_drafts.h" #include "data/data_session.h" #include "data/data_changes.h" -#include "data/data_media_types.h" #include "data/data_folder.h" -#include "data/data_forum_topic.h" #include "data/data_channel.h" #include "data/data_chat.h" #include "data/data_user.h" @@ -36,19 +30,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/buttons.h" #include "ui/widgets/shadow.h" #include "ui/widgets/dropdown_menu.h" -#include "ui/image/image.h" #include "ui/focus_persister.h" #include "ui/resize_area.h" -#include "ui/text/text_options.h" -#include "ui/emoji_config.h" -#include "ui/ui_utility.h" -#include "window/section_memento.h" -#include "window/section_widget.h" #include "window/window_connecting_widget.h" #include "window/window_top_bar_wrap.h" #include "window/notifications_manager.h" #include "window/window_slide_animation.h" -#include "window/window_session_controller.h" #include "window/window_history_hider.h" #include "window/window_controller.h" #include "window/window_peer_menu.h" @@ -56,27 +43,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "chat_helpers/tabbed_selector.h" // TabbedSelector::refreshStickers #include "chat_helpers/message_field.h" #include "info/info_memento.h" -#include "info/info_controller.h" #include "apiwrap.h" #include "dialogs/dialogs_widget.h" -#include "dialogs/dialogs_key.h" -#include "history/history.h" #include "history/history_widget.h" -#include "history/history_item.h" #include "history/history_item_helpers.h" // GetErrorTextForSending. #include "history/view/media/history_view_media.h" #include "history/view/history_view_service_message.h" -#include "history/view/history_view_element.h" #include "lang/lang_keys.h" #include "lang/lang_cloud_manager.h" -#include "boxes/add_contact_box.h" -#include "mainwindow.h" #include "inline_bots/inline_bot_layout_item.h" #include "ui/boxes/confirm_box.h" -#include "boxes/sticker_set_box.h" #include "boxes/peer_list_controllers.h" -#include "boxes/download_path_box.h" -#include "boxes/connection_box.h" #include "storage/storage_account.h" #include "main/main_domain.h" #include "media/audio/media_audio.h" @@ -84,18 +61,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "media/player/media_player_widget.h" #include "media/player/media_player_dropdown.h" #include "media/player/media_player_instance.h" -#include "media/player/media_player_float.h" #include "base/qthelp_regex.h" -#include "base/qthelp_url.h" -#include "base/flat_set.h" #include "mtproto/mtproto_dc_options.h" -#include "core/file_utilities.h" #include "core/update_checker.h" #include "core/shortcuts.h" #include "core/application.h" #include "core/changelogs.h" #include "core/mime_type.h" -#include "base/unixtime.h" #include "calls/calls_call.h" #include "calls/calls_instance.h" #include "calls/calls_top_bar.h" @@ -108,12 +80,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "main/main_session_settings.h" #include "main/main_account.h" #include "support/support_helper.h" -#include "storage/storage_facade.h" -#include "storage/storage_shared_media.h" #include "storage/storage_user_photos.h" #include "styles/style_dialogs.h" #include "styles/style_chat.h" -#include "styles/style_boxes.h" #include "styles/style_window.h" #include diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index 386434ecc..de94e66da 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -8,13 +8,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "base/weak_ptr.h" -#include "base/unique_qptr.h" #include "chat_helpers/bot_command.h" -#include "ui/rp_widget.h" -#include "ui/effects/animations.h" #include "media/player/media_player_float.h" #include "mtproto/sender.h" -#include "data/data_pts_waiter.h" struct HistoryMessageMarkupButton; class MainWindow; diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index f5baef181..d0f67b583 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -16,13 +16,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/buttons.h" #include "ui/widgets/shadow.h" #include "ui/widgets/tooltip.h" -#include "ui/layers/layer_widget.h" #include "ui/emoji_config.h" -#include "ui/ui_utility.h" #include "lang/lang_cloud_manager.h" #include "lang/lang_instance.h" -#include "lang/lang_keys.h" -#include "core/shortcuts.h" #include "core/sandbox.h" #include "core/application.h" #include "export/export_manager.h" @@ -39,14 +35,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "apiwrap.h" #include "api/api_updates.h" #include "settings/settings_intro.h" -#include "platform/platform_notifications_manager.h" -#include "base/platform/base_platform_info.h" #include "base/options.h" -#include "base/variant.h" #include "window/notifications_manager.h" #include "window/themes/window_theme.h" #include "window/themes/window_theme_warning.h" -#include "window/window_lock_widgets.h" #include "window/window_main_menu.h" #include "window/window_controller.h" // App::wnd. #include "window/window_session_controller.h" @@ -56,7 +48,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_window.h" #include -#include namespace { diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h index 5b6926e69..4befae7c6 100644 --- a/Telegram/SourceFiles/mainwindow.h +++ b/Telegram/SourceFiles/mainwindow.h @@ -8,9 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "platform/platform_main_window.h" -#include "base/unique_qptr.h" #include "ui/layers/layer_widget.h" -#include "ui/effects/animation_value.h" class MainWidget; diff --git a/Telegram/SourceFiles/media/player/media_player_float.cpp b/Telegram/SourceFiles/media/player/media_player_float.cpp index 321ce14b0..d54b5eeea 100644 --- a/Telegram/SourceFiles/media/player/media_player_float.cpp +++ b/Telegram/SourceFiles/media/player/media_player_float.cpp @@ -7,10 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "media/player/media_player_float.h" -#include #include "data/data_document.h" #include "data/data_session.h" -#include "data/data_media_types.h" #include "history/view/media/history_view_media.h" #include "history/history_item.h" #include "history/history.h" @@ -26,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "main/main_session.h" #include "main/main_account.h" #include "ui/painter.h" -#include "ui/ui_utility.h" #include "styles/style_media_player.h" #include "styles/style_chat.h" diff --git a/Telegram/SourceFiles/media/player/media_player_float.h b/Telegram/SourceFiles/media/player/media_player_float.h index 572b96200..2df70e1fd 100644 --- a/Telegram/SourceFiles/media/player/media_player_float.h +++ b/Telegram/SourceFiles/media/player/media_player_float.h @@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "ui/rp_widget.h" -#include "ui/rect_part.h" #include "ui/effects/animations.h" #include "base/object_ptr.h" diff --git a/Telegram/SourceFiles/media/player/media_player_panel.cpp b/Telegram/SourceFiles/media/player/media_player_panel.cpp index 23c77b460..e592010f5 100644 --- a/Telegram/SourceFiles/media/player/media_player_panel.cpp +++ b/Telegram/SourceFiles/media/player/media_player_panel.cpp @@ -13,17 +13,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history_item.h" #include "data/data_session.h" #include "data/data_document.h" -#include "data/data_media_types.h" #include "data/data_channel.h" #include "data/data_chat.h" #include "ui/widgets/shadow.h" #include "ui/widgets/scroll_area.h" -#include "ui/ui_utility.h" #include "ui/cached_round_corners.h" #include "mainwindow.h" #include "main/main_session.h" #include "styles/style_overview.h" -#include "styles/style_widgets.h" #include "styles/style_media_player.h" #include "styles/style_info.h" diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index 341812298..f793d9e70 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -11,7 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_attached_stickers.h" #include "api/api_peer_photo.h" #include "lang/lang_keys.h" -#include "mainwindow.h" #include "boxes/premium_preview_box.h" #include "core/application.h" #include "core/click_handler_types.h" @@ -24,7 +23,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/dropdown_menu.h" #include "ui/widgets/popup_menu.h" #include "ui/widgets/buttons.h" -#include "ui/image/image.h" #include "ui/layers/layer_manager.h" #include "ui/text/text_utilities.h" #include "ui/platform/ui_platform_window_title.h" @@ -33,9 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/item_text_options.h" #include "ui/painter.h" #include "ui/power_saving.h" -#include "ui/ui_utility.h" #include "ui/cached_round_corners.h" -#include "ui/gl/gl_surface.h" #include "ui/gl/gl_window.h" #include "ui/boxes/confirm_box.h" #include "info/info_memento.h" @@ -44,29 +40,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/delete_messages_box.h" #include "boxes/report_messages_box.h" #include "media/audio/media_audio.h" -#include "media/view/media_view_playback_controls.h" #include "media/view/media_view_group_thumbs.h" #include "media/view/media_view_pip.h" #include "media/view/media_view_overlay_raster.h" #include "media/view/media_view_overlay_opengl.h" #include "media/stories/media_stories_view.h" -#include "media/streaming/media_streaming_instance.h" #include "media/streaming/media_streaming_player.h" #include "media/player/media_player_instance.h" #include "history/history.h" -#include "history/history_item.h" #include "history/history_item_helpers.h" #include "history/view/media/history_view_media.h" -#include "history/view/reactions/history_view_reactions_strip.h" #include "history/view/reactions/history_view_reactions_selector.h" -#include "data/data_media_types.h" #include "data/data_session.h" -#include "data/data_stories.h" #include "data/data_changes.h" #include "data/data_channel.h" #include "data/data_chat.h" #include "data/data_user.h" -#include "data/data_file_origin.h" #include "data/data_media_rotation.h" #include "data/data_photo_media.h" #include "data/data_document_media.h" @@ -75,14 +64,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_download_manager.h" #include "window/themes/window_theme_preview.h" #include "window/window_peer_menu.h" -#include "window/window_session_controller.h" #include "window/window_controller.h" #include "base/platform/base_platform_info.h" #include "base/power_save_blocker.h" #include "base/random.h" #include "base/unixtime.h" #include "base/qt_signal_producer.h" -#include "base/qt/qt_common_adapters.h" #include "base/event_filter.h" #include "main/main_account.h" #include "main/main_domain.h" // Domain::activeSessionValue. diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 92c948549..055722742 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -8,13 +8,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/mac/main_window_mac.h" #include "data/data_session.h" -#include "styles/style_window.h" -#include "mainwindow.h" #include "mainwidget.h" #include "core/application.h" #include "core/sandbox.h" #include "main/main_session.h" -#include "history/history.h" #include "history/history_widget.h" #include "history/history_inner_widget.h" #include "main/main_account.h" @@ -22,7 +19,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "media/player/media_player_instance.h" #include "media/audio/media_audio.h" #include "storage/localstorage.h" -#include "window/notifications_manager_default.h" #include "window/window_session_controller.h" #include "window/window_controller.h" #include "platform/mac/touchbar/mac_touchbar_manager.h" @@ -33,13 +29,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/about_box.h" #include "lang/lang_keys.h" #include "base/platform/mac/base_utilities_mac.h" -#include "ui/widgets/fields/input_field.h" -#include "ui/ui_utility.h" -#include #include #include -#include #if QT_VERSION < QT_VERSION_CHECK(6, 6, 0) #include diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp index 3f03a6264..9d979bdbd 100644 --- a/Telegram/SourceFiles/settings/settings_premium.cpp +++ b/Telegram/SourceFiles/settings/settings_premium.cpp @@ -58,7 +58,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_premium.h" #include "styles/style_premium.h" #include "styles/style_info.h" -#include "styles/style_intro.h" #include "styles/style_layers.h" #include "styles/style_settings.h" diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp index d726deb20..41a688add 100644 --- a/Telegram/SourceFiles/window/main_window.cpp +++ b/Telegram/SourceFiles/window/main_window.cpp @@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/platform_specific.h" #include "ui/platform/ui_platform_window.h" #include "platform/platform_window_title.h" -#include "base/platform/base_platform_info.h" #include "history/history.h" #include "window/window_session_controller.h" #include "window/window_lock_widgets.h" @@ -35,19 +34,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/shadow.h" #include "ui/controls/window_outdated_bar.h" #include "ui/painter.h" -#include "ui/ui_utility.h" #include "apiwrap.h" -#include "mainwindow.h" #include "mainwidget.h" // session->content()->windowShown(). #include "tray.h" -#include "styles/style_widgets.h" #include "styles/style_window.h" #include "styles/style_dialogs.h" // ChildSkip().x() for new child windows. #include -#include #include -#include #include #include diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h index 774543271..e59967e80 100644 --- a/Telegram/SourceFiles/window/main_window.h +++ b/Telegram/SourceFiles/window/main_window.h @@ -11,7 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer.h" #include "base/object_ptr.h" #include "core/core_settings.h" -#include "base/required.h" namespace Main { class Session; diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp index 7d1e08506..642e44312 100644 --- a/Telegram/SourceFiles/window/window_controller.cpp +++ b/Telegram/SourceFiles/window/window_controller.cpp @@ -22,22 +22,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "intro/intro_widget.h" #include "mtproto/mtproto_config.h" -#include "ui/layers/box_content.h" -#include "ui/layers/layer_widget.h" #include "ui/toast/toast.h" #include "ui/emoji_config.h" #include "chat_helpers/emoji_sets_manager.h" #include "window/window_session_controller.h" -#include "window/themes/window_theme.h" #include "window/themes/window_theme_editor.h" #include "ui/boxes/confirm_box.h" #include "data/data_peer.h" -#include "mainwindow.h" #include "apiwrap.h" // ApiWrap::acceptTerms. #include "styles/style_layers.h" #include -#include namespace Window { namespace { diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h index 787cae3a0..36c35979e 100644 --- a/Telegram/SourceFiles/window/window_controller.h +++ b/Telegram/SourceFiles/window/window_controller.h @@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwindow.h" #include "window/window_adaptive.h" -#include "ui/layers/layer_widget.h" namespace Main { class Account; diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp index c63714db2..90ff70a2f 100644 --- a/Telegram/SourceFiles/window/window_session_controller.cpp +++ b/Telegram/SourceFiles/window/window_session_controller.cpp @@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/peers/edit_peer_info_box.h" #include "boxes/peers/replace_boost_box.h" #include "boxes/delete_messages_box.h" -#include "window/window_adaptive.h" #include "window/window_controller.h" #include "window/window_filters_menu.h" #include "info/info_memento.h" @@ -27,7 +26,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "media/player/media_player_instance.h" #include "media/view/media_view_open_common.h" #include "data/data_document_resolver.h" -#include "data/data_media_types.h" #include "data/data_session.h" #include "data/data_file_origin.h" #include "data/data_folder.h" @@ -43,23 +41,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_chat_filters.h" #include "data/data_replies_list.h" #include "data/data_peer_values.h" -#include "data/data_stories.h" #include "passport/passport_form_controller.h" #include "chat_helpers/tabbed_selector.h" #include "chat_helpers/emoji_interactions.h" #include "core/shortcuts.h" #include "core/application.h" -#include "core/core_settings.h" #include "core/click_handler_types.h" #include "base/unixtime.h" #include "ui/controls/userpic_button.h" -#include "ui/layers/generic_box.h" #include "ui/text/text_utilities.h" #include "ui/text/format_values.h" // Ui::FormatPhone. #include "ui/delayed_activation.h" #include "ui/boxes/boost_box.h" -#include "ui/chat/attach/attach_bot_webview.h" -#include "ui/chat/chat_style.h" #include "ui/chat/chat_theme.h" #include "ui/effects/message_sending_animation_controller.h" #include "ui/style/style_palette_colorizer.h" @@ -69,7 +62,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/boxes/calendar_box.h" #include "ui/boxes/confirm_box.h" #include "mainwidget.h" -#include "mainwindow.h" #include "main/main_account.h" #include "main/main_domain.h" #include "main/main_session.h" @@ -90,7 +82,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_window.h" #include "styles/style_dialogs.h" #include "styles/style_layers.h" // st::boxLabel -#include "styles/style_premium.h" namespace Window { namespace { @@ -2066,11 +2057,11 @@ void SessionController::clearPassportForm() { void SessionController::showChooseReportMessages( not_null peer, Ui::ReportReason reason, - Fn done) { + Fn done) const { content()->showChooseReportMessages(peer, reason, std::move(done)); } -void SessionController::clearChooseReportMessages() { +void SessionController::clearChooseReportMessages() const { content()->clearChooseReportMessages(); } @@ -2103,7 +2094,7 @@ void SessionController::showInNewWindow( void SessionController::toggleChooseChatTheme( not_null peer, - std::optional show) { + std::optional show) const { content()->toggleChooseChatTheme(peer, show); } @@ -2119,7 +2110,7 @@ void SessionController::finishChatThemeEdit(not_null peer) { } } -void SessionController::updateColumnLayout() { +void SessionController::updateColumnLayout() const { content()->updateColumnLayout(); } @@ -2737,7 +2728,7 @@ QString SessionController::premiumRef() const { return _premiumRef; } -bool SessionController::contentOverlapped(QWidget *w, QPaintEvent *e) { +bool SessionController::contentOverlapped(QWidget *w, QPaintEvent *e) const { return widget()->contentOverlapped(w, e); } diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h index 2106cbc9f..cd07d4a7b 100644 --- a/Telegram/SourceFiles/window/window_session_controller.h +++ b/Telegram/SourceFiles/window/window_session_controller.h @@ -7,18 +7,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "base/flags.h" -#include "base/object_ptr.h" -#include "base/weak_ptr.h" #include "base/timer.h" #include "boxes/gift_premium_box.h" // GiftPremiumValidator. #include "chat_helpers/compose/compose_show.h" #include "data/data_chat_participant_status.h" #include "dialogs/dialogs_key.h" -#include "ui/layers/layer_widget.h" #include "settings/settings_type.h" #include "window/window_adaptive.h" -#include "mtproto/sender.h" class PhotoData; class MainWidget; @@ -403,7 +398,7 @@ public: [[nodiscard]] ColumnLayout computeColumnLayout() const; int dialogsSmallColumnWidth() const; bool forceWideDialogs() const; - void updateColumnLayout(); + void updateColumnLayout() const; bool canShowThirdSection() const; bool canShowThirdSectionWithoutResize() const; bool takeThirdSectionFromLayer(); @@ -483,8 +478,8 @@ public: void showChooseReportMessages( not_null peer, Ui::ReportReason reason, - Fn done); - void clearChooseReportMessages(); + Fn done) const; + void clearChooseReportMessages() const; void showInNewWindow( not_null peer, @@ -492,7 +487,7 @@ public: void toggleChooseChatTheme( not_null peer, - std::optional show = std::nullopt); + std::optional show = std::nullopt) const; void finishChatThemeEdit(not_null peer); [[nodiscard]] bool dialogsListFocused() const { @@ -590,7 +585,7 @@ public: void setPremiumRef(const QString &ref); [[nodiscard]] QString premiumRef() const; - [[nodiscard]] bool contentOverlapped(QWidget *w, QPaintEvent *e); + [[nodiscard]] bool contentOverlapped(QWidget *w, QPaintEvent *e) const; [[nodiscard]] std::shared_ptr uiShow() override;