From baa99be6a527761f2eb7e42a7db95059fb67ee7d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 15 Nov 2023 02:07:22 +0300
Subject: [PATCH] Removed some unwanted include directives of lang_keys in
header files.
---
Telegram/SourceFiles/boxes/language_box.cpp | 1 +
Telegram/SourceFiles/boxes/language_box.h | 5 +----
Telegram/SourceFiles/calls/group/calls_group_members.cpp | 1 +
Telegram/SourceFiles/core/core_settings.cpp | 1 +
Telegram/SourceFiles/data/data_document_resolver.cpp | 1 +
Telegram/SourceFiles/data/data_download_manager.cpp | 1 +
Telegram/SourceFiles/editor/editor_paint.cpp | 1 +
.../SourceFiles/editor/photo_editor_layer_widget.cpp | 1 +
Telegram/SourceFiles/settings/settings_chat.cpp | 7 ++++---
Telegram/SourceFiles/settings/settings_main.cpp | 1 +
Telegram/SourceFiles/storage/storage_account.cpp | 1 +
Telegram/SourceFiles/storage/storage_media_prepare.cpp | 1 +
Telegram/SourceFiles/storage/storage_media_prepare.h | 6 +++++-
Telegram/SourceFiles/tray.cpp | 1 +
Telegram/SourceFiles/window/themes/window_theme.cpp | 1 +
.../SourceFiles/window/themes/window_themes_embedded.cpp | 9 +++++----
.../SourceFiles/window/themes/window_themes_embedded.h | 7 ++-----
Telegram/SourceFiles/window/window_controller.cpp | 1 +
.../SourceFiles/window/window_session_controller.cpp | 1 +
19 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp
index d13661c37..ab709a87d 100644
--- a/Telegram/SourceFiles/boxes/language_box.cpp
+++ b/Telegram/SourceFiles/boxes/language_box.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/painter.h"
#include "ui/vertical_list.h"
#include "storage/localstorage.h"
+#include "boxes/abstract_box.h"
#include "boxes/premium_preview_box.h"
#include "boxes/translate_box.h"
#include "ui/boxes/confirm_box.h"
diff --git a/Telegram/SourceFiles/boxes/language_box.h b/Telegram/SourceFiles/boxes/language_box.h
index 5e500b0bb..350b570a6 100644
--- a/Telegram/SourceFiles/boxes/language_box.h
+++ b/Telegram/SourceFiles/boxes/language_box.h
@@ -7,8 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
-#include "lang/lang_cloud_manager.h"
-#include "boxes/abstract_box.h"
+#include "ui/layers/box_content.h"
#include "base/binary_guard.h"
struct LanguageId;
@@ -37,8 +36,6 @@ protected:
void keyPressEvent(QKeyEvent *e) override;
private:
- using Languages = Lang::CloudManager::Languages;
-
void setupTop(not_null<Ui::VerticalLayout*> container);
[[nodiscard]] int rowsInPage() const;
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members.cpp b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
index 51ac47777..73ac7d1b9 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
@@ -32,6 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/application.h" // Core::App().domain, .activeWindow.
#include "main/main_domain.h" // Core::App().domain().activate.
#include "main/main_session.h"
+#include "lang/lang_keys.h"
#include "info/profile/info_profile_values.h" // Info::Profile::NameValue.
#include "boxes/peers/edit_participants_box.h" // SubscribeToMigration.
#include "boxes/peers/prepare_short_info_box.h" // PrepareShortInfo...
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index c29531c31..8039fc124 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/player/media_player_instance.h"
#include "media/media_common.h"
#include "ui/gl/gl_detection.h"
+#include "lang/lang_keys.h"
#include "calls/group/calls_group_common.h"
#include "spellcheck/spellcheck_types.h"
diff --git a/Telegram/SourceFiles/data/data_document_resolver.cpp b/Telegram/SourceFiles/data/data_document_resolver.cpp
index ead282bcf..ee8d11565 100644
--- a/Telegram/SourceFiles/data/data_document_resolver.cpp
+++ b/Telegram/SourceFiles/data/data_document_resolver.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history.h"
#include "history/history_item.h"
#include "media/player/media_player_instance.h"
+#include "lang/lang_keys.h"
#include "platform/platform_file_utilities.h"
#include "ui/chat/chat_theme.h"
#include "ui/text/text_utilities.h"
diff --git a/Telegram/SourceFiles/data/data_download_manager.cpp b/Telegram/SourceFiles/data/data_download_manager.cpp
index 6b984e4cf..1d7ea12af 100644
--- a/Telegram/SourceFiles/data/data_download_manager.cpp
+++ b/Telegram/SourceFiles/data/data_download_manager.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/random.h"
#include "main/main_session.h"
#include "main/main_account.h"
+#include "lang/lang_keys.h"
#include "storage/storage_account.h"
#include "history/history.h"
#include "history/history_item.h"
diff --git a/Telegram/SourceFiles/editor/editor_paint.cpp b/Telegram/SourceFiles/editor/editor_paint.cpp
index 4375cca96..5f858ae27 100644
--- a/Telegram/SourceFiles/editor/editor_paint.cpp
+++ b/Telegram/SourceFiles/editor/editor_paint.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "editor/scene/scene_item_canvas.h"
#include "editor/scene/scene_item_image.h"
#include "editor/scene/scene_item_sticker.h"
+#include "lang/lang_keys.h"
#include "lottie/lottie_single_player.h"
#include "storage/storage_media_prepare.h"
#include "ui/chat/attach/attach_prepare.h"
diff --git a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp b/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp
index daf93c08d..33ed5e837 100644
--- a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "editor/photo_editor_layer_widget.h"
+#include "lang/lang_keys.h"
#include "ui/boxes/confirm_box.h" // InformBox
#include "editor/editor_layer_widget.h"
#include "editor/photo_editor.h"
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index e1bf55730..43d1912a5 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -1342,11 +1342,12 @@ void SetupDefaultThemes(
block,
group,
scheme.type,
- scheme.name(tr::now),
+ QString(),
st::settingsTheme,
std::move(check));
- scheme.name(
- ) | rpl::start_with_next([=](const auto &themeName) {
+ rpl::duplicate(
+ scheme.name
+ ) | rpl::start_with_next([=](const QString &themeName) {
result->setText(themeName);
}, result->lifetime());
result->addClickHandler([=] {
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index fbca5f929..5e440a581 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -40,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_cloud_themes.h"
#include "data/data_chat_filters.h"
#include "data/data_peer_values.h" // Data::AmPremiumValue
+#include "lang/lang_cloud_manager.h"
#include "lang/lang_keys.h"
#include "lang/lang_instance.h"
#include "storage/localstorage.h"
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index d444c2a1d..fe8049ff6 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mtproto/mtproto_config.h"
#include "mtproto/mtproto_dc_options.h"
#include "mtproto/mtp_instance.h"
+#include "lang/lang_keys.h"
#include "history/history.h"
#include "core/application.h"
#include "core/core_settings.h"
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index 18d23e662..362455cac 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "editor/photo_editor_common.h"
#include "platform/platform_file_utilities.h"
+#include "lang/lang_keys.h"
#include "storage/localimageloader.h"
#include "core/mime_type.h"
#include "ui/image/image_prepare.h"
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.h b/Telegram/SourceFiles/storage/storage_media_prepare.h
index f8e1e8006..d806fa47d 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.h
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.h
@@ -8,7 +8,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "core/file_utilities.h"
-#include "lang/lang_keys.h"
+
+namespace tr {
+template <typename ...>
+struct phrase;
+} // namespace tr
namespace Ui {
struct PreparedFileInformation;
diff --git a/Telegram/SourceFiles/tray.cpp b/Telegram/SourceFiles/tray.cpp
index 636b7a252..093122508 100644
--- a/Telegram/SourceFiles/tray.cpp
+++ b/Telegram/SourceFiles/tray.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/application.h"
#include "core/core_settings.h"
#include "platform/platform_specific.h"
+#include "lang/lang_keys.h"
#include <QtWidgets/QApplication>
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index be3d87846..53b0c4b81 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_document_resolver.h"
#include "main/main_account.h" // Account::local.
#include "main/main_domain.h" // Domain::activeSessionValue.
+#include "lang/lang_keys.h"
#include "ui/chat/chat_theme.h"
#include "ui/image/image.h"
#include "ui/style/style_palette_colorizer.h"
diff --git a/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp b/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp
index 0269c7ccd..434a4d846 100644
--- a/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp
+++ b/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/themes/window_themes_embedded.h"
#include "window/themes/window_theme.h"
+#include "lang/lang_keys.h"
#include "storage/serialize_common.h"
#include "core/application.h"
#include "core/core_settings.h"
@@ -220,7 +221,7 @@ std::vector<EmbeddedScheme> EmbeddedThemes() {
qColor("ffffff"),
qColor("eaffdc"),
qColor("ffffff"),
- tr::lng_settings_theme_classic,
+ tr::lng_settings_theme_classic(),
QString(),
qColor("40a7e3")
},
@@ -231,7 +232,7 @@ std::vector<EmbeddedScheme> EmbeddedThemes() {
qColor("ffffff"),
qColor("d7f0ff"),
qColor("ffffff"),
- tr::lng_settings_theme_day,
+ tr::lng_settings_theme_day(),
":/gui/day-blue.tdesktop-theme",
qColor("40a7e3")
},
@@ -242,7 +243,7 @@ std::vector<EmbeddedScheme> EmbeddedThemes() {
qColor("6b808d"),
qColor("6b808d"),
qColor("5ca7d4"),
- tr::lng_settings_theme_tinted,
+ tr::lng_settings_theme_tinted(),
":/gui/night.tdesktop-theme",
qColor("5288c1")
},
@@ -253,7 +254,7 @@ std::vector<EmbeddedScheme> EmbeddedThemes() {
qColor("6b808d"),
qColor("6b808d"),
qColor("75bfb5"),
- tr::lng_settings_theme_night,
+ tr::lng_settings_theme_night(),
":/gui/night-green.tdesktop-theme",
qColor("3fc1b0")
},
diff --git a/Telegram/SourceFiles/window/themes/window_themes_embedded.h b/Telegram/SourceFiles/window/themes/window_themes_embedded.h
index dd2e234dd..ea66c9590 100644
--- a/Telegram/SourceFiles/window/themes/window_themes_embedded.h
+++ b/Telegram/SourceFiles/window/themes/window_themes_embedded.h
@@ -7,9 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
-#include "lang/lang_keys.h"
-
-class QImage;
namespace style {
struct colorizer;
@@ -32,7 +29,7 @@ struct EmbeddedScheme {
QColor received;
QColor radiobuttonInactive;
QColor radiobuttonActive;
- tr::phrase<> name;
+ rpl::producer<QString> name;
QString path;
QColor accentColor;
};
@@ -69,4 +66,4 @@ void Colorize(
[[nodiscard]] Fn<void(style::palette&)> PrepareCurrentPaletteCallback();
} // namespace Theme
-} // namespace Window
\ No newline at end of file
+} // namespace Window
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index 7f5bd3c2d..7d1e08506 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "main/main_session_settings.h"
#include "main/main_app_config.h"
#include "media/view/media_view_open_common.h"
+#include "lang/lang_keys.h"
#include "intro/intro_widget.h"
#include "mtproto/mtproto_config.h"
#include "ui/layers/box_content.h"
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 89fac17ef..fc24d544f 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -74,6 +74,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "main/main_domain.h"
#include "main/main_session.h"
#include "main/main_session_settings.h"
+#include "lang/lang_keys.h"
#include "apiwrap.h"
#include "api/api_chat_invite.h"
#include "api/api_global_privacy.h"