From 1d475ee72751c1fe3bac730803c3dc5f2ec6df34 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sat, 11 Jun 2022 03:07:22 +0300 Subject: [PATCH] Slightly optimized includes in application.h. --- Telegram/SourceFiles/api/api_authorizations.cpp | 1 + Telegram/SourceFiles/api/api_chat_invite.cpp | 2 +- Telegram/SourceFiles/boxes/add_contact_box.cpp | 1 + Telegram/SourceFiles/boxes/auto_lock_box.cpp | 1 + Telegram/SourceFiles/boxes/dictionaries_manager.cpp | 2 ++ Telegram/SourceFiles/boxes/ringtones_box.cpp | 1 + Telegram/SourceFiles/boxes/share_box.cpp | 1 + Telegram/SourceFiles/calls/calls_instance.cpp | 1 + Telegram/SourceFiles/calls/group/calls_group_panel.cpp | 1 + Telegram/SourceFiles/calls/group/calls_group_settings.cpp | 1 + Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp | 1 + Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp | 2 +- Telegram/SourceFiles/core/application.cpp | 1 + Telegram/SourceFiles/core/application.h | 7 ++----- Telegram/SourceFiles/data/data_folder.cpp | 1 + Telegram/SourceFiles/data/data_session.cpp | 1 + .../SourceFiles/info/downloads/info_downloads_widget.cpp | 1 + Telegram/SourceFiles/main/main_domain.cpp | 1 + Telegram/SourceFiles/media/audio/media_audio.cpp | 1 + Telegram/SourceFiles/settings/settings_local_passcode.cpp | 1 + .../storage/details/storage_settings_scheme.cpp | 1 + Telegram/SourceFiles/storage/localstorage.cpp | 1 + Telegram/SourceFiles/storage/storage_account.cpp | 1 + Telegram/SourceFiles/tray.cpp | 1 + 24 files changed, 26 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/api/api_authorizations.cpp b/Telegram/SourceFiles/api/api_authorizations.cpp index 143166b78..778a3db6b 100644 --- a/Telegram/SourceFiles/api/api_authorizations.cpp +++ b/Telegram/SourceFiles/api/api_authorizations.cpp @@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/unixtime.h" #include "core/changelogs.h" #include "core/application.h" +#include "core/core_settings.h" #include "lang/lang_keys.h" namespace Api { diff --git a/Telegram/SourceFiles/api/api_chat_invite.cpp b/Telegram/SourceFiles/api/api_chat_invite.cpp index e8dae68e8..fdf14757d 100644 --- a/Telegram/SourceFiles/api/api_chat_invite.cpp +++ b/Telegram/SourceFiles/api/api_chat_invite.cpp @@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "apiwrap.h" #include "window/window_session_controller.h" +#include "lang/lang_keys.h" #include "main/main_session.h" #include "ui/empty_userpic.h" #include "core/application.h" @@ -20,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_file_origin.h" #include "ui/boxes/confirm_box.h" #include "ui/toasts/common_toasts.h" -#include "boxes/abstract_box.h" #include "boxes/premium_limits_box.h" #include "styles/style_boxes.h" #include "styles/style_layers.h" diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp index 4f4d04f12..24b35d13e 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.cpp +++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp @@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/peers/edit_participant_box.h" #include "boxes/peers/edit_participants_box.h" #include "core/application.h" +#include "core/core_settings.h" #include "chat_helpers/emoji_suggestions_widget.h" #include "countries/countries_instance.h" // Countries::ExtractPhoneCode. #include "window/window_session_controller.h" diff --git a/Telegram/SourceFiles/boxes/auto_lock_box.cpp b/Telegram/SourceFiles/boxes/auto_lock_box.cpp index 49383558e..70c09ec9e 100644 --- a/Telegram/SourceFiles/boxes/auto_lock_box.cpp +++ b/Telegram/SourceFiles/boxes/auto_lock_box.cpp @@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/auto_lock_box.h" #include "core/application.h" +#include "core/core_settings.h" #include "lang/lang_keys.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/time_input.h" diff --git a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp index add88f3a4..72cfd29c0 100644 --- a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp +++ b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp @@ -12,6 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/event_filter.h" #include "chat_helpers/spellchecker_common.h" #include "core/application.h" +#include "core/core_settings.h" +#include "lang/lang_keys.h" #include "main/main_account.h" #include "main/main_session.h" #include "mainwidget.h" diff --git a/Telegram/SourceFiles/boxes/ringtones_box.cpp b/Telegram/SourceFiles/boxes/ringtones_box.cpp index 1b504973a..23186daff 100644 --- a/Telegram/SourceFiles/boxes/ringtones_box.cpp +++ b/Telegram/SourceFiles/boxes/ringtones_box.cpp @@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer_rpl.h" #include "base/unixtime.h" #include "core/application.h" +#include "core/core_settings.h" #include "core/file_utilities.h" #include "core/mime_type.h" #include "data/data_document.h" diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp index 5fe89e692..972320ed5 100644 --- a/Telegram/SourceFiles/boxes/share_box.cpp +++ b/Telegram/SourceFiles/boxes/share_box.cpp @@ -45,6 +45,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_changes.h" #include "main/main_session.h" #include "core/application.h" +#include "core/core_settings.h" #include "styles/style_layers.h" #include "styles/style_boxes.h" #include "styles/style_chat.h" diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp index c0e95ce54..ec6d0fca0 100644 --- a/Telegram/SourceFiles/calls/calls_instance.cpp +++ b/Telegram/SourceFiles/calls/calls_instance.cpp @@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "calls/group/calls_group_rtmp.h" #include "mtproto/mtproto_dh_utils.h" #include "core/application.h" +#include "core/core_settings.h" #include "main/main_session.h" #include "main/main_account.h" #include "apiwrap.h" diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp index 3b6442175..5cb34b58e 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp @@ -37,6 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/special_buttons.h" #include "info/profile/info_profile_values.h" // Info::Profile::Value. #include "core/application.h" +#include "core/core_settings.h" #include "lang/lang_keys.h" #include "data/data_channel.h" #include "data/data_chat.h" diff --git a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp index 226583a22..0b4571b43 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp @@ -39,6 +39,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/toast/toast.h" #include "data/data_changes.h" #include "core/application.h" +#include "core/core_settings.h" #include "ui/boxes/single_choice_box.h" #include "webrtc/webrtc_audio_input_tester.h" #include "webrtc/webrtc_media_devices.h" diff --git a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp index a532de970..982556729 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "emoji_suggestions_helper.h" #include "lang/lang_instance.h" #include "lang/lang_cloud_manager.h" +#include "lang/lang_keys.h" #include "core/application.h" #include "base/platform/base_platform_info.h" #include "ui/emoji_config.h" diff --git a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp index a4ab881de..19784fc42 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp @@ -17,8 +17,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/emoji_config.h" #include "ui/ui_utility.h" #include "core/application.h" +#include "lang/lang_keys.h" #include "main/main_account.h" -#include "mainwidget.h" #include "storage/storage_cloud_blob.h" #include "styles/style_layers.h" #include "styles/style_boxes.h" diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp index ad4b41e59..249872162 100644 --- a/Telegram/SourceFiles/core/application.cpp +++ b/Telegram/SourceFiles/core/application.cpp @@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/concurrent_timer.h" #include "base/qt_signal_producer.h" #include "base/unixtime.h" +#include "core/core_settings.h" #include "core/update_checker.h" #include "core/shortcuts.h" #include "core/sandbox.h" diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h index b7753f33c..d05aa383a 100644 --- a/Telegram/SourceFiles/core/application.h +++ b/Telegram/SourceFiles/core/application.h @@ -7,15 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "core/core_settings.h" #include "mtproto/mtproto_auth_key.h" #include "mtproto/mtproto_proxy_data.h" #include "base/timer.h" -class MainWindow; -class MainWidget; -class FileUploader; -class Translator; +class History; namespace Platform { class Integration; @@ -104,6 +100,7 @@ namespace Core { class Launcher; struct LocalUrlHandler; +class Settings; class Tray; enum class LaunchState { diff --git a/Telegram/SourceFiles/data/data_folder.cpp b/Telegram/SourceFiles/data/data_folder.cpp index 103569e19..1ede84514 100644 --- a/Telegram/SourceFiles/data/data_folder.cpp +++ b/Telegram/SourceFiles/data/data_folder.cpp @@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "storage/storage_facade.h" #include "core/application.h" +#include "core/core_settings.h" #include "main/main_account.h" #include "main/main_session.h" #include "mtproto/mtproto_config.h" diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index 8e9ee0fbb..37378c882 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp @@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwidget.h" #include "api/api_text_entities.h" #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" diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp b/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp index 3033c68e0..26a46d22a 100644 --- a/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp +++ b/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp @@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_download_manager.h" #include "data/data_user.h" #include "core/application.h" +#include "lang/lang_keys.h" #include "styles/style_info.h" namespace Info::Downloads { diff --git a/Telegram/SourceFiles/main/main_domain.cpp b/Telegram/SourceFiles/main/main_domain.cpp index 44b20a65c..63363e6aa 100644 --- a/Telegram/SourceFiles/main/main_domain.cpp +++ b/Telegram/SourceFiles/main/main_domain.cpp @@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "main/main_domain.h" #include "core/application.h" +#include "core/core_settings.h" #include "core/shortcuts.h" #include "core/crash_reports.h" #include "main/main_account.h" diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp index b1a9a8fb5..fbe1e5753 100644 --- a/Telegram/SourceFiles/media/audio/media_audio.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio.cpp @@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_session.h" #include "platform/platform_audio.h" #include "core/application.h" +#include "core/core_settings.h" #include "main/main_session.h" #include diff --git a/Telegram/SourceFiles/settings/settings_local_passcode.cpp b/Telegram/SourceFiles/settings/settings_local_passcode.cpp index 04997a07a..78e4c3457 100644 --- a/Telegram/SourceFiles/settings/settings_local_passcode.cpp +++ b/Telegram/SourceFiles/settings/settings_local_passcode.cpp @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/platform/base_platform_last_input.h" #include "boxes/auto_lock_box.h" #include "core/application.h" +#include "core/core_settings.h" #include "lang/lang_keys.h" #include "lottie/lottie_icon.h" #include "main/main_domain.h" diff --git a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp index c29849ac3..20458563e 100644 --- a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp +++ b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp @@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/cache/storage_cache_database.h" #include "storage/serialize_common.h" #include "core/application.h" +#include "core/core_settings.h" #include "mtproto/mtproto_config.h" #include "ui/effects/animation_value.h" #include "ui/widgets/input_fields.h" diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp index d25217348..684833030 100644 --- a/Telegram/SourceFiles/storage/localstorage.cpp +++ b/Telegram/SourceFiles/storage/localstorage.cpp @@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/update_checker.h" #include "core/file_location.h" #include "core/application.h" +#include "core/core_settings.h" #include "media/audio/media_audio.h" #include "mtproto/mtproto_config.h" #include "mtproto/mtproto_dc_options.h" diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp index 2cfb1f657..1e3be82f8 100644 --- a/Telegram/SourceFiles/storage/storage_account.cpp +++ b/Telegram/SourceFiles/storage/storage_account.cpp @@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mtproto/mtp_instance.h" #include "history/history.h" #include "core/application.h" +#include "core/core_settings.h" #include "core/file_location.h" #include "data/stickers/data_stickers.h" #include "data/data_session.h" diff --git a/Telegram/SourceFiles/tray.cpp b/Telegram/SourceFiles/tray.cpp index 7310fc946..4a70dc4e4 100644 --- a/Telegram/SourceFiles/tray.cpp +++ b/Telegram/SourceFiles/tray.cpp @@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "tray.h" #include "core/application.h" +#include "core/core_settings.h" #include