From 4b503ad7edd08a8118ab849992a2aa09f6a1e857 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Mon, 28 Aug 2023 21:24:09 +0300 Subject: [PATCH] Slightly refactored include directives in some source files. --- Telegram/SourceFiles/boxes/send_files_box.cpp | 21 +++++++------------ Telegram/SourceFiles/boxes/send_files_box.h | 1 - Telegram/SourceFiles/boxes/share_box.cpp | 3 +-- Telegram/SourceFiles/boxes/share_box.h | 2 +- .../history/history_inner_widget.cpp | 8 ------- .../SourceFiles/history/history_widget.cpp | 9 -------- .../media/view/media_view_overlay_widget.cpp | 2 -- .../window/window_session_controller.cpp | 5 ----- .../window/window_session_controller.h | 2 -- 9 files changed, 9 insertions(+), 44 deletions(-) diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp index c639460ba..dcab2b97c 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.cpp +++ b/Telegram/SourceFiles/boxes/send_files_box.cpp @@ -28,8 +28,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/call_delayed.h" #include "boxes/premium_limits_box.h" #include "boxes/premium_preview_box.h" -#include "ui/boxes/confirm_box.h" -#include "ui/effects/animations.h" #include "ui/effects/scroll_content_shadow.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" @@ -42,9 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/chat/attach/attach_album_preview.h" #include "ui/chat/attach/attach_single_file_preview.h" #include "ui/chat/attach/attach_single_media_preview.h" -#include "ui/text/format_values.h" #include "ui/grouped_layout.h" -#include "ui/text/text_options.h" #include "ui/toast/toast.h" #include "ui/controls/emoji_button.h" #include "ui/painter.h" @@ -54,16 +50,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_premium_limits.h" #include "data/stickers/data_stickers.h" #include "data/stickers/data_custom_emoji.h" -#include "media/clip/media_clip_reader.h" #include "api/api_common.h" #include "window/window_session_controller.h" #include "core/application.h" #include "core/core_settings.h" -#include "styles/style_chat.h" #include "styles/style_layers.h" #include "styles/style_boxes.h" #include "styles/style_chat_helpers.h" -#include "styles/style_info.h" #include "styles/style_menu_icons.h" #include @@ -74,10 +67,14 @@ constexpr auto kMaxMessageLength = 4096; using Ui::SendFilesWay; -inline bool CanAddUrls(const QList &urls) { +[[nodiscard]] inline bool CanAddUrls(const QList &urls) { return !urls.isEmpty() && ranges::all_of(urls, &QUrl::isLocalFile); } +[[nodiscard]] bool CanAddFiles(not_null data) { + return data->hasImage() || CanAddUrls(Core::ReadMimeUrls(data)); +} + void FileDialogCallback( FileDialog::OpenResult &&result, Fn checkResult, @@ -451,7 +448,7 @@ void SendFilesBox::setupDragArea() { }; const auto areas = DragArea::SetupDragAreaToContainer( this, - [=](not_null d) { return canAddFiles(d); }, + CanAddFiles, [=](bool f) { _caption->setAcceptDrops(f); }, [=] { updateControlsGeometry(); }, std::move(computeState)); @@ -1046,7 +1043,7 @@ void SendFilesBox::setupCaption() { not_null data, Ui::InputField::MimeAction action) { if (action == Ui::InputField::MimeAction::Check) { - return canAddFiles(data); + return CanAddFiles(data); } else if (action == Ui::InputField::MimeAction::Insert) { return addFiles(data); } @@ -1142,10 +1139,6 @@ void SendFilesBox::captionResized() { update(); } -bool SendFilesBox::canAddFiles(not_null data) const { - return data->hasImage() || CanAddUrls(Core::ReadMimeUrls(data)); -} - bool SendFilesBox::addFiles(not_null data) { const auto premium = _show->session().premium(); auto list = [&] { diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h index 6e6c6fa82..2325e911a 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.h +++ b/Telegram/SourceFiles/boxes/send_files_box.h @@ -213,7 +213,6 @@ private: void updateControlsGeometry(); void updateCaptionPlaceholder(); - bool canAddFiles(not_null data) const; bool addFiles(not_null data); bool addFiles(Ui::PreparedList list); void addFile(Ui::PreparedFile &&file); diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp index 7cba7daba..154961016 100644 --- a/Telegram/SourceFiles/boxes/share_box.cpp +++ b/Telegram/SourceFiles/boxes/share_box.cpp @@ -18,7 +18,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/toast/toast.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/multi_select.h" -#include "ui/widgets/buttons.h" #include "ui/widgets/scroll_area.h" #include "ui/widgets/input_fields.h" #include "ui/widgets/popup_menu.h" @@ -602,7 +601,7 @@ void ShareBox::submitWhenOnline() { submit(Api::DefaultSendWhenOnlineOptions()); } -void ShareBox::copyLink() { +void ShareBox::copyLink() const { if (const auto onstack = _descriptor.copyCallback) { onstack(); } diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h index b13638577..e793abb6e 100644 --- a/Telegram/SourceFiles/boxes/share_box.h +++ b/Telegram/SourceFiles/boxes/share_box.h @@ -119,7 +119,7 @@ private: void submitSilent(); void submitScheduled(); void submitWhenOnline(); - void copyLink(); + void copyLink() const; bool searchByUsername(bool useCache = false); SendMenu::Type sendMenuType() const; diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index 35026b095..0071fd772 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history_inner_widget.h" #include "core/file_utilities.h" -#include "core/crash_reports.h" #include "core/click_handler_types.h" #include "history/history.h" #include "history/admin_log/history_admin_log_item.h" @@ -32,7 +31,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/menu/menu_add_action_callback_factory.h" #include "ui/widgets/menu/menu_multiline_action.h" #include "ui/widgets/popup_menu.h" -#include "ui/image/image.h" #include "ui/effects/path_shift_gradient.h" #include "ui/effects/message_sending_animation_controller.h" #include "ui/effects/reaction_fly_animation.h" @@ -40,16 +38,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/boxes/report_box.h" #include "ui/layers/generic_box.h" #include "ui/controls/delete_message_context_action.h" -#include "ui/controls/who_reacted_context_action.h" #include "ui/painter.h" #include "ui/ui_utility.h" -#include "ui/cached_round_corners.h" #include "ui/inactive_press.h" -#include "window/window_adaptive.h" #include "window/window_session_controller.h" #include "window/window_controller.h" #include "window/window_peer_menu.h" -#include "window/window_controller.h" #include "window/notifications_manager.h" #include "boxes/about_sponsored_box.h" #include "boxes/delete_messages_box.h" @@ -94,12 +88,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_file_origin.h" #include "data/data_histories.h" #include "data/data_changes.h" -#include "data/stickers/data_stickers.h" #include "data/data_sponsored_messages.h" #include "dialogs/ui/dialogs_video_userpic.h" #include "settings/settings_premium.h" #include "styles/style_chat.h" -#include "styles/style_window.h" // st::windowMinWidth #include "styles/style_menu_icons.h" #include diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index e4dad4d47..bd7e554e9 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "api/api_chat_participants.h" #include "api/api_report.h" #include "api/api_sending.h" -#include "api/api_text_entities.h" #include "api/api_send_progress.h" #include "api/api_unread_things.h" #include "ui/boxes/confirm_box.h" @@ -32,12 +31,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/inner_dropdown.h" #include "ui/widgets/dropdown_menu.h" #include "ui/widgets/labels.h" -#include "ui/widgets/shadow.h" #include "ui/effects/ripple_animation.h" #include "ui/effects/message_sending_animation_controller.h" #include "ui/text/text_utilities.h" // Ui::Text::ToUpper #include "ui/text/format_values.h" -#include "ui/chat/forward_options_box.h" #include "ui/chat/message_bar.h" #include "ui/chat/attach/attach_send_files_way.h" #include "ui/chat/choose_send_as.h" @@ -62,7 +59,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_document.h" #include "data/data_photo.h" #include "data/data_photo_media.h" -#include "data/data_media_types.h" #include "data/data_channel.h" #include "data/data_chat.h" #include "data/data_forum.h" @@ -107,7 +103,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/view/history_view_translate_bar.h" #include "history/view/media/history_view_media.h" #include "profile/profile_block_group_members.h" -#include "info/info_memento.h" #include "core/click_handler_types.h" #include "chat_helpers/tabbed_panel.h" #include "chat_helpers/tabbed_selector.h" @@ -138,7 +133,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/chat/continuous_scroll.h" #include "ui/widgets/popup_menu.h" #include "ui/item_text_options.h" -#include "ui/unread_badge.h" #include "main/main_session.h" #include "main/main_session_settings.h" #include "main/session/send_as_peers.h" @@ -152,7 +146,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "inline_bots/bot_attach_web_view.h" #include "info/profile/info_profile_values.h" // SharedMediaCountValue. #include "chat_helpers/emoji_suggestions_widget.h" -#include "core/crash_reports.h" #include "core/shortcuts.h" #include "core/ui_integration.h" #include "support/support_common.h" @@ -160,12 +153,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "support/support_preload.h" #include "dialogs/dialogs_key.h" #include "calls/calls_instance.h" -#include "api/api_bot.h" #include "styles/style_chat.h" #include "styles/style_dialogs.h" #include "styles/style_window.h" #include "styles/style_boxes.h" -#include "styles/style_profile.h" #include "styles/style_chat_helpers.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 957679aba..59ed41e35 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -88,7 +88,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "main/main_session_settings.h" #include "layout/layout_document_generic_preview.h" #include "platform/platform_overlay_widget.h" -#include "settings/settings_premium.h" #include "storage/file_download.h" #include "storage/storage_account.h" #include "calls/calls_instance.h" @@ -104,7 +103,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include #include -#include #include #include diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp index 486087771..4ec3e2dfb 100644 --- a/Telegram/SourceFiles/window/window_session_controller.cpp +++ b/Telegram/SourceFiles/window/window_session_controller.cpp @@ -10,11 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/add_contact_box.h" #include "boxes/peers/add_bot_to_chat_box.h" #include "boxes/peers/edit_peer_info_box.h" -#include "boxes/peer_list_controllers.h" #include "boxes/delete_messages_box.h" #include "window/window_adaptive.h" #include "window/window_controller.h" -#include "window/main_window.h" #include "window/window_filters_menu.h" #include "info/info_memento.h" #include "info/info_controller.h" @@ -37,7 +35,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_user.h" #include "data/data_document.h" #include "data/data_document_media.h" -#include "data/data_document_resolver.h" #include "data/data_changes.h" #include "data/data_group_call.h" #include "data/data_forum.h" @@ -54,13 +51,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/core_settings.h" #include "core/click_handler_types.h" #include "base/unixtime.h" -#include "base/random.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/chat/attach/attach_bot_webview.h" -#include "ui/chat/message_bubble.h" #include "ui/chat/chat_style.h" #include "ui/chat/chat_theme.h" #include "ui/effects/message_sending_animation_controller.h" diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h index 9536894ee..7f541cf5e 100644 --- a/Telegram/SourceFiles/window/window_session_controller.h +++ b/Telegram/SourceFiles/window/window_session_controller.h @@ -16,7 +16,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_chat_participant_status.h" #include "dialogs/dialogs_key.h" #include "ui/layers/layer_widget.h" -#include "ui/layers/show.h" #include "settings/settings_type.h" #include "window/window_adaptive.h" #include "mtproto/sender.h" @@ -89,7 +88,6 @@ namespace Window { using GifPauseReason = ChatHelpers::PauseReason; using GifPauseReasons = ChatHelpers::PauseReasons; -class MainWindow; class SectionMemento; class Controller; class FiltersMenu;