From c9ebec1cf057d5ae4f51725306f3fa7fd4d7083c Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Mon, 14 Mar 2022 19:56:55 +0300 Subject: [PATCH] Removed base/observer.h from main pch. Removed unused inheritances from base::Subscriber. --- Telegram/SourceFiles/facades.cpp | 1 - Telegram/SourceFiles/facades.h | 1 - .../SourceFiles/history/admin_log/history_admin_log_inner.h | 3 +-- Telegram/SourceFiles/history/view/history_view_list_widget.h | 3 +-- Telegram/SourceFiles/media/audio/media_audio.h | 1 + Telegram/SourceFiles/media/player/media_player_float.h | 1 + Telegram/SourceFiles/media/player/media_player_instance.h | 1 + Telegram/SourceFiles/media/player/media_player_widget.h | 2 +- .../SourceFiles/media/streaming/media_streaming_audio_track.h | 1 + Telegram/SourceFiles/stdafx.h | 1 - Telegram/SourceFiles/window/notifications_manager.h | 1 + Telegram/SourceFiles/window/section_widget.h | 3 +-- Telegram/SourceFiles/window/themes/window_theme_editor_block.h | 1 + Telegram/SourceFiles/window/window_session_controller.h | 1 + 14 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index f79655a0df..9045bab177 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -27,7 +27,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/url_auth_box.h" #include "ui/layers/layer_widget.h" #include "lang/lang_keys.h" -#include "base/observer.h" #include "history/history.h" #include "history/history_item.h" #include "history/view/media/history_view_media.h" diff --git a/Telegram/SourceFiles/facades.h b/Telegram/SourceFiles/facades.h index 5c9fdcbff6..af145d7cf6 100644 --- a/Telegram/SourceFiles/facades.h +++ b/Telegram/SourceFiles/facades.h @@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "base/type_traits.h" -#include "base/observer.h" #include "base/call_delayed.h" #include "mtproto/mtproto_proxy_data.h" diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h index c5a5c0cdf7..f1f359e854 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h @@ -50,8 +50,7 @@ class SectionMemento; class InnerWidget final : public Ui::RpWidget , public Ui::AbstractTooltipShower - , public HistoryView::ElementDelegate - , private base::Subscriber { + , public HistoryView::ElementDelegate { public: InnerWidget( QWidget *parent, diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h index b1ffcfedfc..403c060f8c 100644 --- a/Telegram/SourceFiles/history/view/history_view_list_widget.h +++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h @@ -169,8 +169,7 @@ private: class ListWidget final : public Ui::RpWidget , public ElementDelegate - , public Ui::AbstractTooltipShower - , private base::Subscriber { + , public Ui::AbstractTooltipShower { public: ListWidget( QWidget *parent, diff --git a/Telegram/SourceFiles/media/audio/media_audio.h b/Telegram/SourceFiles/media/audio/media_audio.h index 46dd1175da..793e0d2e8d 100644 --- a/Telegram/SourceFiles/media/audio/media_audio.h +++ b/Telegram/SourceFiles/media/audio/media_audio.h @@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/file_location.h" #include "data/data_audio_msg_id.h" #include "base/bytes.h" +#include "base/observer.h" #include "base/timer.h" #include diff --git a/Telegram/SourceFiles/media/player/media_player_float.h b/Telegram/SourceFiles/media/player/media_player_float.h index 6c3b0109e4..fc7eebf267 100644 --- a/Telegram/SourceFiles/media/player/media_player_float.h +++ b/Telegram/SourceFiles/media/player/media_player_float.h @@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/rect_part.h" #include "ui/effects/animations.h" #include "base/object_ptr.h" +#include "base/observer.h" namespace Window { class SessionController; diff --git a/Telegram/SourceFiles/media/player/media_player_instance.h b/Telegram/SourceFiles/media/player/media_player_instance.h index b99afcea79..bdc1078c0d 100644 --- a/Telegram/SourceFiles/media/player/media_player_instance.h +++ b/Telegram/SourceFiles/media/player/media_player_instance.h @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include "base/observer.h" #include "data/data_audio_msg_id.h" #include "data/data_shared_media.h" diff --git a/Telegram/SourceFiles/media/player/media_player_widget.h b/Telegram/SourceFiles/media/player/media_player_widget.h index bd8debcbe4..4d0de39599 100644 --- a/Telegram/SourceFiles/media/player/media_player_widget.h +++ b/Telegram/SourceFiles/media/player/media_player_widget.h @@ -41,7 +41,7 @@ class SpeedButton; class Dropdown; struct TrackState; -class Widget final : public Ui::RpWidget, private base::Subscriber { +class Widget final : public Ui::RpWidget { public: Widget( QWidget *parent, diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.h b/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.h index e0ecedfc04..8620f8d7b6 100644 --- a/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.h +++ b/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.h @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include "base/observer.h" #include "media/streaming/media_streaming_utility.h" namespace Media { diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h index f119159b81..0f4e4eebfd 100644 --- a/Telegram/SourceFiles/stdafx.h +++ b/Telegram/SourceFiles/stdafx.h @@ -115,7 +115,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/flat_set.h" #include "base/flat_map.h" #include "base/weak_ptr.h" -#include "base/observer.h" #include "base/basic_types.h" #include "logs.h" diff --git a/Telegram/SourceFiles/window/notifications_manager.h b/Telegram/SourceFiles/window/notifications_manager.h index 73022607dd..a6b7fb2bde 100644 --- a/Telegram/SourceFiles/window/notifications_manager.h +++ b/Telegram/SourceFiles/window/notifications_manager.h @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include "base/observer.h" #include "base/timer.h" class History; diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h index 364f9df112..cc9f692d28 100644 --- a/Telegram/SourceFiles/window/section_widget.h +++ b/Telegram/SourceFiles/window/section_widget.h @@ -40,8 +40,7 @@ enum class Column { class AbstractSectionWidget : public Ui::RpWidget - , public Media::Player::FloatSectionDelegate - , protected base::Subscriber { + , public Media::Player::FloatSectionDelegate { public: AbstractSectionWidget( QWidget *parent, diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.h b/Telegram/SourceFiles/window/themes/window_theme_editor_block.h index 8352e41b05..a0629d5806 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.h +++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.h @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include "base/observer.h" #include "ui/rp_widget.h" class EditColorBox; diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h index b6abcdc62c..f22f34033a 100644 --- a/Telegram/SourceFiles/window/window_session_controller.h +++ b/Telegram/SourceFiles/window/window_session_controller.h @@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/flags.h" #include "base/object_ptr.h" +#include "base/observer.h" #include "base/weak_ptr.h" #include "base/timer.h" #include "dialogs/dialogs_key.h"