From 6343221d7b8052b75b939103b4e15d7f96b3fb76 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 4 Sep 2019 10:19:15 +0300 Subject: [PATCH] Remove many includes from stdafx.pch. --- Telegram/SourceFiles/app.cpp | 3 + Telegram/SourceFiles/boxes/about_box.cpp | 6 +- .../SourceFiles/boxes/add_contact_box.cpp | 3 + .../boxes/background_preview_box.cpp | 7 ++- Telegram/SourceFiles/boxes/confirm_box.cpp | 3 + Telegram/SourceFiles/boxes/connection_box.cpp | 7 ++- .../SourceFiles/boxes/edit_caption_box.cpp | 2 + Telegram/SourceFiles/boxes/language_box.cpp | 5 +- .../boxes/peers/edit_peer_type_box.cpp | 5 +- Telegram/SourceFiles/boxes/send_files_box.cpp | 2 + .../SourceFiles/boxes/sticker_set_box.cpp | 5 +- Telegram/SourceFiles/boxes/username_box.cpp | 5 +- Telegram/SourceFiles/calls/calls_panel.cpp | 3 + .../chat_helpers/emoji_keywords.cpp | 2 + .../chat_helpers/emoji_suggestions_widget.cpp | 3 + .../chat_helpers/emoji_suggestions_widget.h | 2 + .../chat_helpers/field_autocomplete.cpp | 2 + .../chat_helpers/gifs_list_widget.cpp | 2 + .../chat_helpers/message_field.cpp | 8 ++- .../SourceFiles/chat_helpers/message_field.h | 2 + .../chat_helpers/stickers_emoji_pack.cpp | 2 + .../chat_helpers/stickers_list_widget.cpp | 2 + Telegram/SourceFiles/config.h | 12 ---- Telegram/SourceFiles/core/application.cpp | 5 ++ .../SourceFiles/core/click_handler_types.cpp | 3 + .../SourceFiles/core/crash_report_window.cpp | 5 ++ .../SourceFiles/core/crash_report_window.h | 9 +++ Telegram/SourceFiles/core/file_utilities.cpp | 15 +++-- Telegram/SourceFiles/core/mime_type.cpp | 2 + Telegram/SourceFiles/core/sandbox.cpp | 2 + Telegram/SourceFiles/core/sandbox.h | 9 ++- Telegram/SourceFiles/core/shortcuts.cpp | 5 ++ Telegram/SourceFiles/core/update_checker.cpp | 3 + Telegram/SourceFiles/core/utils.cpp | 2 + .../SourceFiles/data/data_auto_download.cpp | 2 + .../data/data_document_good_thumbnail.cpp | 3 + .../SourceFiles/dialogs/dialogs_widget.cpp | 2 + .../admin_log/history_admin_log_inner.cpp | 7 ++- .../history/history_inner_widget.cpp | 10 ++- .../history/history_item_components.cpp | 2 + .../history/history_location_manager.cpp | 2 + .../SourceFiles/history/history_message.cpp | 5 +- .../SourceFiles/history/history_widget.cpp | 3 + .../view/history_view_context_menu.cpp | 9 ++- .../history/view/history_view_list_widget.cpp | 3 + .../SourceFiles/info/info_content_widget.cpp | 4 +- .../info/media/info_media_list_widget.cpp | 5 +- .../info/profile/info_profile_actions.cpp | 5 +- .../inline_bots/inline_results_widget.cpp | 2 + Telegram/SourceFiles/lang/lang_translator.h | 2 + Telegram/SourceFiles/mainwidget.cpp | 3 + Telegram/SourceFiles/mainwindow.cpp | 3 + .../media/clip/media_clip_check_streaming.cpp | 2 + .../media/clip/media_clip_implementation.h | 2 + .../media/clip/media_clip_reader.cpp | 4 ++ .../media/player/media_player_float.cpp | 2 + .../media_streaming_loader_local.cpp | 2 + .../media/view/media_view_overlay_widget.cpp | 14 ++++- .../SourceFiles/mtproto/connection_http.h | 3 + .../mtproto/special_config_request.cpp | 4 ++ .../mtproto/special_config_request.h | 3 + .../passport/passport_encryption.cpp | 4 ++ .../passport/passport_form_controller.cpp | 4 ++ .../passport/passport_panel_edit_scans.cpp | 2 + .../platform/linux/specific_linux.cpp | 2 + .../platform/mac/main_window_mac.mm | 7 ++- .../SourceFiles/platform/mac/specific_mac.mm | 2 + .../platform/mac/specific_mac_p.mm | 5 +- .../platform/win/file_utilities_win.cpp | 4 ++ .../platform/win/main_window_win.cpp | 4 ++ .../SourceFiles/platform/win/specific_win.cpp | 7 ++- .../platform/win/window_title_win.cpp | 2 + .../platform/win/windows_event_filter.cpp | 2 + .../platform/win/windows_event_filter.h | 2 + .../settings/settings_information.cpp | 5 +- .../SourceFiles/settings/settings_main.cpp | 2 + .../settings/settings_privacy_security.cpp | 2 + Telegram/SourceFiles/stdafx.h | 61 ++++++++++++++++--- Telegram/SourceFiles/storage/file_download.h | 2 + .../SourceFiles/storage/localimageloader.cpp | 2 + Telegram/SourceFiles/storage/localstorage.cpp | 4 ++ .../storage/storage_media_prepare.cpp | 3 + .../SourceFiles/support/support_templates.cpp | 2 + .../SourceFiles/support/support_templates.h | 2 + .../SourceFiles/ui/effects/round_checkbox.cpp | 4 +- Telegram/SourceFiles/ui/emoji_config.cpp | 3 + .../SourceFiles/ui/image/image_location.cpp | 2 + .../SourceFiles/ui/image/image_source.cpp | 2 + Telegram/SourceFiles/ui/rp_widget.cpp | 24 ++++++++ Telegram/SourceFiles/ui/rp_widget.h | 31 ++++------ Telegram/SourceFiles/ui/text/text_entity.cpp | 2 + Telegram/SourceFiles/ui/twidget.cpp | 8 ++- .../SourceFiles/ui/widgets/input_fields.cpp | 14 ++++- .../SourceFiles/ui/widgets/input_fields.h | 3 + Telegram/SourceFiles/ui/widgets/labels.cpp | 7 ++- Telegram/SourceFiles/ui/widgets/menu.h | 2 + .../SourceFiles/ui/widgets/popup_menu.cpp | 3 + .../SourceFiles/ui/widgets/scroll_area.cpp | 5 ++ Telegram/SourceFiles/ui/widgets/scroll_area.h | 2 + .../SourceFiles/ui/widgets/separate_panel.cpp | 3 + Telegram/SourceFiles/ui/widgets/tooltip.cpp | 3 + Telegram/SourceFiles/window/main_window.cpp | 7 +++ Telegram/SourceFiles/window/main_window.h | 2 + .../window/notifications_manager_default.cpp | 2 + .../window/themes/window_theme.cpp | 2 + .../window/themes/window_theme_editor_box.cpp | 2 + .../SourceFiles/window/window_controller.cpp | 3 + .../SourceFiles/window/window_main_menu.cpp | 3 + .../SourceFiles/window/window_peer_menu.cpp | 2 + 109 files changed, 447 insertions(+), 87 deletions(-) diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index eef367e92..fa3fa511b 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -47,6 +47,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_history.h" #include "styles/style_boxes.h" +#include +#include + #ifdef OS_MAC_OLD #include #endif // OS_MAC_OLD diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp index 0ccd792db..45f82a765 100644 --- a/Telegram/SourceFiles/boxes/about_box.cpp +++ b/Telegram/SourceFiles/boxes/about_box.cpp @@ -20,6 +20,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/update_checker.h" #include "styles/style_boxes.h" +#include +#include +#include + namespace { rpl::producer Text1() { @@ -100,7 +104,7 @@ void AboutBox::showVersionHistory() { } url = url.arg(qsl("talpha%1_%2").arg(cRealAlphaVersion()).arg(Core::countAlphaVersionSignature(cRealAlphaVersion()))); - QApplication::clipboard()->setText(url); + QGuiApplication::clipboard()->setText(url); Ui::show(Box("The link to the current private alpha version of Telegram Desktop was copied to the clipboard.")); } else { diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp index bbae845eb..af6b465e7 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.cpp +++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp @@ -41,6 +41,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "observer_peer.h" #include "main/main_session.h" +#include +#include + namespace { constexpr auto kMaxGroupChannelTitle = 255; // See also edit_peer_info_box. diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp index 6051b6474..285936e1b 100644 --- a/Telegram/SourceFiles/boxes/background_preview_box.cpp +++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp @@ -27,6 +27,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_history.h" #include "styles/style_boxes.h" +#include +#include + namespace { constexpr auto kMaxWallPaperSlugLength = 255; @@ -221,7 +224,7 @@ void ServiceCheck::Generator::invalidate() { ServiceCheck::Generator &ServiceCheck::Frames() { static const auto Instance = Ui::CreateChild( - QApplication::instance()); + QCoreApplication::instance()); return *Instance; } @@ -498,7 +501,7 @@ void BackgroundPreviewBox::apply() { } void BackgroundPreviewBox::share() { - QApplication::clipboard()->setText(_paper.shareUrl()); + QGuiApplication::clipboard()->setText(_paper.shareUrl()); Ui::Toast::Show(tr::lng_background_link_copied(tr::now)); } diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp index 4f8699f37..81fdf7204 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.cpp +++ b/Telegram/SourceFiles/boxes/confirm_box.cpp @@ -35,6 +35,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "main/main_session.h" #include "observer_peer.h" +#include +#include + TextParseOptions _confirmBoxTextOptions = { TextParseLinks | TextParseMultiline | TextParseMarkdown | TextParseRichText, // flags 0, // maxw diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp index 5622cf2d7..82593b1cd 100644 --- a/Telegram/SourceFiles/boxes/connection_box.cpp +++ b/Telegram/SourceFiles/boxes/connection_box.cpp @@ -28,6 +28,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_chat_helpers.h" #include "styles/style_info.h" +#include +#include + namespace { constexpr auto kSaveSettingsDelayedTimeout = crl::time(1000); @@ -1426,7 +1429,7 @@ void ProxiesBoxController::share(const ProxyData &proxy) { ? "&pass=" + qthelp::url_encode(proxy.password) : "") + ((proxy.type == Type::Mtproto && !proxy.password.isEmpty()) ? "&secret=" + proxy.password : ""); - QApplication::clipboard()->setText(link); + QGuiApplication::clipboard()->setText(link); Ui::Toast::Show(tr::lng_username_copied(tr::now)); } @@ -1434,7 +1437,7 @@ ProxiesBoxController::~ProxiesBoxController() { if (_saveTimer.isActive()) { App::CallDelayed( kSaveSettingsDelayedTimeout, - QApplication::instance(), + QCoreApplication::instance(), [] { Local::writeSettings(); }); } } diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index 6eda94b49..240e332cc 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -38,6 +38,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/checkbox.h" #include "confirm_box.h" +#include + EditCaptionBox::EditCaptionBox( QWidget*, not_null controller, diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp index 46e73d169..c85399cbf 100644 --- a/Telegram/SourceFiles/boxes/language_box.cpp +++ b/Telegram/SourceFiles/boxes/language_box.cpp @@ -32,6 +32,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_passport.h" #include "styles/style_chat_helpers.h" +#include +#include + namespace { using Language = Lang::Language; @@ -408,7 +411,7 @@ bool Rows::hasMenu(not_null row) const { void Rows::share(not_null row) const { const auto link = qsl("https://t.me/setlanguage/") + row->data.id; - QApplication::clipboard()->setText(link); + QGuiApplication::clipboard()->setText(link); Ui::Toast::Show(tr::lng_username_copied(tr::now)); } diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp index 8948e3313..a0b6b8eef 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp @@ -39,6 +39,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_session_controller.h" #include +#include +#include + namespace { constexpr auto kUsernameCheckTimeout = crl::time(200); @@ -607,7 +610,7 @@ object_ptr Controller::createInviteLinkEdit() { _controls.inviteLink->setContextCopyText(QString()); _controls.inviteLink->setBreakEverywhere(true); _controls.inviteLink->setClickHandlerFilter([=](auto&&...) { - QApplication::clipboard()->setText(inviteLinkText()); + QGuiApplication::clipboard()->setText(inviteLinkText()); Ui::Toast::Show(tr::lng_group_invite_copied(tr::now)); return false; }); diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp index 3b410b8e5..1e240f110 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.cpp +++ b/Telegram/SourceFiles/boxes/send_files_box.cpp @@ -38,6 +38,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_boxes.h" #include "styles/style_chat_helpers.h" +#include + namespace { constexpr auto kMinPreviewWidth = 20; diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp index cea970463..3517771d3 100644 --- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp +++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp @@ -32,6 +32,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_boxes.h" #include "styles/style_chat_helpers.h" +#include +#include + namespace { constexpr auto kStickersPanelPerRow = 5; @@ -177,7 +180,7 @@ void StickerSetBox::addStickers() { void StickerSetBox::shareStickers() { auto url = Core::App().createInternalLinkFull(qsl("addstickers/") + _inner->shortName()); - QApplication::clipboard()->setText(url); + QGuiApplication::clipboard()->setText(url); Ui::show(Box(tr::lng_stickers_copied(tr::now))); } diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp index bce680e13..3f17bb19c 100644 --- a/Telegram/SourceFiles/boxes/username_box.cpp +++ b/Telegram/SourceFiles/boxes/username_box.cpp @@ -19,6 +19,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_user.h" #include "styles/style_boxes.h" +#include +#include + namespace { constexpr auto kMinUsernameLength = 5; @@ -167,7 +170,7 @@ void UsernameBox::changed() { } void UsernameBox::linkClick() { - QApplication::clipboard()->setText(Core::App().createInternalLinkFull(getName())); + QGuiApplication::clipboard()->setText(Core::App().createInternalLinkFull(getName())); Ui::Toast::Show(tr::lng_username_copied(tr::now)); } diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp index bc31cc8c1..220542579 100644 --- a/Telegram/SourceFiles/calls/calls_panel.cpp +++ b/Telegram/SourceFiles/calls/calls_panel.cpp @@ -31,6 +31,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/main_window.h" #include "layout.h" +#include +#include + namespace Calls { namespace { diff --git a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp index ceae00309..7773fd310 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp @@ -17,6 +17,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "main/main_session.h" #include "apiwrap.h" +#include + namespace ChatHelpers { namespace { diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp index 3ff94713d..1cfa6ba0b 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp @@ -20,6 +20,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "main/main_session.h" #include "styles/style_chat_helpers.h" +#include +#include + namespace Ui { namespace Emoji { namespace { diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h index 4636eb512..f19873c8e 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h +++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h @@ -12,6 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/unique_qptr.h" #include "base/timer.h" +#include + namespace Main { class Session; } // namespace Main diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp index 9cb8c1cc2..7d178ad24 100644 --- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp +++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp @@ -25,6 +25,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_widgets.h" #include "styles/style_chat_helpers.h" +#include + FieldAutocomplete::FieldAutocomplete( QWidget *parent, not_null session) diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp index a6f12668d..f3bfde0c5 100644 --- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp @@ -25,6 +25,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_session_controller.h" #include "history/view/history_view_cursor_state.h" +#include + namespace ChatHelpers { namespace { diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp index e9bbe6954..f5b149123 100644 --- a/Telegram/SourceFiles/chat_helpers/message_field.cpp +++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp @@ -26,6 +26,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_boxes.h" #include "styles/style_history.h" +#include +#include +#include +#include +#include + namespace { using EditLinkAction = Ui::InputField::EditLinkAction; @@ -327,7 +333,7 @@ void SetClipboardText( const TextForMimeData &text, QClipboard::Mode mode) { if (auto data = MimeDataFromText(text)) { - QApplication::clipboard()->setMimeData(data.release(), mode); + QGuiApplication::clipboard()->setMimeData(data.release(), mode); } } diff --git a/Telegram/SourceFiles/chat_helpers/message_field.h b/Telegram/SourceFiles/chat_helpers/message_field.h index 75a1a8b20..7736a673c 100644 --- a/Telegram/SourceFiles/chat_helpers/message_field.h +++ b/Telegram/SourceFiles/chat_helpers/message_field.h @@ -10,6 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/input_fields.h" #include "base/timer.h" +#include + namespace Main { class Session; } // namespace Main diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp index 69f917f43..d1e6d61a0 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp @@ -19,6 +19,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "apiwrap.h" #include "styles/style_history.h" +#include + namespace Stickers { namespace details { diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index 096c5a970..e4368c76d 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -34,6 +34,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_chat_helpers.h" #include "styles/style_window.h" +#include + namespace ChatHelpers { namespace { diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index b1ced0c13..52d2662e3 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -70,18 +70,6 @@ enum { ChoosePeerByDragTimeout = 1000, // 1 second mouse not moved to choose dialog when dragging a file }; -#ifdef Q_OS_WIN -inline const GUID &cGUID() { -#ifndef OS_MAC_STORE - static const GUID gGuid = { 0x87a94ab0, 0xe370, 0x4cde, { 0x98, 0xd3, 0xac, 0xc1, 0x10, 0xc5, 0x96, 0x7d } }; -#else // OS_MAC_STORE - static const GUID gGuid = { 0xe51fb841, 0x8c0b, 0x4ef9, { 0x9e, 0x9e, 0x5a, 0x0, 0x78, 0x56, 0x76, 0x27 } }; -#endif // OS_MAC_STORE - - return gGuid; -} -#endif - inline const char *cGUIDStr() { #ifndef OS_MAC_STORE static const char *gGuidStr = "{87A94AB0-E370-4cde-98D3-ACC110C5967D}"; diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp index 4ebb149a0..25cd1eb05 100644 --- a/Telegram/SourceFiles/core/application.cpp +++ b/Telegram/SourceFiles/core/application.cpp @@ -62,6 +62,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/confirm_box.h" #include "boxes/share_box.h" +#include +#include +#include +#include + namespace Core { namespace { diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp index 516474cb0..88e70d72d 100644 --- a/Telegram/SourceFiles/core/click_handler_types.cpp +++ b/Telegram/SourceFiles/core/click_handler_types.cpp @@ -24,6 +24,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_user.h" #include "data/data_session.h" +#include +#include + namespace { bool UrlRequiresConfirmation(const QUrl &url) { diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp index 9d410f31b..79f26fbc6 100644 --- a/Telegram/SourceFiles/core/crash_report_window.cpp +++ b/Telegram/SourceFiles/core/crash_report_window.cpp @@ -15,6 +15,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/platform_specific.h" #include "base/zlib_help.h" +#include +#include +#include +#include + namespace { constexpr auto kDefaultProxyPort = 80; diff --git a/Telegram/SourceFiles/core/crash_report_window.h b/Telegram/SourceFiles/core/crash_report_window.h index 80b584e2d..59b4ac72f 100644 --- a/Telegram/SourceFiles/core/crash_report_window.h +++ b/Telegram/SourceFiles/core/crash_report_window.h @@ -7,6 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include + namespace Core { class Launcher; } // namespace Core diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp index 14c87c0d5..dbd46ff07 100644 --- a/Telegram/SourceFiles/core/file_utilities.cpp +++ b/Telegram/SourceFiles/core/file_utilities.cpp @@ -13,6 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/unixtime.h" #include "mainwindow.h" +#include +#include +#include +#include + bool filedialogGetSaveFile( QPointer parent, QString &file, @@ -120,7 +125,7 @@ void OpenEmailLink(const QString &email) { } void OpenWith(const QString &filepath, QPoint menuPosition) { - InvokeQueued(QApplication::instance(), [=] { + InvokeQueued(QCoreApplication::instance(), [=] { if (!Platform::File::UnsafeShowOpenWithDropdown(filepath, menuPosition)) { Core::App().preventWindowActivation(); if (!Platform::File::UnsafeShowOpenWith(filepath)) { @@ -223,7 +228,7 @@ void GetOpenPath( const QString &filter, Fn callback, Fn failed) { - InvokeQueued(QApplication::instance(), [=] { + InvokeQueued(QCoreApplication::instance(), [=] { auto files = QStringList(); auto remoteContent = QByteArray(); Core::App().preventWindowActivation(); @@ -257,7 +262,7 @@ void GetOpenPaths( const QString &filter, Fn callback, Fn failed) { - InvokeQueued(QApplication::instance(), [=] { + InvokeQueued(QCoreApplication::instance(), [=] { auto files = QStringList(); auto remoteContent = QByteArray(); Core::App().preventWindowActivation(); @@ -288,7 +293,7 @@ void GetWritePath( const QString &initialPath, Fn callback, Fn failed) { - InvokeQueued(QApplication::instance(), [=] { + InvokeQueued(QCoreApplication::instance(), [=] { auto file = QString(); if (filedialogGetSaveFile(parent, file, caption, filter, initialPath)) { if (callback) { @@ -306,7 +311,7 @@ void GetFolder( const QString &initialPath, Fn callback, Fn failed) { - InvokeQueued(QApplication::instance(), [=] { + InvokeQueued(QCoreApplication::instance(), [=] { auto files = QStringList(); auto remoteContent = QByteArray(); Core::App().preventWindowActivation(); diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp index 83c078038..985416465 100644 --- a/Telegram/SourceFiles/core/mime_type.cpp +++ b/Telegram/SourceFiles/core/mime_type.cpp @@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "core/mime_type.h" +#include + namespace Core { MimeType::MimeType(const QMimeType &type) : _typeStruct(type) { diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp index 7c1fd159e..b02f8668a 100644 --- a/Telegram/SourceFiles/core/sandbox.cpp +++ b/Telegram/SourceFiles/core/sandbox.cpp @@ -25,6 +25,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/qthelp_regex.h" #include "ui/effects/animations.h" +#include + namespace Core { namespace { diff --git a/Telegram/SourceFiles/core/sandbox.h b/Telegram/SourceFiles/core/sandbox.h index 14194dd64..3b31f878e 100644 --- a/Telegram/SourceFiles/core/sandbox.h +++ b/Telegram/SourceFiles/core/sandbox.h @@ -7,6 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include +#include +#include +#include + namespace Core { class Launcher; @@ -52,9 +57,9 @@ public: ProxyData sandboxProxy() const; static Sandbox &Instance() { - Expects(QApplication::instance() != nullptr); + Expects(QCoreApplication::instance() != nullptr); - return *static_cast(QApplication::instance()); + return *static_cast(QCoreApplication::instance()); } ~Sandbox(); diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp index 911926f74..e732ccef8 100644 --- a/Telegram/SourceFiles/core/shortcuts.cpp +++ b/Telegram/SourceFiles/core/shortcuts.cpp @@ -15,6 +15,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/platform_info.h" #include "base/parse_helper.h" +#include +#include +#include +#include + namespace Shortcuts { namespace { diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp index ad1975710..aa55ec1fe 100644 --- a/Telegram/SourceFiles/core/update_checker.cpp +++ b/Telegram/SourceFiles/core/update_checker.cpp @@ -21,6 +21,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_session_controller.h" #include "settings/settings_intro.h" +#include +#include + extern "C" { #include #include diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp index f2f80afd3..e411864c5 100644 --- a/Telegram/SourceFiles/core/utils.cpp +++ b/Telegram/SourceFiles/core/utils.cpp @@ -30,6 +30,8 @@ extern "C" { #include #endif +#include + #ifdef small #undef small #endif // small diff --git a/Telegram/SourceFiles/data/data_auto_download.cpp b/Telegram/SourceFiles/data/data_auto_download.cpp index 21597d1c7..45d32a0b0 100644 --- a/Telegram/SourceFiles/data/data_auto_download.cpp +++ b/Telegram/SourceFiles/data/data_auto_download.cpp @@ -13,6 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/image/image_source.h" #include "ui/image/image.h" +#include + namespace Data { namespace AutoDownload { namespace { diff --git a/Telegram/SourceFiles/data/data_document_good_thumbnail.cpp b/Telegram/SourceFiles/data/data_document_good_thumbnail.cpp index 8818e6ab0..39349a567 100644 --- a/Telegram/SourceFiles/data/data_document_good_thumbnail.cpp +++ b/Telegram/SourceFiles/data/data_document_good_thumbnail.cpp @@ -14,6 +14,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lottie/lottie_animation.h" #include "main/main_session.h" +#include +#include + namespace Data { namespace { diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index 3a2c252f7..0fdf61c5a 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -43,6 +43,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_info.h" #include "styles/style_window.h" +#include + namespace Dialogs { namespace { diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp index 9e0820760..fac33ce49 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp @@ -43,6 +43,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_channel.h" #include "data/data_user.h" +#include +#include + namespace AdminLog { namespace { @@ -1093,7 +1096,7 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { _menu->addAction( actionText, [text = link->copyToClipboardText()] { - QApplication::clipboard()->setText(text); + QGuiApplication::clipboard()->setText(text); }); } } @@ -1134,7 +1137,7 @@ void InnerWidget::saveDocumentToFile(DocumentData *document) { void InnerWidget::copyContextImage(PhotoData *photo) { if (!photo || photo->isNull() || !photo->loaded()) return; - QApplication::clipboard()->setImage(photo->large()->original()); + QGuiApplication::clipboard()->setImage(photo->large()->original()); } void InnerWidget::copySelectedText() { diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index ad071bd95..fba413539 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -50,6 +50,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_photo.h" #include "data/data_user.h" +#include +#include +#include + namespace { constexpr auto kScrollDateHideTimeout = 1000; @@ -1715,7 +1719,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { } else if (const auto contact = media->sharedContact()) { const auto phone = contact->phoneNumber; _menu->addAction(tr::lng_profile_copy_phone(tr::now), [=] { - QApplication::clipboard()->setText(phone); + QGuiApplication::clipboard()->setText(phone); }); } } @@ -1734,7 +1738,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { _menu->addAction( actionText, [text = link->copyToClipboardText()] { - QApplication::clipboard()->setText(text); + QGuiApplication::clipboard()->setText(text); }); } else if (item && item->hasDirectLink() && isUponSelected != 2 && isUponSelected != -2) { _menu->addAction(item->history()->peer->isMegagroup() ? tr::lng_context_copy_link(tr::now) : tr::lng_context_copy_post_link(tr::now), [=] { @@ -1835,7 +1839,7 @@ void HistoryInner::savePhotoToFile(not_null photo) { void HistoryInner::copyContextImage(not_null photo) { if (photo->isNull() || !photo->loaded()) return; - QApplication::clipboard()->setImage(photo->large()->original()); + QGuiApplication::clipboard()->setImage(photo->large()->original()); } void HistoryInner::showStickerPackInfo(not_null document) { diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp index 48610e6ba..facdfa388 100644 --- a/Telegram/SourceFiles/history/history_item_components.cpp +++ b/Telegram/SourceFiles/history/history_item_components.cpp @@ -28,6 +28,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_history.h" #include "window/window_session_controller.h" +#include + void HistoryMessageVia::create(UserId userId) { bot = Auth().data().user(userId); maxWidth = st::msgServiceNameFont->width( diff --git a/Telegram/SourceFiles/history/history_location_manager.cpp b/Telegram/SourceFiles/history/history_location_manager.cpp index a46f8d8d6..292dabec1 100644 --- a/Telegram/SourceFiles/history/history_location_manager.cpp +++ b/Telegram/SourceFiles/history/history_location_manager.cpp @@ -13,6 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_file_origin.h" #include "platform/platform_specific.h" +#include + namespace { constexpr auto kCoordPrecision = 8; diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp index a0a6f0117..28dd1118f 100644 --- a/Telegram/SourceFiles/history/history_message.cpp +++ b/Telegram/SourceFiles/history/history_message.cpp @@ -41,6 +41,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_history.h" #include "styles/style_window.h" +#include +#include + namespace { constexpr auto kPinnedMessageTextLimit = 16; @@ -212,7 +215,7 @@ void FastShareMessage(not_null item) { + qsl("?game=") + game->shortName); - QApplication::clipboard()->setText(link); + QGuiApplication::clipboard()->setText(link); Ui::Toast::Show(tr::lng_share_game_link_copied(tr::now)); } diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 46e41182e..40c4d3101 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -98,6 +98,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_chat_helpers.h" #include "styles/style_info.h" +#include +#include + namespace { constexpr auto kMessagesPerPageFirst = 30; diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp index a3628861f..6703aeed8 100644 --- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp +++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp @@ -38,6 +38,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "main/main_session.h" #include "apiwrap.h" +#include +#include + namespace HistoryView { namespace { @@ -77,7 +80,7 @@ void CopyImage(not_null photo) { return; } - QApplication::clipboard()->setImage(photo->large()->original()); + QGuiApplication::clipboard()->setImage(photo->large()->original()); } void ShowStickerPackInfo(not_null document) { @@ -533,7 +536,7 @@ void AddCopyLinkAction( const auto text = link->copyToClipboardText(); menu->addAction( action, - [=] { QApplication::clipboard()->setText(text); }); + [=] { QGuiApplication::clipboard()->setText(text); }); } } // namespace @@ -624,7 +627,7 @@ void CopyPostLink(FullMsgId itemId) { if (!item || !item->hasDirectLink()) { return; } - QApplication::clipboard()->setText( + QGuiApplication::clipboard()->setText( item->history()->session().api().exportDirectMessageLink(item)); const auto channel = item->history()->peer->asChannel(); diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp index b344c4ccc..3207cfd34 100644 --- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp +++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp @@ -37,6 +37,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_peer.h" #include "styles/style_history.h" +#include +#include + namespace HistoryView { namespace { diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp index c61ee13c1..ba0fd759c 100644 --- a/Telegram/SourceFiles/info/info_content_widget.cpp +++ b/Telegram/SourceFiles/info/info_content_widget.cpp @@ -28,6 +28,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_info.h" #include "styles/style_profile.h" +#include + namespace Info { ContentWidget::ContentWidget( @@ -113,7 +115,7 @@ void ContentWidget::setGeometryWithTopMoved( } if (!willBeResized) { QResizeEvent fake(size(), size()); - QApplication::sendEvent(this, &fake); + QCoreApplication::sendEvent(this, &fake); } _topDelta = 0; } diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp index aae1a4d6f..3d3fd14b4 100644 --- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp +++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp @@ -33,6 +33,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/confirm_box.h" #include "core/file_utilities.h" +#include +#include + namespace Layout = Overview::Layout; namespace Info { @@ -1305,7 +1308,7 @@ void ListWidget::showContextMenu( _contextMenu->addAction( actionText, [text = link->copyToClipboardText()] { - QApplication::clipboard()->setText(text); + QGuiApplication::clipboard()->setText(text); }); } } diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index 04e6aea1d..be21181a3 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -47,6 +47,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_info.h" #include "styles/style_boxes.h" +#include +#include + namespace Info { namespace Profile { namespace { @@ -298,7 +301,7 @@ object_ptr DetailsFiller::setupInfo() { const auto link = Core::App().createInternalLinkFull( peer->userName()); if (!link.isEmpty()) { - QApplication::clipboard()->setText(link); + QGuiApplication::clipboard()->setText(link); Ui::Toast::Show(tr::lng_username_copied(tr::now)); } return false; diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp index c5a234933..09170d69a 100644 --- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp @@ -33,6 +33,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "observer_peer.h" #include "history/view/history_view_cursor_state.h" +#include + namespace InlineBots { namespace Layout { namespace internal { diff --git a/Telegram/SourceFiles/lang/lang_translator.h b/Telegram/SourceFiles/lang/lang_translator.h index eafb7642d..f502c63cb 100644 --- a/Telegram/SourceFiles/lang/lang_translator.h +++ b/Telegram/SourceFiles/lang/lang_translator.h @@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include + namespace Lang { class Translator : public QTranslator { diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index db94406ff..d98001c08 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -100,6 +100,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_history.h" #include "styles/style_boxes.h" +#include +#include + namespace { constexpr auto kChannelGetDifferenceLimit = 100; diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index e28477276..b4d8f68bf 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -45,6 +45,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_main_menu.h" #include "window/window_session_controller.h" +#include +#include + namespace { // Code for testing languages is F7-F6-F7-F8 diff --git a/Telegram/SourceFiles/media/clip/media_clip_check_streaming.cpp b/Telegram/SourceFiles/media/clip/media_clip_check_streaming.cpp index fac1a594c..38e659de5 100644 --- a/Telegram/SourceFiles/media/clip/media_clip_check_streaming.cpp +++ b/Telegram/SourceFiles/media/clip/media_clip_check_streaming.cpp @@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "media/clip/media_clip_check_streaming.h" +#include +#include namespace Media { namespace Clip { diff --git a/Telegram/SourceFiles/media/clip/media_clip_implementation.h b/Telegram/SourceFiles/media/clip/media_clip_implementation.h index 93995fb94..72d746cf7 100644 --- a/Telegram/SourceFiles/media/clip/media_clip_implementation.h +++ b/Telegram/SourceFiles/media/clip/media_clip_implementation.h @@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include + class FileLocation; namespace Media { diff --git a/Telegram/SourceFiles/media/clip/media_clip_reader.cpp b/Telegram/SourceFiles/media/clip/media_clip_reader.cpp index e7c8eb5cf..a88fa2ccc 100644 --- a/Telegram/SourceFiles/media/clip/media_clip_reader.cpp +++ b/Telegram/SourceFiles/media/clip/media_clip_reader.cpp @@ -14,6 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwidget.h" #include "mainwindow.h" +#include +#include +#include + extern "C" { #include #include diff --git a/Telegram/SourceFiles/media/player/media_player_float.cpp b/Telegram/SourceFiles/media/player/media_player_float.cpp index 6faef5efc..1b5575d2c 100644 --- a/Telegram/SourceFiles/media/player/media_player_float.cpp +++ b/Telegram/SourceFiles/media/player/media_player_float.cpp @@ -24,6 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_media_player.h" #include "styles/style_history.h" +#include + namespace Media { namespace Player { diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp index 951de9830..f5620c1c8 100644 --- a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp +++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp @@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/cache/storage_cache_types.h" +#include + namespace Media { namespace Streaming { namespace { diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index d94a1def1..af5a90cae 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -48,6 +48,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_mediaview.h" #include "styles/style_history.h" +#include +#include +#include +#include +#include +#include +#include + namespace Media { namespace View { namespace { @@ -1301,13 +1309,13 @@ void OverlayWidget::onCopy() { _dropdown->hideAnimated(Ui::DropdownMenu::HideOption::IgnoreShow); if (_doc) { if (videoShown()) { - QApplication::clipboard()->setImage( + QGuiApplication::clipboard()->setImage( transformVideoFrame(videoFrame())); } else if (!_current.isNull()) { - QApplication::clipboard()->setPixmap(_current); + QGuiApplication::clipboard()->setPixmap(_current); } } else if (_photo && _photo->loaded()) { - QApplication::clipboard()->setPixmap(_photo->large()->pix(fileOrigin())); + QGuiApplication::clipboard()->setPixmap(_photo->large()->pix(fileOrigin())); } } diff --git a/Telegram/SourceFiles/mtproto/connection_http.h b/Telegram/SourceFiles/mtproto/connection_http.h index 9f11a1e04..57fffb875 100644 --- a/Telegram/SourceFiles/mtproto/connection_http.h +++ b/Telegram/SourceFiles/mtproto/connection_http.h @@ -9,6 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mtproto/connection_abstract.h" +#include +#include + namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/special_config_request.cpp b/Telegram/SourceFiles/mtproto/special_config_request.cpp index 9dd09fb23..376ca9964 100644 --- a/Telegram/SourceFiles/mtproto/special_config_request.cpp +++ b/Telegram/SourceFiles/mtproto/special_config_request.cpp @@ -13,6 +13,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/unixtime.h" #include "base/openssl_help.h" +#include +#include +#include + extern "C" { #include } // extern "C" diff --git a/Telegram/SourceFiles/mtproto/special_config_request.h b/Telegram/SourceFiles/mtproto/special_config_request.h index a6d762534..5e0f071cf 100644 --- a/Telegram/SourceFiles/mtproto/special_config_request.h +++ b/Telegram/SourceFiles/mtproto/special_config_request.h @@ -9,6 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/bytes.h" +#include +#include + namespace MTP { struct ServiceWebRequest { diff --git a/Telegram/SourceFiles/passport/passport_encryption.cpp b/Telegram/SourceFiles/passport/passport_encryption.cpp index 5e743b4fe..c37e53872 100644 --- a/Telegram/SourceFiles/passport/passport_encryption.cpp +++ b/Telegram/SourceFiles/passport/passport_encryption.cpp @@ -10,6 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/openssl_help.h" #include "mtproto/rsa_public_key.h" +#include +#include +#include + namespace Passport { namespace { diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp index c24813c2b..d68f556ac 100644 --- a/Telegram/SourceFiles/passport/passport_form_controller.cpp +++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp @@ -29,6 +29,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/file_upload.h" #include "storage/file_download.h" +#include +#include +#include + namespace Passport { namespace { diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp index 8e86b03aa..6cdddd157 100644 --- a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp +++ b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp @@ -25,6 +25,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_boxes.h" #include "styles/style_passport.h" +#include + namespace Passport { namespace { diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 92252de0c..35a9d2710 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -18,6 +18,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/crash_reports.h" #include "core/update_checker.h" +#include + #include #include #include diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 6880f4133..857ef659a 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -32,6 +32,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/mac/mac_utilities.h" #include "ui/widgets/input_fields.h" +#include +#include + #include #include #include @@ -77,7 +80,7 @@ public: LayerCreationChecker(NSView * __weak view, Fn callback) : _weakView(view) , _callback(std::move(callback)) { - QApplication::instance()->installEventFilter(this); + QCoreApplication::instance()->installEventFilter(this); } protected: @@ -384,7 +387,7 @@ bool MainWindow::Private::clipboardHasText() { auto currentChangeCount = static_cast([_generalPasteboard changeCount]); if (_generalPasteboardChangeCount != currentChangeCount) { _generalPasteboardChangeCount = currentChangeCount; - _generalPasteboardHasText = !QApplication::clipboard()->text().isEmpty(); + _generalPasteboardHasText = !QGuiApplication::clipboard()->text().isEmpty(); } return _generalPasteboardHasText; } diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm index 0c883144d..3ab4350c8 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm @@ -17,6 +17,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history_location_manager.h" #include "platform/mac/mac_utilities.h" +#include + #include #include #include diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm index bfdf48ea6..9c13c498b 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm @@ -22,6 +22,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer.h" #include "styles/style_window.h" +#include +#include + #include #include #include @@ -207,7 +210,7 @@ void SetWatchingMediaKeys(bool watching) { bool IsApplicationActive() { return ApplicationIsActive ? *ApplicationIsActive - : (static_cast(QApplication::instance())->activeWindow() != nullptr); + : (static_cast(QCoreApplication::instance())->activeWindow() != nullptr); } void SetApplicationIcon(const QIcon &icon) { diff --git a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp index add7ff93b..e40b88ec4 100644 --- a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp +++ b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp @@ -14,6 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "core/crash_reports.h" +#include +#include +#include + #include #include diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp index 505762777..1941d4e68 100644 --- a/Telegram/SourceFiles/platform/win/main_window_win.cpp +++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp @@ -20,6 +20,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/themes/window_theme.h" #include "history/history.h" +#include +#include +#include +#include #include #include diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp index 8af6bf1b9..68f7bcb85 100644 --- a/Telegram/SourceFiles/platform/win/specific_win.cpp +++ b/Telegram/SourceFiles/platform/win/specific_win.cpp @@ -18,6 +18,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/localstorage.h" #include "core/crash_reports.h" +#include +#include +#include +#include + #include #include @@ -48,8 +53,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include -#include - #ifndef DCX_USESTYLE #define DCX_USESTYLE 0x00010000 #endif diff --git a/Telegram/SourceFiles/platform/win/window_title_win.cpp b/Telegram/SourceFiles/platform/win/window_title_win.cpp index 7a1ffa621..194eda739 100644 --- a/Telegram/SourceFiles/platform/win/window_title_win.cpp +++ b/Telegram/SourceFiles/platform/win/window_title_win.cpp @@ -11,6 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/shadow.h" #include "styles/style_window.h" +#include + namespace Platform { TitleWidget::TitleWidget(QWidget *parent) : Window::TitleWidget(parent) diff --git a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp index 2c3a55049..230a5652e 100644 --- a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp +++ b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp @@ -11,6 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwindow.h" #include "main/main_session.h" +#include + namespace Platform { namespace { diff --git a/Telegram/SourceFiles/platform/win/windows_event_filter.h b/Telegram/SourceFiles/platform/win/windows_event_filter.h index d25ba1f8f..594e20edf 100644 --- a/Telegram/SourceFiles/platform/win/windows_event_filter.h +++ b/Telegram/SourceFiles/platform/win/windows_event_filter.h @@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/win/wrapper_windows_h.h" +#include + namespace Platform { class MainWindow; diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp index fad025d36..f0984185e 100644 --- a/Telegram/SourceFiles/settings/settings_information.cpp +++ b/Telegram/SourceFiles/settings/settings_information.cpp @@ -32,6 +32,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_boxes.h" #include "styles/style_settings.h" +#include +#include + namespace Settings { namespace { @@ -114,7 +117,7 @@ void ShowMenu( const auto menu = new Ui::PopupMenu(parent); menu->addAction(copyButton, [=] { - QApplication::clipboard()->setText(text); + QGuiApplication::clipboard()->setText(text); }); menu->popup(QCursor::pos()); } diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp index c98b29a2b..f1affc42f 100644 --- a/Telegram/SourceFiles/settings/settings_main.cpp +++ b/Telegram/SourceFiles/settings/settings_main.cpp @@ -29,6 +29,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/file_utilities.h" #include "styles/style_settings.h" +#include + namespace Settings { void SetupLanguageButton( diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp index c2515a33d..043bb29ab 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp +++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp @@ -36,6 +36,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_settings.h" #include "styles/style_boxes.h" +#include + namespace Settings { namespace { diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h index 4a0c13765..2bdcb8d71 100644 --- a/Telegram/SourceFiles/stdafx.h +++ b/Telegram/SourceFiles/stdafx.h @@ -8,10 +8,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #define __HUGE -// Fix Google Breakpad build for Mac App Store version -#ifdef Q_OS_MAC -#define __STDC_FORMAT_MACROS -#endif // Q_OS_MAC +#ifdef OS_MAC_STORE +#define MAC_USE_BREAKPAD +#endif // OS_MAC_STORE #ifdef __cplusplus @@ -28,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma warning(disable:4180) #endif // __clang__ || _MSC_VER >= 1914 -#include +#include #ifdef __clang__ #pragma clang diagnostic pop @@ -36,12 +35,54 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma warning(pop) #endif // __clang__ || _MSC_VER >= 1914 -#ifdef OS_MAC_STORE -#define MAC_USE_BREAKPAD -#endif // OS_MAC_STORE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +// Fix Google Breakpad build for Mac App Store version +#ifdef Q_OS_MAC +#define __STDC_FORMAT_MACROS +#endif // Q_OS_MAC #include #include diff --git a/Telegram/SourceFiles/storage/file_download.h b/Telegram/SourceFiles/storage/file_download.h index 828b091f9..558a89bb4 100644 --- a/Telegram/SourceFiles/storage/file_download.h +++ b/Telegram/SourceFiles/storage/file_download.h @@ -12,6 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/binary_guard.h" #include "data/data_file_origin.h" +#include + class ApiWrap; namespace Main { diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp index ce611eae4..ea06108b2 100644 --- a/Telegram/SourceFiles/storage/localimageloader.cpp +++ b/Telegram/SourceFiles/storage/localimageloader.cpp @@ -25,6 +25,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwindow.h" #include "main/main_session.h" +#include + namespace { constexpr auto kThumbnailQuality = 87; diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp index d163a5291..23692971e 100644 --- a/Telegram/SourceFiles/storage/localstorage.cpp +++ b/Telegram/SourceFiles/storage/localstorage.cpp @@ -39,6 +39,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_session.h" #include "history/history.h" +#include +#include +#include + extern "C" { #include } // extern "C" diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp index 2e419429e..b3bfe3f4b 100644 --- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp +++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp @@ -12,6 +12,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/mime_type.h" #include "ui/image/image_prepare.h" +#include +#include + namespace Storage { namespace { diff --git a/Telegram/SourceFiles/support/support_templates.cpp b/Telegram/SourceFiles/support/support_templates.cpp index 09d8c816f..773912b7f 100644 --- a/Telegram/SourceFiles/support/support_templates.cpp +++ b/Telegram/SourceFiles/support/support_templates.cpp @@ -12,6 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/shortcuts.h" #include "main/main_session.h" +#include + namespace Support { namespace details { namespace { diff --git a/Telegram/SourceFiles/support/support_templates.h b/Telegram/SourceFiles/support/support_templates.h index 648bee58f..853fd389f 100644 --- a/Telegram/SourceFiles/support/support_templates.h +++ b/Telegram/SourceFiles/support/support_templates.h @@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/binary_guard.h" +#include + namespace Main { class Session; } // namespace Main diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp index 7c5061876..a02258f7a 100644 --- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp +++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp @@ -10,6 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/themes/window_theme.h" #include "ui/rp_widget.h" +#include + namespace Ui { namespace { @@ -243,7 +245,7 @@ CheckCaches *FrameCaches() { if (const auto instance = Instance.data()) { return instance; } - const auto result = new CheckCaches(QGuiApplication::instance()); + const auto result = new CheckCaches(QCoreApplication::instance()); Instance = result; const auto subscription = Ui::CreateChild(result); *subscription = Window::Theme::Background()->add_subscription([=]( diff --git a/Telegram/SourceFiles/ui/emoji_config.cpp b/Telegram/SourceFiles/ui/emoji_config.cpp index 1840be6f1..896a25fcf 100644 --- a/Telegram/SourceFiles/ui/emoji_config.cpp +++ b/Telegram/SourceFiles/ui/emoji_config.cpp @@ -16,6 +16,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/parse_helper.h" #include "main/main_session.h" +#include +#include + namespace Ui { namespace Emoji { namespace { diff --git a/Telegram/SourceFiles/ui/image/image_location.cpp b/Telegram/SourceFiles/ui/image/image_location.cpp index 3ec575023..573e4678f 100644 --- a/Telegram/SourceFiles/ui/image/image_location.cpp +++ b/Telegram/SourceFiles/ui/image/image_location.cpp @@ -15,6 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/overload.h" #include "main/main_session.h" +#include + namespace { constexpr auto kDocumentBaseCacheTag = 0x0000000000010000ULL; diff --git a/Telegram/SourceFiles/ui/image/image_source.cpp b/Telegram/SourceFiles/ui/image/image_source.cpp index 374f7b739..2299c355d 100644 --- a/Telegram/SourceFiles/ui/image/image_source.cpp +++ b/Telegram/SourceFiles/ui/image/image_source.cpp @@ -15,6 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history.h" #include "main/main_session.h" +#include + namespace Images { ImageSource::ImageSource(QImage &&data, const QByteArray &format) diff --git a/Telegram/SourceFiles/ui/rp_widget.cpp b/Telegram/SourceFiles/ui/rp_widget.cpp index 12b5b8b4e..650f80c04 100644 --- a/Telegram/SourceFiles/ui/rp_widget.cpp +++ b/Telegram/SourceFiles/ui/rp_widget.cpp @@ -7,6 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "ui/rp_widget.h" +#include "core/qt_signal_producer.h" + +#include + namespace Ui { void ResizeFitChild( @@ -81,6 +85,26 @@ rpl::producer<> RpWidgetMethods::alive() const { return eventStreams().alive.events(); } +rpl::producer<> RpWidgetMethods::windowDeactivateEvents() const { + const auto window = callGetWidget()->window()->windowHandle(); + Assert(window != nullptr); + + return Core::QtSignalProducer( + window, + &QWindow::activeChanged + ) | rpl::filter([=] { + return !window->isActive(); + }); +} + +rpl::producer<> RpWidgetMethods::macWindowDeactivateEvents() const { +#ifdef Q_OS_MAC + return windowDeactivateEvents(); +#else // Q_OS_MAC + return rpl::never(); +#endif // Q_OS_MAC +} + rpl::lifetime &RpWidgetMethods::lifetime() { return _lifetime; } diff --git a/Telegram/SourceFiles/ui/rp_widget.h b/Telegram/SourceFiles/ui/rp_widget.h index abae25cde..0f1c9f091 100644 --- a/Telegram/SourceFiles/ui/rp_widget.h +++ b/Telegram/SourceFiles/ui/rp_widget.h @@ -11,7 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include #include "base/unique_qptr.h" -#include "core/qt_signal_producer.h" namespace Ui { namespace details { @@ -118,6 +117,8 @@ public: rpl::producer shownValue() const; rpl::producer paintRequest() const; rpl::producer<> alive() const; + rpl::producer<> windowDeactivateEvents() const; + rpl::producer<> macWindowDeactivateEvents() const; template void showOn(rpl::producer &&shown) { @@ -128,6 +129,7 @@ public: }, lifetime()); } + rpl::lifetime &lifetime(); virtual ~RpWidgetMethods() = default; @@ -151,6 +153,8 @@ private: }; virtual void callSetVisible(bool visible) = 0; + virtual QWidget *callGetWidget() = 0; + virtual const QWidget *callGetWidget() const = 0; virtual QPointer callCreateWeak() = 0; virtual QRect callGetGeometry() const = 0; virtual bool callIsHidden() const = 0; @@ -179,25 +183,6 @@ public: visibilityChangedHook(wasVisible, !this->isHidden()); } - auto windowDeactivateEvents() const { - Expects(Widget::window()->windowHandle() != nullptr); - - const auto window = Widget::window()->windowHandle(); - return Core::QtSignalProducer( - window, - &QWindow::activeChanged - ) | rpl::filter([=] { - return !window->isActive(); - }); - } - auto macWindowDeactivateEvents() const { -#ifdef Q_OS_MAC - return windowDeactivateEvents(); -#else // Q_OS_MAC - return rpl::never(); -#endif // Q_OS_MAC - } - ~RpWidgetWrap() { base::take(_lifetime); base::take(_eventStreams); @@ -218,6 +203,12 @@ private: void callSetVisible(bool visible) override { Self::setVisible(visible); } + QWidget *callGetWidget() override { + return this; + } + const QWidget *callGetWidget() const override { + return this; + } QPointer callCreateWeak() override { return QPointer((QObject*)this); } diff --git a/Telegram/SourceFiles/ui/text/text_entity.cpp b/Telegram/SourceFiles/ui/text/text_entity.cpp index 7100889b2..91b5b1631 100644 --- a/Telegram/SourceFiles/ui/text/text_entity.cpp +++ b/Telegram/SourceFiles/ui/text/text_entity.cpp @@ -14,6 +14,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_user.h" #include "data/data_session.h" +#include + namespace TextUtilities { namespace { diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp index 3113e597b..37b2872a0 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp @@ -11,6 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "platform/platform_info.h" +#include +#include +#include + namespace Fonts { namespace { @@ -149,12 +153,12 @@ void SendPendingEventsRecursive(QWidget *target, bool parentHiddenFlag) { if (target->testAttribute(Qt::WA_PendingMoveEvent)) { target->setAttribute(Qt::WA_PendingMoveEvent, false); QMoveEvent e(target->pos(), QPoint()); - QApplication::sendEvent(target, &e); + QCoreApplication::sendEvent(target, &e); } if (target->testAttribute(Qt::WA_PendingResizeEvent)) { target->setAttribute(Qt::WA_PendingResizeEvent, false); QResizeEvent e(target->size(), QSize()); - QApplication::sendEvent(target, &e); + QCoreApplication::sendEvent(target, &e); } auto removeVisibleFlag = [&] { diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.cpp b/Telegram/SourceFiles/ui/widgets/input_fields.cpp index ccf68576e..7c05d7ec2 100644 --- a/Telegram/SourceFiles/ui/widgets/input_fields.cpp +++ b/Telegram/SourceFiles/ui/widgets/input_fields.cpp @@ -23,6 +23,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "main/main_session.h" #include "core/application.h" +#include +#include +#include +#include +#include +#include +#include + namespace Ui { namespace { @@ -1234,7 +1242,7 @@ void FlatInput::keyPressEvent(QKeyEvent *e) { } else if (e->key() == Qt::Key_E && e->modifiers().testFlag(Qt::ControlModifier)) { auto selected = selectedText(); if (!selected.isEmpty() && echoMode() == QLineEdit::Normal) { - QApplication::clipboard()->setText(selected, QClipboard::FindBuffer); + QGuiApplication::clipboard()->setText(selected, QClipboard::FindBuffer); } #endif // Q_OS_MAC } @@ -2696,7 +2704,7 @@ void InputField::keyPressEventInner(QKeyEvent *e) { const auto start = cursor.selectionStart(); const auto end = cursor.selectionEnd(); if (end > start) { - QApplication::clipboard()->setText( + QGuiApplication::clipboard()->setText( getTextWithTagsPart(start, end).text, QClipboard::FindBuffer); } @@ -3957,7 +3965,7 @@ void MaskedInputField::keyPressEvent(QKeyEvent *e) { } else if (e->key() == Qt::Key_E && e->modifiers().testFlag(Qt::ControlModifier)) { auto selected = selectedText(); if (!selected.isEmpty() && echoMode() == QLineEdit::Normal) { - QApplication::clipboard()->setText(selected, QClipboard::FindBuffer); + QGuiApplication::clipboard()->setText(selected, QClipboard::FindBuffer); } #endif // Q_OS_MAC } diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.h b/Telegram/SourceFiles/ui/widgets/input_fields.h index 82f6910e3..3839304c8 100644 --- a/Telegram/SourceFiles/ui/widgets/input_fields.h +++ b/Telegram/SourceFiles/ui/widgets/input_fields.h @@ -11,6 +11,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/effects/animations.h" #include "styles/style_widgets.h" +#include +#include + class UserData; namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/labels.cpp b/Telegram/SourceFiles/ui/widgets/labels.cpp index ce9af754b..9e86529d9 100644 --- a/Telegram/SourceFiles/ui/widgets/labels.cpp +++ b/Telegram/SourceFiles/ui/widgets/labels.cpp @@ -13,6 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwindow.h" #include "lang/lang_keys.h" +#include +#include +#include +#include + namespace Ui { namespace { @@ -582,7 +587,7 @@ void FlatLabel::showContextMenu(QContextMenuEvent *e, ContextMenuReason reason) _contextMenu->addAction( actionText, [text = link->copyToClipboardText()] { - QApplication::clipboard()->setText(text); + QGuiApplication::clipboard()->setText(text); }); } } diff --git a/Telegram/SourceFiles/ui/widgets/menu.h b/Telegram/SourceFiles/ui/widgets/menu.h index 34e249fa7..456f5261b 100644 --- a/Telegram/SourceFiles/ui/widgets/menu.h +++ b/Telegram/SourceFiles/ui/widgets/menu.h @@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_widgets.h" +#include + namespace Ui { class ToggleView; diff --git a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp index 65b8cd462..e78af60a3 100644 --- a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp +++ b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp @@ -15,6 +15,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "lang/lang_keys.h" +#include +#include + namespace Ui { PopupMenu::PopupMenu(QWidget *parent, const style::PopupMenu &st) diff --git a/Telegram/SourceFiles/ui/widgets/scroll_area.cpp b/Telegram/SourceFiles/ui/widgets/scroll_area.cpp index 2e64b5877..beb5814bf 100644 --- a/Telegram/SourceFiles/ui/widgets/scroll_area.cpp +++ b/Telegram/SourceFiles/ui/widgets/scroll_area.cpp @@ -7,6 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "ui/widgets/scroll_area.h" +#include +#include +#include +#include + namespace Ui { // flick scroll taken from http://qt-project.org/doc/qt-4.8/demos-embedded-anomaly-src-flickcharm-cpp.html diff --git a/Telegram/SourceFiles/ui/widgets/scroll_area.h b/Telegram/SourceFiles/ui/widgets/scroll_area.h index f9bc70dce..3c9aafebb 100644 --- a/Telegram/SourceFiles/ui/widgets/scroll_area.h +++ b/Telegram/SourceFiles/ui/widgets/scroll_area.h @@ -11,6 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/effects/animations.h" #include "styles/style_widgets.h" +#include + namespace Ui { enum class TouchScrollState { diff --git a/Telegram/SourceFiles/ui/widgets/separate_panel.cpp b/Telegram/SourceFiles/ui/widgets/separate_panel.cpp index 8877ce53d..e78428564 100644 --- a/Telegram/SourceFiles/ui/widgets/separate_panel.cpp +++ b/Telegram/SourceFiles/ui/widgets/separate_panel.cpp @@ -23,6 +23,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_info.h" #include "styles/style_calls.h" +#include +#include + namespace Ui { SeparatePanel::SeparatePanel() diff --git a/Telegram/SourceFiles/ui/widgets/tooltip.cpp b/Telegram/SourceFiles/ui/widgets/tooltip.cpp index 7eecf01de..0b90b9853 100644 --- a/Telegram/SourceFiles/ui/widgets/tooltip.cpp +++ b/Telegram/SourceFiles/ui/widgets/tooltip.cpp @@ -12,6 +12,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/qt_signal_producer.h" #include "styles/style_widgets.h" +#include +#include + namespace Ui { Tooltip *TooltipInstance = nullptr; diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp index 902d84d01..4e31eae85 100644 --- a/Telegram/SourceFiles/window/main_window.cpp +++ b/Telegram/SourceFiles/window/main_window.cpp @@ -29,6 +29,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_window.h" #include "styles/style_boxes.h" +#include +#include +#include +#include +#include +#include + namespace Window { namespace { diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h index 2eacf8a8a..e079de8c6 100644 --- a/Telegram/SourceFiles/window/main_window.h +++ b/Telegram/SourceFiles/window/main_window.h @@ -11,6 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/rp_widget.h" #include "base/timer.h" +#include + class BoxContent; namespace Main { diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp index b1596492a..5bbd44937 100644 --- a/Telegram/SourceFiles/window/notifications_manager_default.cpp +++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp @@ -26,6 +26,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history_item.h" #include "platform/platform_specific.h" +#include + namespace Window { namespace Notifications { namespace Default { diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp index 8f3cdad2c..eddb96624 100644 --- a/Telegram/SourceFiles/window/themes/window_theme.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme.cpp @@ -26,6 +26,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_widgets.h" #include "styles/style_history.h" +#include + namespace Window { namespace Theme { namespace { diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp index 6bc09fc5b..7906635e6 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp @@ -37,6 +37,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_settings.h" #include "styles/style_boxes.h" +#include + namespace Window { namespace Theme { namespace { diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp index 029ab1af6..98f71e2ee 100644 --- a/Telegram/SourceFiles/window/window_controller.cpp +++ b/Telegram/SourceFiles/window/window_controller.cpp @@ -15,6 +15,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/themes/window_theme_editor.h" #include "mainwindow.h" +#include +#include + namespace Window { Controller::Controller(not_null account) diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index 2cda358f7..efba2bc6c 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -37,6 +37,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_settings.h" #include "styles/style_boxes.h" +#include +#include + namespace { constexpr auto kMinDiffIntensity = 0.25; diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 9bbc28538..f43b63c77 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -49,6 +49,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_boxes.h" #include "styles/style_window.h" // st::windowMinWidth +#include + namespace Window { namespace {