From 132caa18c9ca24b828c4101fcab1f2d4654f3063 Mon Sep 17 00:00:00 2001 From: AlexeyZavar Date: Tue, 2 Apr 2024 02:13:32 +0300 Subject: [PATCH] fix: move out AyuGram files for consistency fix: compiler warning --- Telegram/CMakeLists.txt | 139 +++++++++--------- .../ayu/ui/settings/icon_picker.cpp | 2 +- 2 files changed, 72 insertions(+), 69 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index bcf747d534..ae861a65a5 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -93,78 +93,81 @@ PRIVATE desktop-app::external_xxhash ) +set(ayugram_files + ayu/ayu_worker.cpp + ayu/ayu_worker.h + ayu/ayu_url_handlers.cpp + ayu/ayu_url_handlers.h + ayu/ayu_state.cpp + ayu/ayu_state.h + ayu/ayu_settings.cpp + ayu/ayu_settings.h + ayu/ayu_lang.cpp + ayu/ayu_lang.h + ayu/ayu_infra.cpp + ayu/ayu_infra.h + ayu/ayu_constants.h + ayu/utils/ayu_mapper.cpp + ayu/utils/ayu_mapper.h + ayu/utils/qt_key_modifiers_extended.h + ayu/utils/telegram_helpers.cpp + ayu/utils/telegram_helpers.h + ayu/utils/windows_utils.cpp + ayu/utils/windows_utils.h + ayu/ui/ayu_logo.cpp + ayu/ui/ayu_logo.h + ayu/ui/utils/ayu_profile_values.cpp + ayu/ui/utils/ayu_profile_values.h + ayu/ui/settings/icon_picker.cpp + ayu/ui/settings/icon_picker.h + ayu/ui/settings/settings_ayu.cpp + ayu/ui/settings/settings_ayu.h + ayu/ui/context_menu/context_menu.cpp + ayu/ui/context_menu/context_menu.h + ayu/ui/context_menu/menu_item_subtext.cpp + ayu/ui/context_menu/menu_item_subtext.h + ayu/ui/sections/edited/edited_log_inner.cpp + ayu/ui/sections/edited/edited_log_inner.h + ayu/ui/sections/edited/edited_log_item.cpp + ayu/ui/sections/edited/edited_log_item.h + ayu/ui/sections/edited/edited_log_section.cpp + ayu/ui/sections/edited/edited_log_section.h + ayu/ui/boxes/server_read_confirmation_box.cpp + ayu/ui/boxes/server_read_confirmation_box.h + ayu/ui/boxes/edit_deleted_mark.cpp + ayu/ui/boxes/edit_deleted_mark.h + ayu/ui/boxes/edit_edited_mark.cpp + ayu/ui/boxes/edit_edited_mark.h + ayu/ui/boxes/font_selector.cpp + ayu/ui/boxes/font_selector.h + ayu/ui/boxes/theme_selector_box.cpp + ayu/ui/boxes/theme_selector_box.h + ayu/ui/boxes/message_shot_box.cpp + ayu/ui/boxes/message_shot_box.h + ayu/ui/components/image_view.cpp + ayu/ui/components/image_view.h + ayu/libs/json.hpp + ayu/libs/json_ext.hpp + ayu/libs/sqlite/sqlite3.c + ayu/libs/sqlite/sqlite3.h + ayu/libs/sqlite/sqlite_orm.h + ayu/features/streamer_mode/streamer_mode_windows.cpp + ayu/features/streamer_mode/streamer_mode_linux.cpp + ayu/features/streamer_mode/streamer_mode.h + ayu/features/messageshot/message_shot.cpp + ayu/features/messageshot/message_shot.h + ayu/data/messages_storage.cpp + ayu/data/messages_storage.h + ayu/data/entities.h + ayu/data/ayu_database.cpp + ayu/data/ayu_database.h +) + target_precompile_headers(Telegram PRIVATE $<$:${src_loc}/stdafx.h>) nice_target_sources(Telegram ${src_loc} PRIVATE ${style_files} - - ayu/ayu_worker.cpp - ayu/ayu_worker.h - ayu/ayu_url_handlers.cpp - ayu/ayu_url_handlers.h - ayu/ayu_state.cpp - ayu/ayu_state.h - ayu/ayu_settings.cpp - ayu/ayu_settings.h - ayu/ayu_lang.cpp - ayu/ayu_lang.h - ayu/ayu_infra.cpp - ayu/ayu_infra.h - ayu/ayu_constants.h - ayu/utils/ayu_mapper.cpp - ayu/utils/ayu_mapper.h - ayu/utils/qt_key_modifiers_extended.h - ayu/utils/telegram_helpers.cpp - ayu/utils/telegram_helpers.h - ayu/utils/windows_utils.cpp - ayu/utils/windows_utils.h - ayu/ui/ayu_logo.cpp - ayu/ui/ayu_logo.h - ayu/ui/utils/ayu_profile_values.cpp - ayu/ui/utils/ayu_profile_values.h - ayu/ui/settings/icon_picker.cpp - ayu/ui/settings/icon_picker.h - ayu/ui/settings/settings_ayu.cpp - ayu/ui/settings/settings_ayu.h - ayu/ui/context_menu/context_menu.cpp - ayu/ui/context_menu/context_menu.h - ayu/ui/context_menu/menu_item_subtext.cpp - ayu/ui/context_menu/menu_item_subtext.h - ayu/ui/sections/edited/edited_log_inner.cpp - ayu/ui/sections/edited/edited_log_inner.h - ayu/ui/sections/edited/edited_log_item.cpp - ayu/ui/sections/edited/edited_log_item.h - ayu/ui/sections/edited/edited_log_section.cpp - ayu/ui/sections/edited/edited_log_section.h - ayu/ui/boxes/server_read_confirmation_box.cpp - ayu/ui/boxes/server_read_confirmation_box.h - ayu/ui/boxes/edit_deleted_mark.cpp - ayu/ui/boxes/edit_deleted_mark.h - ayu/ui/boxes/edit_edited_mark.cpp - ayu/ui/boxes/edit_edited_mark.h - ayu/ui/boxes/font_selector.cpp - ayu/ui/boxes/font_selector.h - ayu/ui/boxes/theme_selector_box.cpp - ayu/ui/boxes/theme_selector_box.h - ayu/ui/boxes/message_shot_box.cpp - ayu/ui/boxes/message_shot_box.h - ayu/ui/components/image_view.cpp - ayu/ui/components/image_view.h - ayu/libs/json.hpp - ayu/libs/json_ext.hpp - ayu/libs/sqlite/sqlite3.c - ayu/libs/sqlite/sqlite3.h - ayu/libs/sqlite/sqlite_orm.h - ayu/features/streamer_mode/streamer_mode_windows.cpp - ayu/features/streamer_mode/streamer_mode_linux.cpp - ayu/features/streamer_mode/streamer_mode.h - ayu/features/messageshot/message_shot.cpp - ayu/features/messageshot/message_shot.h - ayu/data/messages_storage.cpp - ayu/data/messages_storage.h - ayu/data/entities.h - ayu/data/ayu_database.cpp - ayu/data/ayu_database.h + ${ayugram_files} api/api_attached_stickers.cpp api/api_attached_stickers.h diff --git a/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp b/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp index b0cdd7a0e0..27ca60ba68 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/icon_picker.cpp @@ -20,7 +20,7 @@ #include "ayu/utils/windows_utils.h" #endif -const QVector icons{ +const QVector icons{ AyuAssets::DEFAULT_ICON, AyuAssets::ALT_ICON, AyuAssets::DISCORD_ICON,