From af0e11a1aac3b88a5e16e6a94c5333ad7f568080 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Fri, 29 Sep 2023 16:41:18 +0300 Subject: [PATCH] Moved out to td_ui all classes related to statistics. --- Telegram/CMakeLists.txt | 26 ------------------- .../SourceFiles/statistics/chart_widget.h | 2 +- .../statistics/point_details_widget.cpp | 2 ++ .../statistics/point_details_widget.h | 2 +- .../statistics_data_deserialize.cpp | 3 ++- .../view/chart_horizontal_lines_view.cpp | 3 ++- .../statistics/view/linear_chart_view.cpp | 2 +- .../statistics/view/stack_chart_common.cpp | 2 +- .../statistics/view/stack_chart_view.cpp | 2 +- .../view/stack_linear_chart_view.cpp | 2 +- Telegram/cmake/td_ui.cmake | 26 +++++++++++++++++++ 11 files changed, 38 insertions(+), 34 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index b1e00d09e..19f47d29e 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -1281,34 +1281,8 @@ PRIVATE settings/settings_type.h settings/settings_websites.cpp settings/settings_websites.h - statistics/chart_header_widget.cpp - statistics/chart_header_widget.h - statistics/chart_horizontal_lines_data.cpp - statistics/chart_horizontal_lines_data.h - statistics/chart_lines_filter_controller.cpp - statistics/chart_lines_filter_controller.h - statistics/chart_widget.cpp - statistics/chart_widget.h - statistics/point_details_widget.cpp - statistics/point_details_widget.h statistics/statistics_box.cpp statistics/statistics_box.h - statistics/statistics_common.h - statistics/statistics_data_deserialize.cpp - statistics/statistics_data_deserialize.h - statistics/view/abstract_chart_view.h - statistics/view/chart_horizontal_lines_view.cpp - statistics/view/chart_horizontal_lines_view.h - statistics/view/chart_view_factory.cpp - statistics/view/chart_view_factory.h - statistics/view/linear_chart_view.cpp - statistics/view/linear_chart_view.h - statistics/view/stack_chart_common.cpp - statistics/view/stack_chart_common.h - statistics/view/stack_chart_view.cpp - statistics/view/stack_chart_view.h - statistics/view/stack_linear_chart_view.cpp - statistics/view/stack_linear_chart_view.h storage/details/storage_file_utilities.cpp storage/details/storage_file_utilities.h storage/details/storage_settings_scheme.cpp diff --git a/Telegram/SourceFiles/statistics/chart_widget.h b/Telegram/SourceFiles/statistics/chart_widget.h index 2a6aa0f0b..12be7952d 100644 --- a/Telegram/SourceFiles/statistics/chart_widget.h +++ b/Telegram/SourceFiles/statistics/chart_widget.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "data/data_statistics.h" +#include "data/data_statistics_chart.h" #include "statistics/view/chart_horizontal_lines_view.h" #include "statistics/statistics_common.h" #include "ui/effects/animation_value.h" diff --git a/Telegram/SourceFiles/statistics/point_details_widget.cpp b/Telegram/SourceFiles/statistics/point_details_widget.cpp index 19c2e309d..893c7d6d4 100644 --- a/Telegram/SourceFiles/statistics/point_details_widget.cpp +++ b/Telegram/SourceFiles/statistics/point_details_widget.cpp @@ -15,6 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_layers.h" #include "styles/style_statistics.h" +#include + namespace Statistic { namespace { diff --git a/Telegram/SourceFiles/statistics/point_details_widget.h b/Telegram/SourceFiles/statistics/point_details_widget.h index 81253a4d9..0023b6a59 100644 --- a/Telegram/SourceFiles/statistics/point_details_widget.h +++ b/Telegram/SourceFiles/statistics/point_details_widget.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "data/data_statistics.h" +#include "data/data_statistics_chart.h" #include "ui/widgets/buttons.h" namespace Statistic { diff --git a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp index 8c2e3b395..64534ebfb 100644 --- a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp +++ b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp @@ -7,7 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "statistics/statistics_data_deserialize.h" -#include "data/data_statistics.h" +#include "base/debug_log.h" +#include "data/data_statistics_chart.h" #include #include diff --git a/Telegram/SourceFiles/statistics/view/chart_horizontal_lines_view.cpp b/Telegram/SourceFiles/statistics/view/chart_horizontal_lines_view.cpp index 947303715..61c6d8077 100644 --- a/Telegram/SourceFiles/statistics/view/chart_horizontal_lines_view.cpp +++ b/Telegram/SourceFiles/statistics/view/chart_horizontal_lines_view.cpp @@ -7,8 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "statistics/view/chart_horizontal_lines_view.h" -#include "data/data_statistics.h" +#include "data/data_statistics_chart.h" #include "statistics/statistics_common.h" +#include "styles/style_basic.h" #include "styles/style_statistics.h" namespace Statistic { diff --git a/Telegram/SourceFiles/statistics/view/linear_chart_view.cpp b/Telegram/SourceFiles/statistics/view/linear_chart_view.cpp index ed697cbdf..acf0082bd 100644 --- a/Telegram/SourceFiles/statistics/view/linear_chart_view.cpp +++ b/Telegram/SourceFiles/statistics/view/linear_chart_view.cpp @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "statistics/view/linear_chart_view.h" -#include "data/data_statistics.h" +#include "data/data_statistics_chart.h" #include "statistics/chart_lines_filter_controller.h" #include "statistics/statistics_common.h" #include "ui/effects/animation_value_f.h" diff --git a/Telegram/SourceFiles/statistics/view/stack_chart_common.cpp b/Telegram/SourceFiles/statistics/view/stack_chart_common.cpp index 040025985..f1a8b0072 100644 --- a/Telegram/SourceFiles/statistics/view/stack_chart_common.cpp +++ b/Telegram/SourceFiles/statistics/view/stack_chart_common.cpp @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "statistics/view/stack_chart_common.h" -#include "data/data_statistics.h" +#include "data/data_statistics_chart.h" #include "statistics/statistics_common.h" #include "ui/effects/animation_value_f.h" diff --git a/Telegram/SourceFiles/statistics/view/stack_chart_view.cpp b/Telegram/SourceFiles/statistics/view/stack_chart_view.cpp index 5e4fec2cd..c3a5f0276 100644 --- a/Telegram/SourceFiles/statistics/view/stack_chart_view.cpp +++ b/Telegram/SourceFiles/statistics/view/stack_chart_view.cpp @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "statistics/view/stack_chart_view.h" -#include "data/data_statistics.h" +#include "data/data_statistics_chart.h" #include "statistics/chart_lines_filter_controller.h" #include "statistics/view/stack_chart_common.h" #include "ui/effects/animation_value_f.h" diff --git a/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp b/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp index 1f3df8257..7e61fca02 100644 --- a/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp +++ b/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "statistics/view/stack_linear_chart_view.h" -#include "data/data_statistics.h" +#include "data/data_statistics_chart.h" #include "statistics/chart_lines_filter_controller.h" #include "statistics/point_details_widget.h" #include "statistics/view/stack_chart_common.h" diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake index 5be52bf69..7ae8259bb 100644 --- a/Telegram/cmake/td_ui.cmake +++ b/Telegram/cmake/td_ui.cmake @@ -161,10 +161,36 @@ PRIVATE platform/mac/file_bookmark_mac.mm platform/platform_file_bookmark.h + statistics/chart_header_widget.cpp + statistics/chart_header_widget.h + statistics/chart_horizontal_lines_data.cpp + statistics/chart_horizontal_lines_data.h + statistics/chart_lines_filter_controller.cpp + statistics/chart_lines_filter_controller.h statistics/chart_lines_filter_widget.cpp statistics/chart_lines_filter_widget.h + statistics/chart_widget.cpp + statistics/chart_widget.h + statistics/point_details_widget.cpp + statistics/point_details_widget.h statistics/segment_tree.cpp statistics/segment_tree.h + statistics/statistics_common.h + statistics/statistics_data_deserialize.cpp + statistics/statistics_data_deserialize.h + statistics/view/abstract_chart_view.h + statistics/view/chart_horizontal_lines_view.cpp + statistics/view/chart_horizontal_lines_view.h + statistics/view/chart_view_factory.cpp + statistics/view/chart_view_factory.h + statistics/view/linear_chart_view.cpp + statistics/view/linear_chart_view.h + statistics/view/stack_chart_common.cpp + statistics/view/stack_chart_common.h + statistics/view/stack_chart_view.cpp + statistics/view/stack_chart_view.h + statistics/view/stack_linear_chart_view.cpp + statistics/view/stack_linear_chart_view.h ui/boxes/auto_delete_settings.cpp ui/boxes/auto_delete_settings.h