diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index eb62dd8f45..08d387b17c 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -40,7 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/sticker_set_box.h" #include "window/notifications_manager.h" #include "window/window_lock_widgets.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/themes/window_theme.h" #include "inline_bots/inline_bot_result.h" #include "chat_helpers/message_field.h" @@ -442,7 +442,7 @@ void ApiWrap::importChatInvite(const QString &hash) { return PeerId(0); }); if (const auto peer = _session->data().peerLoaded(peerId)) { - App::wnd()->controller()->showPeerHistory( + App::wnd()->sessionController()->showPeerHistory( peer, Window::SectionShow::Way::Forward); } @@ -3903,7 +3903,7 @@ void ApiWrap::jumpToHistoryDate(not_null peer, const QDate &date) { //void ApiWrap::jumpToFeedDate(not_null feed, const QDate &date) { // requestMessageAfterDate(feed, date, [=](Data::MessagePosition result) { // Ui::hideLayer(); -// App::wnd()->controller()->showSection( +// App::wnd()->sessionController()->showSection( // HistoryFeed::Memento(feed, result)); // }); //} diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp index 18874569a0..4ad95ac0b3 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.cpp +++ b/Telegram/SourceFiles/boxes/confirm_box.cpp @@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/image/image.h" #include "ui/empty_userpic.h" #include "core/click_handler_types.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "storage/localstorage.h" #include "data/data_session.h" #include "data/data_photo.h" @@ -712,7 +712,7 @@ void DeleteMessagesBox::deleteAndClear() { if (justClear) { peer->session().api().clearHistory(peer, revoke); } else { - const auto controller = App::wnd()->controller(); + const auto controller = App::wnd()->sessionController(); if (controller->activeChatCurrent().peer() == peer) { Ui::showChatsList(); } diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index 110680a618..0fce6d4037 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -34,13 +34,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/special_buttons.h" #include "ui/text_options.h" #include "ui/widgets/input_fields.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "ui/widgets/checkbox.h" #include "confirm_box.h" EditCaptionBox::EditCaptionBox( QWidget*, - not_null controller, + not_null controller, not_null item) : _controller(controller) , _msgId(item->fullId()) { diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.h b/Telegram/SourceFiles/boxes/edit_caption_box.h index 0676c7353e..c44d2b9392 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.h +++ b/Telegram/SourceFiles/boxes/edit_caption_box.h @@ -17,7 +17,7 @@ class TabbedPanel; } // namespace ChatHelpers namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Data { @@ -32,14 +32,14 @@ class Checkbox; } // namespace Ui namespace Window { -class Controller; +class SessionController; } // namespace Window class EditCaptionBox : public BoxContent, public RPCSender { public: EditCaptionBox( QWidget*, - not_null controller, + not_null controller, not_null item); protected: @@ -80,7 +80,7 @@ private: : _preparedList.files.front().path; } - not_null _controller; + not_null _controller; FullMsgId _msgId; Image *_thumbnailImage = nullptr; bool _thumbnailImageLoaded = false; diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp index fdb70e9056..d5ad67c9ff 100644 --- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp @@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "auth_session.h" #include "mainwidget.h" #include "mainwindow.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "apiwrap.h" #include "observer_peer.h" @@ -222,7 +222,7 @@ void AddParticipantsBoxController::Start( box->boxClosing() | rpl::start_with_next([=] { auto params = Window::SectionShow(); params.activation = anim::activation::background; - App::wnd()->controller()->showPeerHistory( + App::wnd()->sessionController()->showPeerHistory( channel, params, ShowAtTheEndMsgId); diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp index d8f5ae79f7..a158fed5f9 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp @@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_chat.h" #include "data/data_user.h" #include "ui/widgets/popup_menu.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "history/history.h" namespace { @@ -706,7 +706,7 @@ ParticipantsBoxController::SavedState::SavedState( } ParticipantsBoxController::ParticipantsBoxController( - not_null navigation, + not_null navigation, not_null peer, Role role) : PeerListController(CreateSearchController(peer, role, &_additional)) @@ -775,7 +775,7 @@ auto ParticipantsBoxController::CreateSearchController( } void ParticipantsBoxController::Start( - not_null navigation, + not_null navigation, not_null peer, Role role) { auto controller = std::make_unique( diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h index 3e5dfb3f44..6ba83770ac 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h +++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h @@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "info/profile/info_profile_members_controllers.h" namespace Window { -class Navigation; +class SessionNavigation; } // namespace Window Fn navigation, + not_null navigation, not_null peer, Role role); ParticipantsBoxController( - not_null navigation, + not_null navigation, not_null peer, Role role); @@ -227,7 +227,7 @@ private: void subscribeToMigration(); void migrate(not_null channel); - not_null _navigation; + not_null _navigation; not_null _peer; Role _role = Role::Admins; int _offset = 0; diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp index 023ce38526..14ce6034bc 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp @@ -42,7 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/wrap/padding_wrap.h" #include "ui/wrap/slide_wrap.h" #include "ui/wrap/vertical_layout.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include #include #include "info/profile/info_profile_icon.h" @@ -718,7 +718,7 @@ void Controller::fillHistoryVisibilityButton() { void Controller::fillManageSection() { Expects(_controls.buttonsLayout != nullptr); - const auto navigation = App::wnd()->controller(); + const auto navigation = App::wnd()->sessionController(); const auto chat = _peer->asChat(); const auto channel = _peer->asChannel(); diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp index 0d889dbf21..485121eb58 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp @@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "info/profile/info_profile_values.h" #include "boxes/peers/edit_participants_box.h" #include "boxes/peers/edit_peer_info_box.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "mainwindow.h" #include "styles/style_boxes.h" #include "styles/style_info.h" @@ -356,7 +356,7 @@ void EditPeerPermissionsBox::addBannedButtons( object_ptr(container), { 0, st::infoProfileSkip, 0, st::infoProfileSkip }); - const auto navigation = App::wnd()->controller(); + const auto navigation = App::wnd()->sessionController(); container->add(EditPeerInfoBox::CreateButton( container, Lang::Viewer(lng_manage_peer_exceptions), diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp index cf6ac57c2d..f6929ded1c 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp @@ -36,7 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/wrap/padding_wrap.h" #include "ui/wrap/slide_wrap.h" #include "ui/wrap/vertical_layout.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include namespace { diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp index d40ea4efb2..0622550647 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.cpp +++ b/Telegram/SourceFiles/boxes/send_files_box.cpp @@ -29,7 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/special_buttons.h" #include "data/data_document.h" #include "media/clip/media_clip_reader.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "layout.h" #include "styles/style_history.h" #include "styles/style_boxes.h" @@ -46,12 +46,12 @@ class SingleMediaPreview : public Ui::RpWidget { public: static SingleMediaPreview *Create( QWidget *parent, - not_null controller, + not_null controller, const Storage::PreparedFile &file); SingleMediaPreview( QWidget *parent, - not_null controller, + not_null controller, QImage preview, bool animated, bool sticker, @@ -73,7 +73,7 @@ private: void prepareAnimatedPreview(const QString &animatedPreviewPath); void clipCallback(Media::Clip::Notification notification); - not_null _controller; + not_null _controller; bool _animated = false; bool _sticker = false; bool _canSendAsPhoto = false; @@ -568,7 +568,7 @@ void AlbumThumb::finishAnimations() { SingleMediaPreview *SingleMediaPreview::Create( QWidget *parent, - not_null controller, + not_null controller, const Storage::PreparedFile &file) { auto preview = QImage(); bool animated = false; @@ -602,7 +602,7 @@ SingleMediaPreview *SingleMediaPreview::Create( SingleMediaPreview::SingleMediaPreview( QWidget *parent, - not_null controller, + not_null controller, QImage preview, bool animated, bool sticker, @@ -1337,7 +1337,7 @@ void SendFilesBox::AlbumPreview::mouseReleaseEvent(QMouseEvent *e) { SendFilesBox::SendFilesBox( QWidget*, - not_null controller, + not_null controller, Storage::PreparedList &&list, const TextWithTags &caption, CompressConfirm compressed) diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h index 00cad0a3ba..8395e12c1c 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.h +++ b/Telegram/SourceFiles/boxes/send_files_box.h @@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/storage_media_prepare.h" namespace Window { -class Controller; +class SessionController; } // namespace Window namespace ChatHelpers { @@ -32,7 +32,7 @@ class EmojiButton; } // namespace Ui namespace Window { -class Controller; +class SessionController; } // namespace Window enum class SendFilesWay { @@ -45,7 +45,7 @@ class SendFilesBox : public BoxContent { public: SendFilesBox( QWidget*, - not_null controller, + not_null controller, Storage::PreparedList &&list, const TextWithTags &caption, CompressConfirm compressed); @@ -107,7 +107,7 @@ private: bool canAddUrls(const QList &urls) const; bool addFiles(not_null data); - not_null _controller; + not_null _controller; QString _titleText; int _titleHeight = 0; diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp index 8db6c83fb9..e7c5a1d5af 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp @@ -379,7 +379,7 @@ void EmojiColorPicker::drawVariant(Painter &p, int variant) { EmojiListWidget::EmojiListWidget( QWidget *parent, - not_null controller) + not_null controller) : Inner(parent, controller) , _picker(this) , _showPickerTimer([=] { showPicker(); }) { diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h index 0a63ed4173..277e810e90 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h +++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h @@ -18,7 +18,7 @@ enum class Section; } // namespace Ui namespace Window { -class Controller; +class SessionController; } // namespace Window namespace ChatHelpers { @@ -33,7 +33,7 @@ class EmojiListWidget public: EmojiListWidget( QWidget *parent, - not_null controller); + not_null controller); using Section = Ui::Emoji::Section; diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp index 5f772fc567..5883e6aee1 100644 --- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp @@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/localstorage.h" #include "lang/lang_keys.h" #include "mainwindow.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "history/view/history_view_cursor_state.h" namespace ChatHelpers { @@ -124,7 +124,7 @@ void GifsListWidget::Footer::processPanelHideFinished() { GifsListWidget::GifsListWidget( QWidget *parent, - not_null controller) + not_null controller) : Inner(parent, controller) , _section(Section::Gifs) , _updateInlineItems([=] { updateInlineItems(); }) @@ -133,7 +133,11 @@ GifsListWidget::GifsListWidget( setAttribute(Qt::WA_OpaquePaintEvent); _inlineRequestTimer.setSingleShot(true); - connect(&_inlineRequestTimer, &QTimer::timeout, this, [this] { sendInlineRequest(); }); + connect( + &_inlineRequestTimer, + &QTimer::timeout, + this, + [=] { sendInlineRequest(); }); Auth().data().savedGifsUpdated( ) | rpl::start_with_next([this] { @@ -142,8 +146,9 @@ GifsListWidget::GifsListWidget( subscribe(Auth().downloaderTaskFinished(), [this] { update(); }); - subscribe(controller->gifPauseLevelChanged(), [this] { - if (!this->controller()->isGifPausedAtLeastFor(Window::GifPauseReason::SavedGifs)) { + subscribe(controller->gifPauseLevelChanged(), [=] { + if (!controller->isGifPausedAtLeastFor( + Window::GifPauseReason::SavedGifs)) { update(); } }); diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h index 6cb0f239e9..e0955761f5 100644 --- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h +++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h @@ -23,7 +23,7 @@ class RoundButton; } // namespace Ui namespace Window { -class Controller; +class SessionController; } // namespace Window namespace ChatHelpers { @@ -36,7 +36,7 @@ class GifsListWidget public: using InlineChosen = TabbedSelector::InlineChosen; - GifsListWidget(QWidget *parent, not_null controller); + GifsListWidget(QWidget *parent, not_null controller); rpl::producer> fileChosen() const; rpl::producer> photoChosen() const; diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp index 96aa311258..11d56d5ad7 100644 --- a/Telegram/SourceFiles/chat_helpers/message_field.cpp +++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp @@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_session.h" #include "data/data_user.h" #include "chat_helpers/emoji_suggestions_widget.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "lang/lang_keys.h" #include "mainwindow.h" #include "auth_session.h" @@ -353,9 +353,8 @@ Fn controller, + not_null controller, not_null field) { field->setMinHeight(st::historySendSize.height() - 2 * st::historySendPadding); field->setMaxHeight(st::historyComposeFieldMaxHeight); diff --git a/Telegram/SourceFiles/chat_helpers/message_field.h b/Telegram/SourceFiles/chat_helpers/message_field.h index f047c01ed5..8fac28b235 100644 --- a/Telegram/SourceFiles/chat_helpers/message_field.h +++ b/Telegram/SourceFiles/chat_helpers/message_field.h @@ -11,8 +11,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer.h" class HistoryWidget; + namespace Window { -class Controller; +class SessionController; } // namespace Window QString ConvertTagToMimeTag(const QString &tagId); @@ -34,7 +35,7 @@ Fn DefaultEditLinkCallback( not_null field); void InitMessageField( - not_null controller, + not_null controller, not_null field); bool HasSendText(not_null field); diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index 51f6de13a3..9587ba2e48 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -697,7 +697,10 @@ bool StickersListWidget::Footer::iconsAnimationCallback(crl::time now) { return (_iconsStartAnim != 0); } -StickersListWidget::StickersListWidget(QWidget *parent, not_null controller) : Inner(parent, controller) +StickersListWidget::StickersListWidget( + QWidget *parent, + not_null controller) +: Inner(parent, controller) , _section(Section::Stickers) , _megagroupSetAbout(st::columnMinimalWidthThird - st::emojiScroll.width - st::emojiPanHeaderLeft) , _addText(lang(lng_stickers_featured_add).toUpper()) diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h index 43665092e7..d87f880e6c 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h @@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer.h" namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Ui { @@ -32,7 +32,7 @@ class StickersListWidget public: StickersListWidget( QWidget *parent, - not_null controller); + not_null controller); rpl::producer> chosen() const; rpl::producer<> scrollUpdated() const; diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp index c18992b5c3..59fa446c50 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp @@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/shadow.h" #include "ui/image/image_prepare.h" #include "chat_helpers/tabbed_selector.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "mainwindow.h" #include "core/application.h" #include "core/qt_signal_producer.h" @@ -26,7 +26,7 @@ constexpr auto kDelayedHideTimeoutMs = 3000; TabbedPanel::TabbedPanel( QWidget *parent, - not_null controller) + not_null controller) : TabbedPanel( parent, controller, @@ -35,7 +35,7 @@ TabbedPanel::TabbedPanel( TabbedPanel::TabbedPanel( QWidget *parent, - not_null controller, + not_null controller, object_ptr selector) : RpWidget(parent) , _controller(controller) diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h index 053eae7f4b..7a04003caf 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h +++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h @@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer.h" namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Ui { @@ -25,10 +25,10 @@ class TabbedSelector; class TabbedPanel : public Ui::RpWidget { public: - TabbedPanel(QWidget *parent, not_null controller); + TabbedPanel(QWidget *parent, not_null controller); TabbedPanel( QWidget *parent, - not_null controller, + not_null controller, object_ptr selector); object_ptr takeSelector(); @@ -87,7 +87,7 @@ private: bool preventAutoHide() const; void updateContentHeight(); - not_null _controller; + not_null _controller; object_ptr _selector; int _contentMaxHeight = 0; diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp index a513369e75..a3c659554f 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp @@ -21,7 +21,7 @@ TabbedMemento::TabbedMemento( object_ptr TabbedMemento::createWidget( QWidget *parent, - not_null controller, + not_null controller, Window::Column column, const QRect &geometry) { auto result = object_ptr( @@ -41,7 +41,7 @@ TabbedMemento::~TabbedMemento() { TabbedSection::TabbedSection( QWidget *parent, - not_null controller) + not_null controller) : TabbedSection( parent, controller, @@ -51,7 +51,7 @@ TabbedSection::TabbedSection( TabbedSection::TabbedSection( QWidget *parent, - not_null controller, + not_null controller, object_ptr selector, Fn)> returnMethod) : Window::SectionWidget(parent, controller) diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_section.h b/Telegram/SourceFiles/chat_helpers/tabbed_section.h index 1593057ed0..a7b84a28a9 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_section.h +++ b/Telegram/SourceFiles/chat_helpers/tabbed_section.h @@ -24,7 +24,7 @@ public: object_ptr createWidget( QWidget *parent, - not_null controller, + not_null controller, Window::Column column, const QRect &geometry) override; @@ -40,10 +40,10 @@ class TabbedSection : public Window::SectionWidget { public: TabbedSection( QWidget *parent, - not_null controller); + not_null controller); TabbedSection( QWidget *parent, - not_null controller, + not_null controller, object_ptr selector, Fn)> returnMethod); diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp index f4e0f362c7..d4fb392354 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp @@ -276,7 +276,7 @@ void TabbedSelector::Tab::saveScrollTop() { TabbedSelector::TabbedSelector( QWidget *parent, - not_null controller, + not_null controller, Mode mode) : RpWidget(parent) , _mode(mode) @@ -368,7 +368,7 @@ TabbedSelector::TabbedSelector( showAll(); } -TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, not_null controller) { +TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, not_null controller) { auto createWidget = [&]() -> object_ptr { if (!full() && type != SelectorTab::Emoji) { return { nullptr }; @@ -872,7 +872,7 @@ void TabbedSelector::scrollToY(int y) { TabbedSelector::Inner::Inner( QWidget *parent, - not_null controller) + not_null controller) : RpWidget(parent) , _controller(controller) { } diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h index 0d8aa35411..d834027adc 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h +++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h @@ -25,7 +25,7 @@ class FlatLabel; } // namesapce Ui namespace Window { -class Controller; +class SessionController; } // namespace Window namespace ChatHelpers { @@ -53,7 +53,7 @@ public: TabbedSelector( QWidget *parent, - not_null controller, + not_null controller, Mode mode = Mode::Full); rpl::producer emojiChosen() const; @@ -148,7 +148,7 @@ private: bool full() const; Tab createTab( SelectorTab type, - not_null controller); + not_null controller); void paintSlideFrame(Painter &p); void paintContent(Painter &p); @@ -212,7 +212,7 @@ private: class TabbedSelector::Inner : public Ui::RpWidget { public: - Inner(QWidget *parent, not_null controller); + Inner(QWidget *parent, not_null controller); int getVisibleTop() const { return _visibleTop; @@ -246,7 +246,7 @@ protected: int minimalHeight() const; int resizeGetHeight(int newWidth) override final; - not_null controller() const { + not_null controller() const { return _controller; } @@ -261,7 +261,7 @@ protected: void disableScroll(bool disabled); private: - not_null _controller; + not_null _controller; int _visibleTop = 0; int _visibleBottom = 0; diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp index f45ae50b71..be7376de96 100644 --- a/Telegram/SourceFiles/core/application.cpp +++ b/Telegram/SourceFiles/core/application.cpp @@ -52,7 +52,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/emoji_config.h" #include "ui/effects/animations.h" #include "storage/serialize_common.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "base/qthelp_regex.h" #include "base/qthelp_url.h" #include "boxes/connection_box.h" diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp index d2ccbbc4a7..3c644ede0d 100644 --- a/Telegram/SourceFiles/core/local_url_handlers.cpp +++ b/Telegram/SourceFiles/core/local_url_handlers.cpp @@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/connection_box.h" #include "boxes/sticker_set_box.h" #include "passport/passport_form_controller.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "data/data_session.h" #include "data/data_channel.h" #include "mainwindow.h" @@ -46,7 +46,7 @@ bool JoinGroupByHash(const Match &match, const QVariant &context) { })); }, [=](const MTPDchatInviteAlready &data) { if (const auto chat = Auth().data().processChat(data.vchat)) { - App::wnd()->controller()->showPeerHistory( + App::wnd()->sessionController()->showPeerHistory( chat, Window::SectionShow::Way::Forward); } @@ -145,7 +145,7 @@ bool ShowPassportForm(const QMap ¶ms) { QString()); const auto errors = params.value("errors", QString()); if (const auto window = App::wnd()) { - if (const auto controller = window->controller()) { + if (const auto controller = window->sessionController()) { controller->showPassportForm(Passport::FormRequest( botId, scope, @@ -240,7 +240,7 @@ bool ResolvePrivatePost(const Match &match, const QVariant &context) { return false; } const auto done = [=](not_null peer) { - App::wnd()->controller()->showPeerHistory( + App::wnd()->sessionController()->showPeerHistory( peer->id, Window::SectionShow::Way::Forward, msgId); diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp index 0d4c390d30..6916e0b71a 100644 --- a/Telegram/SourceFiles/core/update_checker.cpp +++ b/Telegram/SourceFiles/core/update_checker.cpp @@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/click_handler_types.h" #include "info/info_memento.h" #include "info/settings/info_settings_widget.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "settings/settings_intro.h" extern "C" { @@ -1577,7 +1577,7 @@ void UpdateApplication() { } else { cSetAutoUpdate(true); if (const auto window = App::wnd()) { - if (const auto controller = window->controller()) { + if (const auto controller = window->sessionController()) { controller->showSection( Info::Memento( Info::Settings::Tag{ Auth().user() }, diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp index e2df5f6997..cf646d1d03 100644 --- a/Telegram/SourceFiles/data/data_document.cpp +++ b/Telegram/SourceFiles/data/data_document.cpp @@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/platform_specific.h" #include "history/history.h" #include "history/history_item.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "storage/cache/storage_cache_database.h" #include "boxes/confirm_box.h" #include "ui/image/image.h" diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp index db56318ae4..8e2d3632bd 100644 --- a/Telegram/SourceFiles/data/data_peer.cpp +++ b/Telegram/SourceFiles/data/data_peer.cpp @@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "auth_session.h" #include "core/application.h" #include "mainwindow.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "ui/image/image.h" #include "ui/empty_userpic.h" #include "ui/text_options.h" @@ -77,7 +77,7 @@ PeerClickHandler::PeerClickHandler(not_null peer) void PeerClickHandler::onClick(ClickContext context) const { if (context.button == Qt::LeftButton && App::wnd()) { - auto controller = App::wnd()->controller(); + const auto controller = App::wnd()->sessionController(); if (_peer && _peer->isChannel() && controller->activeChatCurrent().peer() != _peer) { diff --git a/Telegram/SourceFiles/data/data_shared_media.cpp b/Telegram/SourceFiles/data/data_shared_media.cpp index e3304688c2..1b5534247e 100644 --- a/Telegram/SourceFiles/data/data_shared_media.cpp +++ b/Telegram/SourceFiles/data/data_shared_media.cpp @@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_session.h" #include "info/info_memento.h" #include "info/info_controller.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "mainwindow.h" #include "core/crash_reports.h" @@ -47,7 +47,7 @@ void SharedMediaShowOverview( Storage::SharedMediaType type, not_null history) { if (SharedMediaOverviewType(type)) { - App::wnd()->controller()->showSection(Info::Memento( + App::wnd()->sessionController()->showSection(Info::Memento( history->peer->id, Info::Section(type))); } diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp index b695458893..069820ae67 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp @@ -34,7 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "chat_helpers/stickers.h" #include "auth_session.h" #include "window/notifications_manager.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/window_peer_menu.h" #include "ui/widgets/multi_select.h" #include "ui/empty_userpic.h" @@ -98,7 +98,7 @@ struct InnerWidget::PeerSearchResult { InnerWidget::InnerWidget( QWidget *parent, - not_null controller) + not_null controller) : RpWidget(parent) , _controller(controller) , _pinnedShiftAnimation([=](crl::time now) { diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h index 15633234ee..f6010b8e41 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h @@ -22,7 +22,7 @@ class LinkButton; } // namespace Ui namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Dialogs { @@ -58,7 +58,9 @@ class InnerWidget Q_OBJECT public: - InnerWidget(QWidget *parent, not_null controller); + InnerWidget( + QWidget *parent, + not_null controller); bool searchReceived( const QVector &result, @@ -291,7 +293,7 @@ private: bool pinnedShiftAnimationCallback(crl::time now); void handleChatMigration(not_null chat); - not_null _controller; + not_null _controller; Mode _mode = Mode(); bool _mouseSelection = false; diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp index 61dc85a454..6e110c08b7 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp @@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Dialogs { void ShowSearchFromBox( - not_null navigation, + not_null navigation, not_null peer, Fn)> callback, Fn closedCallback) { @@ -50,7 +50,7 @@ void ShowSearchFromBox( } SearchFromController::SearchFromController( - not_null navigation, + not_null navigation, not_null peer, Fn)> callback) : ParticipantsBoxController( diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h index 8153c5f202..3a45b7b5cb 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h +++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h @@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Dialogs { void ShowSearchFromBox( - not_null navigation, + not_null navigation, not_null peer, Fn)> callback, Fn closedCallback); @@ -21,7 +21,7 @@ void ShowSearchFromBox( class SearchFromController : public ParticipantsBoxController { public: SearchFromController( - not_null navigation, + not_null navigation, not_null peer, Fn)> callback); diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index dfa2fb63f4..eea92a1cfc 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -28,7 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/update_checker.h" #include "boxes/peer_list_box.h" #include "boxes/peers/edit_participants_box.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/window_slide_animation.h" #include "window/window_connecting_widget.h" #include "storage/storage_media_prepare.h" @@ -150,7 +150,9 @@ void Widget::BottomButton::paintEvent(QPaintEvent *e) { } } -Widget::Widget(QWidget *parent, not_null controller) +Widget::Widget( + QWidget *parent, + not_null controller) : Window::AbstractSectionWidget(parent, controller) , _searchControls(this) , _mainMenuToggle(_searchControls, st::dialogsMenuToggle) @@ -1276,7 +1278,7 @@ void Widget::clearSearchCache() { void Widget::showJumpToDate() { if (_searchInChat) { - this->controller()->showJumpToDate(_searchInChat, QDate()); + controller()->showJumpToDate(_searchInChat, QDate()); } } diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h index e17e76be7d..0d4da4fa8c 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.h +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h @@ -31,7 +31,7 @@ class FadeWrapScaled; } // namespace Ui namespace Window { -class Controller; +class SessionController; class ConnectionState; } // namespace Window @@ -49,7 +49,7 @@ class Widget : public Window::AbstractSectionWidget, public RPCSender { Q_OBJECT public: - Widget(QWidget *parent, not_null controller); + Widget(QWidget *parent, not_null controller); void updateDragInScroll(bool inScroll); diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index 6850026158..fdb692166b 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/click_handler_types.h" #include "core/application.h" #include "media/clip/media_clip_reader.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "history/history_item_components.h" #include "platform/platform_info.h" #include "data/data_peer.h" @@ -227,8 +227,8 @@ bool isLayerShown() { } void showPeerProfile(const PeerId &peer) { - if (auto window = App::wnd()) { - if (auto controller = window->controller()) { + if (const auto window = App::wnd()) { + if (const auto controller = window->sessionController()) { controller->showPeerInfo(peer); } } diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp index 48d78ea35a..4df6c4f043 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp @@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "apiwrap.h" #include "layout.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "auth_session.h" #include "ui/widgets/popup_menu.h" #include "ui/image/image.h" @@ -212,7 +212,7 @@ void InnerWidget::enumerateDates(Method method) { InnerWidget::InnerWidget( QWidget *parent, - not_null controller, + not_null controller, not_null channel) : RpWidget(parent) , _controller(controller) 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 86edd7f0c2..2916d9568a 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h @@ -29,7 +29,7 @@ class PopupMenu; } // namespace Ui namespace Window { -class Controller; +class SessionController; } // namespace Window namespace AdminLog { @@ -45,7 +45,7 @@ class InnerWidget final public: InnerWidget( QWidget *parent, - not_null controller, + not_null controller, not_null channel); base::Observable showSearchSignal; @@ -207,7 +207,7 @@ private: template void enumerateDates(Method method); - not_null _controller; + not_null _controller; not_null _channel; not_null _history; std::vector _items; diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp index f6f1d1e1dc..b399a0d6a2 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp @@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwindow.h" #include "apiwrap.h" #include "window/themes/window_theme.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "boxes/confirm_box.h" #include "base/timer.h" #include "data/data_channel.h" @@ -36,7 +36,7 @@ class FixedBar final : public TWidget, private base::Subscriber { public: FixedBar( QWidget *parent, - not_null controller, + not_null controller, not_null channel); base::Observable showFilterSignal; @@ -70,7 +70,7 @@ private: void applySearch(); void searchAnimationCallback(); - not_null _controller; + not_null _controller; not_null _channel; object_ptr _field; object_ptr _backButton; @@ -87,7 +87,7 @@ private: object_ptr SectionMemento::createWidget( QWidget *parent, - not_null controller, + not_null controller, Window::Column column, const QRect &geometry) { if (column == Window::Column::Third) { @@ -100,7 +100,7 @@ object_ptr SectionMemento::createWidget( FixedBar::FixedBar( QWidget *parent, - not_null controller, + not_null controller, not_null channel) : TWidget(parent) , _controller(controller) , _channel(channel) @@ -125,7 +125,9 @@ FixedBar::FixedBar( void FixedBar::applyFilter(const FilterValue &value) { auto hasFilter = (value.flags != 0) || !value.allUsers; - _backButton->setText(lang(hasFilter ? lng_admin_log_title_selected : lng_admin_log_title_all)); + _backButton->setText(lang(hasFilter + ? lng_admin_log_title_selected + : lng_admin_log_title_all)); } void FixedBar::goBack() { @@ -141,7 +143,11 @@ void FixedBar::showSearch() { void FixedBar::toggleSearch() { _searchShown = !_searchShown; _cancel->toggle(_searchShown, anim::type::normal); - _searchShownAnimation.start([this] { searchAnimationCallback(); }, _searchShown ? 0. : 1., _searchShown ? 1. : 0., st::historyAdminLogSearchSlideDuration); + _searchShownAnimation.start( + [=] { searchAnimationCallback(); }, + _searchShown ? 0. : 1., + _searchShown ? 1. : 0., + st::historyAdminLogSearchSlideDuration); _search->setDisabled(_searchShown); if (_searchShown) { _field->show(); @@ -154,9 +160,13 @@ void FixedBar::toggleSearch() { void FixedBar::searchAnimationCallback() { if (!_searchShownAnimation.animating()) { _field->setVisible(_searchShown); - _search->setIconOverride(_searchShown ? &st::topBarSearch.icon : nullptr, _searchShown ? &st::topBarSearch.icon : nullptr); - _search->setRippleColorOverride(_searchShown ? &st::topBarBg : nullptr); - _search->setCursor(_searchShown ? style::cur_default : style::cur_pointer); + _search->setIconOverride( + _searchShown ? &st::topBarSearch.icon : nullptr, + _searchShown ? &st::topBarSearch.icon : nullptr); + _search->setRippleColorOverride( + _searchShown ? &st::topBarBg : nullptr); + _search->setCursor( + _searchShown ? style::cur_default : style::cur_pointer); } resizeToWidth(width()); } @@ -240,7 +250,7 @@ void FixedBar::mousePressEvent(QMouseEvent *e) { } } -Widget::Widget(QWidget *parent, not_null controller, not_null channel) : Window::SectionWidget(parent, controller) +Widget::Widget(QWidget *parent, not_null controller, not_null channel) : Window::SectionWidget(parent, controller) , _scroll(this, st::historyScroll, false) , _fixedBar(this, controller, channel) , _fixedBarShadow(this) diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h index da42dfee0a..433e0d08b8 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h @@ -63,7 +63,7 @@ private: class Widget final : public Window::SectionWidget { public: - Widget(QWidget *parent, not_null controller, not_null channel); + Widget(QWidget *parent, not_null controller, not_null channel); not_null channel() const; Dialogs::RowDescriptor activeChat() const override; @@ -121,7 +121,7 @@ public: object_ptr createWidget( QWidget *parent, - not_null controller, + not_null controller, Window::Column column, const QRect &geometry) override; diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index eceea3c82c..1f2486ff18 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -26,7 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/image/image.h" #include "ui/toast/toast.h" #include "ui/text_options.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/window_peer_menu.h" #include "boxes/confirm_box.h" #include "boxes/report_box.h" @@ -119,7 +119,7 @@ void HistoryInner::BotAbout::clickHandlerPressedChanged( HistoryInner::HistoryInner( not_null historyWidget, - not_null controller, + not_null controller, Ui::ScrollArea *scroll, not_null history) : RpWidget(nullptr) diff --git a/Telegram/SourceFiles/history/history_inner_widget.h b/Telegram/SourceFiles/history/history_inner_widget.h index 29b7d545d6..bb35cc2f6d 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.h +++ b/Telegram/SourceFiles/history/history_inner_widget.h @@ -28,7 +28,7 @@ class EmptyPainter; } // namespace HistoryView namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Ui { @@ -48,7 +48,7 @@ public: HistoryInner( not_null historyWidget, - not_null controller, + not_null controller, Ui::ScrollArea *scroll, not_null history); @@ -302,7 +302,7 @@ private: static HistoryInner *Instance; - not_null _controller; + not_null _controller; const not_null _peer; const not_null _history; diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index 351e07debf..bf98890843 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -29,7 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "media/audio/media_audio.h" #include "core/application.h" #include "mainwindow.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "core/crash_reports.h" #include "data/data_session.h" #include "data/data_messages.h" @@ -802,7 +802,7 @@ ClickHandlerPtr goToMessageClickHandler( main->pushReplyReturn(returnTo); } } - App::wnd()->controller()->showPeerHistory( + App::wnd()->sessionController()->showPeerHistory( peer, Window::SectionShow::Way::Forward, msgId); diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h index 510149cd03..a807a0e29c 100644 --- a/Telegram/SourceFiles/history/history_item.h +++ b/Telegram/SourceFiles/history/history_item.h @@ -43,7 +43,7 @@ class Media; } // namespace Data namespace Window { -class Controller; +class SessionController; } // namespace Window namespace HistoryView { diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp index 1ce9da70b5..4dbf01a10d 100644 --- a/Telegram/SourceFiles/history/history_message.cpp +++ b/Telegram/SourceFiles/history/history_message.cpp @@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "layout.h" #include "window/notifications_manager.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "observer_peer.h" #include "storage/storage_shared_media.h" #include "data/data_session.h" diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp index 2437de4466..91538b46af 100644 --- a/Telegram/SourceFiles/history/history_service.cpp +++ b/Telegram/SourceFiles/history/history_service.cpp @@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_channel.h" #include "data/data_user.h" #include "window/notifications_manager.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "storage/storage_shared_media.h" #include "ui/text_options.h" diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index d7328a2ad5..667b1b5d9b 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -73,7 +73,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "auth_session.h" #include "window/themes/window_theme.h" #include "window/notifications_manager.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/window_slide_animation.h" #include "window/window_peer_menu.h" #include "inline_bots/inline_results_widget.h" @@ -117,7 +117,7 @@ ApiWrap::RequestMessageDataCallback replyEditMessageDataCallback() { }; } -void ActivateWindow(not_null controller) { +void ActivateWindow(not_null controller) { const auto window = controller->window(); window->activateWindow(); Core::App().activateWindowDelayed(window); @@ -147,7 +147,7 @@ bool ShowHistoryEndInsteadOfUnread( object_ptr SetupDiscussButton( not_null parent, - not_null controller) { + not_null controller) { auto result = object_ptr( parent, QString(), @@ -283,7 +283,7 @@ void ReportSpamPanel::setReported(bool reported, PeerData *onPeer) { HistoryWidget::HistoryWidget( QWidget *parent, - not_null controller) + not_null controller) : Window::AbstractSectionWidget(parent, controller) , _updateEditTimeLeftDisplay([=] { updateField(); }) , _fieldBarCancel(this, st::historyReplyCancel) @@ -475,13 +475,13 @@ HistoryWidget::HistoryWidget( _topShadow->hide(); - _attachDragDocument->setDroppedCallback([this](const QMimeData *data) { + _attachDragDocument->setDroppedCallback([=](const QMimeData *data) { confirmSendingFiles(data, CompressConfirm::No); - ActivateWindow(this->controller()); + ActivateWindow(controller); }); _attachDragPhoto->setDroppedCallback([=](const QMimeData *data) { confirmSendingFiles(data, CompressConfirm::Yes); - ActivateWindow(this->controller()); + ActivateWindow(controller); }); subscribe(Adaptive::Changed(), [=] { update(); }); @@ -548,7 +548,7 @@ HistoryWidget::HistoryWidget( | UpdateFlag::ChannelAmIn | UpdateFlag::ChannelPromotedChanged | UpdateFlag::ChannelLinkedChat; - subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(changes, [this](const Notify::PeerUpdate &update) { + subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(changes, [=](const Notify::PeerUpdate &update) { if (update.peer == _peer) { if (update.flags & UpdateFlag::RightsChanged) { checkPreview(); @@ -568,7 +568,7 @@ HistoryWidget::HistoryWidget( if (update.flags & UpdateFlag::UnavailableReasonChanged) { const auto unavailable = _peer->unavailableReason(); if (!unavailable.isEmpty()) { - this->controller()->showBackFromStack(); + controller->showBackFromStack(); Ui::show(Box(unavailable)); return; } diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h index 9274103f78..3e82809fb4 100644 --- a/Telegram/SourceFiles/history/history_widget.h +++ b/Telegram/SourceFiles/history/history_widget.h @@ -59,7 +59,7 @@ class RoundButton; } // namespace Ui namespace Window { -class Controller; +class SessionController; } // namespace Window namespace ChatHelpers { @@ -117,7 +117,7 @@ class HistoryWidget final : public Window::AbstractSectionWidget, public RPCSend public: using FieldHistoryAction = Ui::InputField::HistoryAction; - HistoryWidget(QWidget *parent, not_null controller); + HistoryWidget(QWidget *parent, not_null controller); void start(); diff --git a/Telegram/SourceFiles/history/media/history_media_contact.cpp b/Telegram/SourceFiles/history/media/history_media_contact.cpp index b0a8979812..bcf13d9fe2 100644 --- a/Telegram/SourceFiles/history/media/history_media_contact.cpp +++ b/Telegram/SourceFiles/history/media/history_media_contact.cpp @@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history.h" #include "history/view/history_view_element.h" #include "history/view/history_view_cursor_state.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "ui/empty_userpic.h" #include "ui/text_options.h" #include "data/data_session.h" @@ -35,7 +35,7 @@ namespace { ClickHandlerPtr sendMessageClickHandler(PeerData *peer) { return std::make_shared([peer] { - App::wnd()->controller()->showPeerHistory( + App::wnd()->sessionController()->showPeerHistory( peer->id, Window::SectionShow::Way::Forward); }); diff --git a/Telegram/SourceFiles/history/media/history_media_gif.cpp b/Telegram/SourceFiles/history/media/history_media_gif.cpp index 591f636a8f..82ee576bb8 100644 --- a/Telegram/SourceFiles/history/media/history_media_gif.cpp +++ b/Telegram/SourceFiles/history/media/history_media_gif.cpp @@ -21,8 +21,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history.h" #include "history/view/history_view_element.h" #include "history/view/history_view_cursor_state.h" -#include "window/window_controller.h" -#include "core/application.h" // for Application::showDocument. +#include "window/window_session_controller.h" +#include "core/application.h" // Application::showDocument. #include "ui/image/image.h" #include "data/data_session.h" #include "data/data_document.h" @@ -297,7 +297,7 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, crl:: auto roundCorners = (isRound || inWebPage) ? RectPart::AllCorners : ((isBubbleTop() ? (RectPart::TopLeft | RectPart::TopRight) : RectPart::None) | ((isBubbleBottom() && _caption.isEmpty()) ? (RectPart::BottomLeft | RectPart::BottomRight) : RectPart::None)); if (animating) { - auto paused = App::wnd()->controller()->isGifPausedAtLeastFor(Window::GifPauseReason::Any); + auto paused = App::wnd()->sessionController()->isGifPausedAtLeastFor(Window::GifPauseReason::Any); if (isRound) { if (player) { paused = false; diff --git a/Telegram/SourceFiles/history/media/history_media_sticker.cpp b/Telegram/SourceFiles/history/media/history_media_sticker.cpp index 3713f8aeb1..ddc6b0a4b2 100644 --- a/Telegram/SourceFiles/history/media/history_media_sticker.cpp +++ b/Telegram/SourceFiles/history/media/history_media_sticker.cpp @@ -16,8 +16,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/view/history_view_cursor_state.h" #include "ui/image/image.h" #include "ui/emoji_config.h" -#include "mainwindow.h" // App::wnd()->controller() -#include "window/window_controller.h" // isGifPausedAtLeastFor(..) +#include "mainwindow.h" // App::wnd()->sessionController. +#include "window/window_session_controller.h" // isGifPausedAtLeastFor. #include "data/data_session.h" #include "data/data_document.h" #include "lottie/lottie_animation.h" @@ -191,7 +191,7 @@ void HistorySticker::draw(Painter &p, const QRect &r, TextSelection selection, c if (selected) { request.colored = st::msgStickerOverlay->c; } - const auto paused = App::wnd()->controller()->isGifPausedAtLeastFor(Window::GifPauseReason::Any); + const auto paused = App::wnd()->sessionController()->isGifPausedAtLeastFor(Window::GifPauseReason::Any); if (!paused) { _lottie->markFrameShown(); } diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp index 5d433ba11f..b10a7c4439 100644 --- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp +++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp @@ -23,7 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "apiwrap.h" #include "layout.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/window_peer_menu.h" #include "auth_session.h" #include "ui/widgets/popup_menu.h" @@ -232,7 +232,7 @@ void ListWidget::enumerateDates(Method method) { ListWidget::ListWidget( QWidget *parent, - not_null controller, + not_null controller, not_null delegate) : RpWidget(parent) , _delegate(delegate) diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h index d96896b9e8..701d61b75f 100644 --- a/Telegram/SourceFiles/history/view/history_view_list_widget.h +++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h @@ -20,7 +20,7 @@ class PopupMenu; } // namespace Ui namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Data { @@ -125,7 +125,7 @@ class ListWidget final public: ListWidget( QWidget *parent, - not_null controller, + not_null controller, not_null delegate); not_null delegate() const; @@ -419,7 +419,7 @@ private: static constexpr auto kMinimalIdsLimit = 24; not_null _delegate; - not_null _controller; + not_null _controller; Data::MessagePosition _aroundPosition; Data::MessagePosition _shownAtPosition; Context _context; diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp index 8ef3a27139..4ceed10b04 100644 --- a/Telegram/SourceFiles/history/view/history_view_message.cpp +++ b/Telegram/SourceFiles/history/view/history_view_message.cpp @@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwidget.h" #include "mainwindow.h" #include "auth_session.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "layout.h" #include "styles/style_widgets.h" #include "styles/style_history.h" @@ -1466,7 +1466,7 @@ ClickHandlerPtr Message::rightActionLink() const { _rightActionLink = std::make_shared([=] { if (const auto item = Auth().data().message(itemId)) { if (savedFromPeer && savedFromMsgId) { - App::wnd()->controller()->showPeerHistory( + App::wnd()->sessionController()->showPeerHistory( savedFromPeer, Window::SectionShow::Way::Forward, savedFromMsgId); diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp index ad04639ff9..de45de84af 100644 --- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp +++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp @@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/buttons.h" #include "ui/widgets/dropdown_menu.h" #include "ui/effects/radial_animation.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/window_peer_menu.h" #include "calls/calls_instance.h" #include "data/data_peer_values.h" @@ -46,7 +46,7 @@ namespace HistoryView { TopBarWidget::TopBarWidget( QWidget *parent, - not_null controller) + not_null controller) : RpWidget(parent) , _controller(controller) , _clear(this, langFactory(lng_selected_clear), st::topBarClearButton) diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h index 72647c1d7d..f53fcffa0b 100644 --- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h +++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h @@ -22,7 +22,7 @@ class InfiniteRadialAnimation; } // namespace Ui namespace Window { -class Controller; +class SessionController; } // namespace Window namespace HistoryView { @@ -31,7 +31,7 @@ class TopBarWidget : public Ui::RpWidget, private base::Subscriber { public: TopBarWidget( QWidget *parent, - not_null controller); + not_null controller); struct SelectedState { bool textSelected = false; @@ -107,7 +107,7 @@ private: void refreshUnreadBadge(); void updateUnreadBadge(); - not_null _controller; + not_null _controller; Dialogs::Key _activeChat; int _selectedCount = 0; diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp index 8a32cfced7..64adf107f6 100644 --- a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp +++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp @@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "info/info_controller.h" #include "lang/lang_keys.h" #include "mtproto/sender.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "ui/widgets/scroll_area.h" #include "ui/search_field_controller.h" #include "data/data_user.h" diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp index c553850767..c5b296838e 100644 --- a/Telegram/SourceFiles/info/info_content_widget.cpp +++ b/Telegram/SourceFiles/info/info_content_widget.cpp @@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include #include -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "ui/widgets/scroll_area.h" #include "ui/widgets/input_fields.h" #include "ui/wrap/padding_wrap.h" diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp index c06bd1c408..b2f2927b70 100644 --- a/Telegram/SourceFiles/info/info_controller.cpp +++ b/Telegram/SourceFiles/info/info_controller.cpp @@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_chat.h" #include "data/data_session.h" #include "auth_session.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" namespace Info { namespace { @@ -86,8 +86,9 @@ rpl::producer AbstractController::mediaSourceQueryValue() const { return rpl::single(QString()); } -AbstractController::AbstractController(not_null parent) -: Navigation(&parent->session()) +AbstractController::AbstractController( + not_null parent) +: SessionNavigation(&parent->session()) , _parent(parent) { } @@ -118,7 +119,7 @@ void AbstractController::showBackFromStack( Controller::Controller( not_null widget, - not_null window, + not_null window, not_null memento) : AbstractController(window) , _widget(widget) diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h index 47f362ce97..9017e5d2ae 100644 --- a/Telegram/SourceFiles/info/info_controller.h +++ b/Telegram/SourceFiles/info/info_controller.h @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include "data/data_search_controller.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "settings/settings_common.h" namespace Ui { @@ -97,9 +97,9 @@ private: }; -class AbstractController : public Window::Navigation { +class AbstractController : public Window::SessionNavigation { public: - AbstractController(not_null parent); + AbstractController(not_null parent); virtual Key key() const = 0; virtual PeerData *migrated() const = 0; @@ -127,12 +127,12 @@ public: const Window::SectionShow ¶ms = Window::SectionShow()) override; void showBackFromStack( const Window::SectionShow ¶ms = Window::SectionShow()) override; - not_null parentController() override { + not_null parentController() override { return _parent; } private: - not_null _parent; + not_null _parent; }; @@ -140,7 +140,7 @@ class Controller : public AbstractController { public: Controller( not_null widget, - not_null window, + not_null window, not_null memento); Key key() const override { diff --git a/Telegram/SourceFiles/info/info_layer_widget.cpp b/Telegram/SourceFiles/info/info_layer_widget.cpp index 52ffc11cd9..2a5baf922c 100644 --- a/Telegram/SourceFiles/info/info_layer_widget.cpp +++ b/Telegram/SourceFiles/info/info_layer_widget.cpp @@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/focus_persister.h" #include "ui/widgets/buttons.h" #include "window/section_widget.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/main_window.h" #include "auth_session.h" #include "styles/style_info.h" @@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Info { LayerWidget::LayerWidget( - not_null controller, + not_null controller, not_null memento) : _controller(controller) , _content(this, controller, Wrap::Layer, memento) { @@ -33,7 +33,7 @@ LayerWidget::LayerWidget( } LayerWidget::LayerWidget( - not_null controller, + not_null controller, not_null memento) : _controller(controller) , _content(memento->takeContent(this, Wrap::Layer)) { @@ -50,7 +50,7 @@ not_null LayerWidget::floatPlayerWidget() { return this; } -not_null LayerWidget::floatPlayerController() { +not_null LayerWidget::floatPlayerController() { return _controller; } diff --git a/Telegram/SourceFiles/info/info_layer_widget.h b/Telegram/SourceFiles/info/info_layer_widget.h index c8b4f231ed..13241cab7e 100644 --- a/Telegram/SourceFiles/info/info_layer_widget.h +++ b/Telegram/SourceFiles/info/info_layer_widget.h @@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "media/player/media_player_float.h" namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Info { @@ -26,10 +26,10 @@ class LayerWidget , private ::Media::Player::FloatDelegate { public: LayerWidget( - not_null controller, + not_null controller, not_null memento); LayerWidget( - not_null controller, + not_null controller, not_null memento); void showFinished() override; @@ -58,7 +58,7 @@ private: void restoreFloatPlayerDelegate(); not_null<::Media::Player::FloatDelegate*> floatPlayerDelegate(); not_null floatPlayerWidget() override; - not_null floatPlayerController() override; + not_null floatPlayerController() override; not_null floatPlayerGetSection( Window::Column column) override; void floatPlayerEnumerateSections(Fn _controller; + not_null _controller; object_ptr _content; int _desiredHeight = 0; diff --git a/Telegram/SourceFiles/info/info_memento.cpp b/Telegram/SourceFiles/info/info_memento.cpp index 68133be064..e6d3df7747 100644 --- a/Telegram/SourceFiles/info/info_memento.cpp +++ b/Telegram/SourceFiles/info/info_memento.cpp @@ -147,7 +147,7 @@ std::unique_ptr Memento::DefaultContent( object_ptr Memento::createWidget( QWidget *parent, - not_null controller, + not_null controller, Window::Column column, const QRect &geometry) { auto wrap = (column == Window::Column::Third) @@ -163,7 +163,7 @@ object_ptr Memento::createWidget( } object_ptr Memento::createLayer( - not_null controller, + not_null controller, const QRect &geometry) { if (geometry.width() >= LayerWidget::MinimalSupportedWidth()) { return object_ptr(controller, this); @@ -185,7 +185,7 @@ MoveMemento::MoveMemento(object_ptr content) object_ptr MoveMemento::createWidget( QWidget *parent, - not_null controller, + not_null controller, Window::Column column, const QRect &geometry) { auto wrap = (column == Window::Column::Third) @@ -201,7 +201,7 @@ object_ptr MoveMemento::createWidget( } object_ptr MoveMemento::createLayer( - not_null controller, + not_null controller, const QRect &geometry) { if (geometry.width() < LayerWidget::MinimalSupportedWidth()) { return nullptr; diff --git a/Telegram/SourceFiles/info/info_memento.h b/Telegram/SourceFiles/info/info_memento.h index 976b5661c1..49c527640f 100644 --- a/Telegram/SourceFiles/info/info_memento.h +++ b/Telegram/SourceFiles/info/info_memento.h @@ -39,12 +39,12 @@ public: object_ptr createWidget( QWidget *parent, - not_null controller, + not_null controller, Window::Column column, const QRect &geometry) override; object_ptr createLayer( - not_null controller, + not_null controller, const QRect &geometry) override; int stackSize() const { @@ -93,12 +93,12 @@ public: object_ptr createWidget( QWidget *parent, - not_null controller, + not_null controller, Window::Column column, const QRect &geometry) override; object_ptr createLayer( - not_null controller, + not_null controller, const QRect &geometry) override; bool instant() const override { diff --git a/Telegram/SourceFiles/info/info_section_widget.cpp b/Telegram/SourceFiles/info/info_section_widget.cpp index cedd739b13..4050b0d401 100644 --- a/Telegram/SourceFiles/info/info_section_widget.cpp +++ b/Telegram/SourceFiles/info/info_section_widget.cpp @@ -18,7 +18,7 @@ namespace Info { SectionWidget::SectionWidget( QWidget *parent, - not_null window, + not_null window, Wrap wrap, not_null memento) : Window::SectionWidget(parent, window) @@ -28,7 +28,7 @@ SectionWidget::SectionWidget( SectionWidget::SectionWidget( QWidget *parent, - not_null window, + not_null window, Wrap wrap, not_null memento) : Window::SectionWidget(parent, window) diff --git a/Telegram/SourceFiles/info/info_section_widget.h b/Telegram/SourceFiles/info/info_section_widget.h index aca76131b1..7f26ca57e7 100644 --- a/Telegram/SourceFiles/info/info_section_widget.h +++ b/Telegram/SourceFiles/info/info_section_widget.h @@ -30,12 +30,12 @@ class SectionWidget final : public Window::SectionWidget { public: SectionWidget( QWidget *parent, - not_null window, + not_null window, Wrap wrap, not_null memento); SectionWidget( QWidget *parent, - not_null window, + not_null window, Wrap wrap, not_null memento); diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp index 7acccde9ea..810b4d6f79 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.cpp +++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp @@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/search_field_controller.h" #include "calls/calls_instance.h" #include "core/shortcuts.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/window_slide_animation.h" #include "window/window_peer_menu.h" #include "boxes/peer_list_box.h" @@ -53,7 +53,7 @@ struct WrapWidget::StackItem { WrapWidget::WrapWidget( QWidget *parent, - not_null window, + not_null window, Wrap wrap, not_null memento) : SectionWidget(parent, window) @@ -198,7 +198,7 @@ void WrapWidget::injectActiveProfileMemento( } std::unique_ptr WrapWidget::createController( - not_null window, + not_null window, not_null memento) { auto result = std::make_unique( this, diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h index f92a9e8593..45c4c909ea 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.h +++ b/Telegram/SourceFiles/info/info_wrap_widget.h @@ -73,7 +73,7 @@ class WrapWidget final : public Window::SectionWidget { public: WrapWidget( QWidget *parent, - not_null window, + not_null window, Wrap wrap, not_null memento); @@ -183,7 +183,7 @@ private: not_null memento, not_null controller); std::unique_ptr createController( - not_null window, + not_null window, not_null memento); //void convertProfileFromStackToTab(); diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h index 062a3e4063..ca2c4a4186 100644 --- a/Telegram/SourceFiles/info/media/info_media_buttons.h +++ b/Telegram/SourceFiles/info/media/info_media_buttons.h @@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "info/profile/info_profile_values.h" #include "ui/wrap/slide_wrap.h" #include "ui/wrap/vertical_layout.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "data/data_channel.h" #include "data/data_user.h" #include "styles/style_info.h" @@ -80,7 +80,7 @@ inline auto AddCountedButton( inline auto AddButton( Ui::VerticalLayout *parent, - not_null navigation, + not_null navigation, not_null peer, PeerData *migrated, Type type, @@ -99,7 +99,7 @@ inline auto AddButton( inline auto AddCommonGroupsButton( Ui::VerticalLayout *parent, - not_null navigation, + not_null navigation, not_null user, Ui::MultiSlideTracker &tracker) { auto result = AddCountedButton( diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp index aa125dd758..94523007c4 100644 --- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp +++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp @@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history.h" #include "history/view/history_view_cursor_state.h" #include "window/themes/window_theme.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/window_peer_menu.h" #include "storage/file_download.h" #include "ui/widgets/popup_menu.h" diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h index 91b4e767d9..e1b272974f 100644 --- a/Telegram/SourceFiles/info/media/info_media_list_widget.h +++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h @@ -31,7 +31,7 @@ class ItemBase; } // namespace Overview namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Info { diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index 066d765d77..f3011250a7 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -32,7 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "info/profile/info_profile_button.h" #include "info/profile/info_profile_text.h" #include "support/support_helper.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/window_peer_menu.h" #include "mainwidget.h" #include "auth_session.h" diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp index f4e5e36f97..8cbb61f548 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp @@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/labels.h" #include "ui/effects/ripple_animation.h" #include "ui/special_buttons.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "observer_peer.h" #include "core/application.h" #include "auth_session.h" @@ -211,7 +211,7 @@ int SectionWithToggle::toggleSkip() const { Cover::Cover( QWidget *parent, not_null peer, - not_null controller) + not_null controller) : SectionWithToggle( parent, st::infoProfilePhotoTop diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.h b/Telegram/SourceFiles/info/profile/info_profile_cover.h index 4993f5245d..c38462be00 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_cover.h +++ b/Telegram/SourceFiles/info/profile/info_profile_cover.h @@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer.h" namespace Window { -class Controller; +class SessionController; } // namespace Window namespace style { @@ -58,7 +58,7 @@ public: Cover( QWidget *parent, not_null peer, - not_null controller); + not_null controller); Cover *setOnlineCount(rpl::producer &&count); diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp index 6e8c6444d6..2b32063bcc 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp @@ -29,7 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "auth_session.h" #include "apiwrap.h" #include "window/main_window.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "storage/storage_shared_media.h" #include "lang/lang_keys.h" #include "styles/style_info.h" diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.h b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.h index 49a1510f3b..99e24809cd 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.h +++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.h @@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/rp_widget.h" namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Ui { diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp index cb0cf48538..f9f9137ea8 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp @@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "boxes/confirm_box.h" #include "boxes/peers/add_participants_box.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "data/data_channel.h" #include "data/data_chat.h" #include "data/data_user.h" diff --git a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp index d850929596..62093e9ede 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp @@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_chat.h" #include "data/data_user.h" #include "boxes/confirm_box.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "styles/style_info.h" #include "data/data_peer_values.h" @@ -94,7 +94,7 @@ void MemberListRow::paintNameIcon( } std::unique_ptr CreateMembersController( - not_null navigation, + not_null navigation, not_null peer) { return std::make_unique( navigation, diff --git a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h index e5b5666ed6..70179be19d 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h +++ b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h @@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/peer_list_box.h" namespace Window { -class Navigation; +class SessionNavigation; } // namespace Window namespace Info { @@ -58,7 +58,7 @@ private: }; std::unique_ptr CreateMembersController( - not_null navigation, + not_null navigation, not_null peer); } // namespace Profile diff --git a/Telegram/SourceFiles/info/settings/info_settings_widget.cpp b/Telegram/SourceFiles/info/settings/info_settings_widget.cpp index 494a3e5f77..734b794ba8 100644 --- a/Telegram/SourceFiles/info/settings/info_settings_widget.cpp +++ b/Telegram/SourceFiles/info/settings/info_settings_widget.cpp @@ -49,7 +49,7 @@ Widget::Widget( _self))) { _inner->sectionShowOther( ) | rpl::start_with_next([=](Type type) { - this->controller()->showSettings(type); + controller->showSettings(type); }, _inner->lifetime()); controller->setCanSaveChanges(_inner->sectionCanSaveChanges()); diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp index c00b3dc6b6..1f386b552f 100644 --- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp @@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "apiwrap.h" #include "mainwidget.h" #include "auth_session.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "ui/widgets/scroll_area.h" #include "ui/widgets/labels.h" #include "observer_peer.h" @@ -42,7 +42,10 @@ constexpr auto kInlineBotRequestDelay = 400; } // namespace -Inner::Inner(QWidget *parent, not_null controller) : TWidget(parent) +Inner::Inner( + QWidget *parent, + not_null controller) +: TWidget(parent) , _controller(controller) , _updateInlineItems([=] { updateInlineItems(); }) , _previewTimer([=] { showPreview(); }) { @@ -720,7 +723,7 @@ void Inner::onSwitchPm() { Widget::Widget( QWidget *parent, - not_null controller) + not_null controller) : RpWidget(parent) , _controller(controller) , _contentMaxHeight(st::emojiPanMaxHeight) diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.h b/Telegram/SourceFiles/inline_bots/inline_results_widget.h index d58d236367..d10706a4a3 100644 --- a/Telegram/SourceFiles/inline_bots/inline_results_widget.h +++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.h @@ -25,7 +25,7 @@ class RippleAnimation; } // namesapce Ui namespace Window { -class Controller; +class SessionController; } // namespace Window namespace InlineBots { @@ -52,7 +52,7 @@ class Inner : public TWidget, public Context, private base::Subscriber { Q_OBJECT public: - Inner(QWidget *parent, not_null controller); + Inner(QWidget *parent, not_null controller); void hideFinish(bool completely); @@ -128,7 +128,7 @@ private: int validateExistingInlineRows(const Results &results); void selectInlineResult(int row, int column); - not_null _controller; + not_null _controller; int _visibleTop = 0; int _visibleBottom = 0; @@ -165,7 +165,7 @@ class Widget : public Ui::RpWidget, private MTP::Sender { Q_OBJECT public: - Widget(QWidget *parent, not_null controller); + Widget(QWidget *parent, not_null controller); void moveBottom(int bottom); @@ -233,7 +233,7 @@ private: bool refreshInlineRows(int *added = nullptr); void inlineResultsDone(const MTPmessages_BotResults &result); - not_null _controller; + not_null _controller; int _contentMaxHeight = 0; int _contentHeight = 0; diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index dbe7acd090..812543c380 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -75,7 +75,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_top_bar_wrap.h" #include "window/notifications_manager.h" #include "window/window_slide_animation.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/themes/window_theme.h" #include "window/window_history_hider.h" #include "mtproto/dc_options.h" @@ -355,7 +355,7 @@ MainWidget::SettingBackground::SettingBackground( MainWidget::MainWidget( QWidget *parent, - not_null controller) + not_null controller) : RpWidget(parent) , _controller(controller) , _dialogsWidth(st::columnMinimalWidthLeft) @@ -499,7 +499,7 @@ not_null MainWidget::floatPlayerWidget() { return this; } -not_null MainWidget::floatPlayerController() { +not_null MainWidget::floatPlayerController() { return _controller; } diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index 7c0ffc337e..133a2ef78c 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -63,7 +63,7 @@ class SlideWrap; } // namespace Ui namespace Window { -class Controller; +class SessionController; template class TopBarWrapWidget; class SectionMemento; @@ -97,7 +97,7 @@ class MainWidget public: using SectionShow = Window::SectionShow; - MainWidget(QWidget *parent, not_null controller); + MainWidget(QWidget *parent, not_null controller); AuthSession &session() const; @@ -410,7 +410,7 @@ private: not_null floatPlayerDelegate(); not_null floatPlayerWidget() override; - not_null floatPlayerController() override; + not_null floatPlayerController() override; not_null floatPlayerGetSection( Window::Column column) override; void floatPlayerEnumerateSections(Fn _controller; + not_null _controller; bool _started = false; Ui::Animations::Simple _a_show; diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index d0f01d4988..2d7f079842 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -43,7 +43,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/themes/window_theme_warning.h" #include "window/window_lock_widgets.h" #include "window/window_main_menu.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" namespace { @@ -235,7 +235,7 @@ void MainWindow::setupMain() { clearWidgets(); - _main.create(bodyWidget(), controller()); + _main.create(bodyWidget(), sessionController()); _main->show(); updateControlsGeometry(); @@ -257,7 +257,7 @@ void MainWindow::showSettings() { return; } - if (const auto controller = this->controller()) { + if (const auto controller = sessionController()) { controller->showSettings(); } else { showSpecialLayer(Box(), anim::type::normal); @@ -294,7 +294,7 @@ void MainWindow::showMainMenu() { if (isHidden()) showFromTray(); ensureLayerCreated(); - _layer->showMainMenu(controller(), anim::type::normal); + _layer->showMainMenu(sessionController(), anim::type::normal); } void MainWindow::ensureLayerCreated() { @@ -309,8 +309,8 @@ void MainWindow::ensureLayerCreated() { destroyLayer(); }, _layer->lifetime()); - if (controller()) { - controller()->enableGifPauseReason(Window::GifPauseReason::Layer); + if (const auto controller = sessionController()) { + controller->enableGifPauseReason(Window::GifPauseReason::Layer); } } @@ -324,8 +324,8 @@ void MainWindow::destroyLayer() { setFocus(); } layer = nullptr; - if (controller()) { - controller()->disableGifPauseReason(Window::GifPauseReason::Layer); + if (const auto controller = sessionController()) { + controller->disableGifPauseReason(Window::GifPauseReason::Layer); } if (resetFocus) { setInnerFocus(); @@ -385,7 +385,7 @@ void MainWindow::ui_showMediaPreview( return; } if (!_mediaPreview) { - _mediaPreview.create(bodyWidget(), controller()); + _mediaPreview.create(bodyWidget(), sessionController()); updateControlsGeometry(); } if (_mediaPreview->isHidden()) { @@ -401,7 +401,7 @@ void MainWindow::ui_showMediaPreview( return; } if (!_mediaPreview) { - _mediaPreview.create(bodyWidget(), controller()); + _mediaPreview.create(bodyWidget(), sessionController()); updateControlsGeometry(); } if (_mediaPreview->isHidden()) { diff --git a/Telegram/SourceFiles/media/player/media_player_float.cpp b/Telegram/SourceFiles/media/player/media_player_float.cpp index 00a9226d7f..a9b7b4fe9e 100644 --- a/Telegram/SourceFiles/media/player/media_player_float.cpp +++ b/Telegram/SourceFiles/media/player/media_player_float.cpp @@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "media/streaming/media_streaming_player.h" #include "media/view/media_view_playback_progress.h" #include "media/player/media_player_instance.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/section_widget.h" #include "auth_session.h" #include "styles/style_media_player.h" @@ -29,7 +29,7 @@ namespace Player { Float::Float( QWidget *parent, - not_null controller, + not_null controller, not_null item, Fn toggleCallback, Fn draggedCallback) @@ -261,7 +261,7 @@ void Float::repaintItem() { template FloatController::Item::Item( not_null parent, - not_null controller, + not_null controller, not_null item, ToggleCallback toggle, DraggedCallback dragged) diff --git a/Telegram/SourceFiles/media/player/media_player_float.h b/Telegram/SourceFiles/media/player/media_player_float.h index 28580d40f5..3b97588007 100644 --- a/Telegram/SourceFiles/media/player/media_player_float.h +++ b/Telegram/SourceFiles/media/player/media_player_float.h @@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/effects/animations.h" namespace Window { -class Controller; +class SessionController; class AbstractSectionWidget; enum class Column; } // namespace Window @@ -35,7 +35,7 @@ class Float : public Ui::RpWidget, private base::Subscriber { public: Float( QWidget *parent, - not_null controller, + not_null controller, not_null item, Fn toggleCallback, Fn draggedCallback); @@ -88,7 +88,7 @@ private: void finishDrag(bool closed); void pauseResume(); - not_null _controller; + not_null _controller; HistoryItem *_item = nullptr; Fn _toggleCallback; @@ -108,7 +108,7 @@ private: class FloatDelegate { public: virtual not_null floatPlayerWidget() = 0; - virtual not_null floatPlayerController() = 0; + virtual not_null floatPlayerController() = 0; virtual not_null floatPlayerGetSection( Window::Column column) = 0; virtual void floatPlayerEnumerateSections(Fn Item( not_null parent, - not_null controller, + not_null controller, not_null item, ToggleCallback toggle, DraggedCallback dragged); @@ -241,7 +241,7 @@ private: not_null _delegate; not_null _parent; - not_null _controller; + not_null _controller; std::vector> _items; rpl::event_stream _closeEvents; diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp index 8d89226e65..1d24bb5235 100644 --- a/Telegram/SourceFiles/media/player/media_player_instance.cpp +++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp @@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history_item.h" #include "data/data_media_types.h" #include "data/data_file_origin.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "core/shortcuts.h" #include "core/application.h" #include "main/main_account.h" // Account::sessionValue. @@ -179,7 +179,7 @@ void Instance::clearStreamed(not_null data) { requestRoundVideoResize(); emitUpdate(data->type); data->streamed = nullptr; - App::wnd()->controller()->disableGifPauseReason( + App::wnd()->sessionController()->disableGifPauseReason( Window::GifPauseReason::RoundPlaying); } @@ -685,7 +685,7 @@ void Instance::handleStreamingUpdate( float64) { requestRoundVideoRepaint(); }); - App::wnd()->controller()->enableGifPauseReason( + App::wnd()->sessionController()->enableGifPauseReason( Window::GifPauseReason::RoundPlaying); requestRoundVideoResize(); } diff --git a/Telegram/SourceFiles/media/player/media_player_panel.cpp b/Telegram/SourceFiles/media/player/media_player_panel.cpp index 413b9f8968..ccc7e482d0 100644 --- a/Telegram/SourceFiles/media/player/media_player_panel.cpp +++ b/Telegram/SourceFiles/media/player/media_player_panel.cpp @@ -38,7 +38,7 @@ constexpr auto kDelayedHideTimeout = crl::time(3000); Panel::Panel( QWidget *parent, - not_null window) + not_null window) : RpWidget(parent) , AbstractController(window) , _showTimer([this] { startShow(); }) diff --git a/Telegram/SourceFiles/media/player/media_player_panel.h b/Telegram/SourceFiles/media/player/media_player_panel.h index bf03b78b1a..eeb987c5ae 100644 --- a/Telegram/SourceFiles/media/player/media_player_panel.h +++ b/Telegram/SourceFiles/media/player/media_player_panel.h @@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "info/info_controller.h" namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Ui { @@ -30,7 +30,7 @@ class Panel : public Ui::RpWidget, private Info::AbstractController { public: Panel( QWidget *parent, - not_null controller); + not_null controller); bool overlaps(const QRect &globalRect); diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp index a5744ad02b..1912301111 100644 --- a/Telegram/SourceFiles/passport/passport_form_controller.cpp +++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp @@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_session.h" #include "data/data_user.h" #include "mainwindow.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "core/click_handler_types.h" #include "ui/toast/toast.h" #include "auth_session.h" @@ -610,7 +610,7 @@ std::vector Value::takeAllFilesInEdit() { } FormController::FormController( - not_null controller, + not_null controller, const FormRequest &request) : _controller(controller) , _request(PreprocessRequest(request)) diff --git a/Telegram/SourceFiles/passport/passport_form_controller.h b/Telegram/SourceFiles/passport/passport_form_controller.h index 524e5a20b5..e05664745d 100644 --- a/Telegram/SourceFiles/passport/passport_form_controller.h +++ b/Telegram/SourceFiles/passport/passport_form_controller.h @@ -21,7 +21,7 @@ struct UploadSecureProgress; } // namespace Storage namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Passport { @@ -322,7 +322,7 @@ struct FileKey { class FormController : private MTP::Sender, public base::has_weak_ptr { public: FormController( - not_null controller, + not_null controller, const FormRequest &request); void show(); @@ -508,7 +508,7 @@ private: void cancelAbort(); void shortPollEmailConfirmation(); - not_null _controller; + not_null _controller; FormRequest _request; UserData *_bot = nullptr; diff --git a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm index a265ae8248..7487cb46a5 100644 --- a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm +++ b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm @@ -21,7 +21,7 @@ #include "observer_peer.h" #include "styles/style_media_player.h" #include "window/themes/window_theme.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "ui/empty_userpic.h" #include "styles/style_dialogs.h" @@ -241,7 +241,7 @@ void PaintUnreadBadge(Painter &p, PeerData *peer) { return; } if (const auto folder = Auth().data().folderLoaded(Data::Folder::kId)) { - App::wnd()->controller()->openFolder(folder); + App::wnd()->sessionController()->openFolder(folder); } }; Core::Sandbox::Instance().customEnterFromEventLoop([=] { diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp index 08b7226c70..53e3a68fd6 100644 --- a/Telegram/SourceFiles/settings/settings_common.cpp +++ b/Telegram/SourceFiles/settings/settings_common.cpp @@ -30,7 +30,7 @@ namespace Settings { object_ptr
CreateSection( Type type, not_null parent, - Window::Controller *controller, + Window::SessionController *controller, UserData *self) { switch (type) { case Type::Main: diff --git a/Telegram/SourceFiles/settings/settings_common.h b/Telegram/SourceFiles/settings/settings_common.h index e09180b0b8..bb5b3d6b9b 100644 --- a/Telegram/SourceFiles/settings/settings_common.h +++ b/Telegram/SourceFiles/settings/settings_common.h @@ -16,7 +16,7 @@ class VerticalLayout; } // namespace Ui namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Info { @@ -62,7 +62,7 @@ public: object_ptr
CreateSection( Type type, not_null parent, - Window::Controller *controller = nullptr, + Window::SessionController *controller = nullptr, UserData *self = nullptr); void AddSkip(not_null container); diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp index 4eaf395848..50dcd8c655 100644 --- a/Telegram/SourceFiles/settings/settings_information.cpp +++ b/Telegram/SourceFiles/settings/settings_information.cpp @@ -38,7 +38,7 @@ constexpr auto kSaveBioTimeout = 1000; void SetupPhoto( not_null container, - not_null controller, + not_null controller, not_null self) { const auto wrap = container->add(object_ptr( container, @@ -409,7 +409,7 @@ BioManager SetupBio( Information::Information( QWidget *parent, - not_null controller, + not_null controller, not_null self) : Section(parent) , _self(self) { @@ -424,7 +424,7 @@ Information::Information( // _save(std::move(done)); //} -void Information::setupContent(not_null controller) { +void Information::setupContent(not_null controller) { const auto content = Ui::CreateChild(this); SetupPhoto(content, controller, _self); diff --git a/Telegram/SourceFiles/settings/settings_information.h b/Telegram/SourceFiles/settings/settings_information.h index 67cef5a052..0bd5917218 100644 --- a/Telegram/SourceFiles/settings/settings_information.h +++ b/Telegram/SourceFiles/settings/settings_information.h @@ -15,11 +15,11 @@ class Information : public Section { public: Information( QWidget *parent, - not_null controller, + not_null controller, not_null self); private: - void setupContent(not_null controller); + void setupContent(not_null controller); not_null _self; //rpl::variable _canSaveChanges; diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp index afa4ed38c7..dc7ff2ef49 100644 --- a/Telegram/SourceFiles/settings/settings_main.cpp +++ b/Telegram/SourceFiles/settings/settings_main.cpp @@ -258,7 +258,7 @@ void SetupHelp(not_null container) { Main::Main( QWidget *parent, - not_null controller, + not_null controller, not_null self) : Section(parent) , _self(self) { @@ -270,7 +270,7 @@ void Main::keyPressEvent(QKeyEvent *e) { return Section::keyPressEvent(e); } -void Main::setupContent(not_null controller) { +void Main::setupContent(not_null controller) { const auto content = Ui::CreateChild(this); const auto cover = content->add(object_ptr( diff --git a/Telegram/SourceFiles/settings/settings_main.h b/Telegram/SourceFiles/settings/settings_main.h index 58ee0b212f..9724780f64 100644 --- a/Telegram/SourceFiles/settings/settings_main.h +++ b/Telegram/SourceFiles/settings/settings_main.h @@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "settings/settings_common.h" namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Ui { @@ -34,7 +34,7 @@ class Main : public Section { public: Main( QWidget *parent, - not_null controller, + not_null controller, not_null self); rpl::producer sectionShowOther() override; @@ -43,7 +43,7 @@ protected: void keyPressEvent(QKeyEvent *e) override; private: - void setupContent(not_null controller); + void setupContent(not_null controller); not_null _self; rpl::event_stream _showOther; diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp index 37ec784be3..54bdc9d20e 100644 --- a/Telegram/SourceFiles/storage/localstorage.cpp +++ b/Telegram/SourceFiles/storage/localstorage.cpp @@ -31,7 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "apiwrap.h" #include "auth_session.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "base/flags.h" #include "data/data_session.h" #include "history/history.h" diff --git a/Telegram/SourceFiles/support/support_helper.cpp b/Telegram/SourceFiles/support/support_helper.cpp index 114c0929f5..04140b4794 100644 --- a/Telegram/SourceFiles/support/support_helper.cpp +++ b/Telegram/SourceFiles/support/support_helper.cpp @@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "chat_helpers/message_field.h" #include "chat_helpers/emoji_suggestions_widget.h" #include "lang/lang_keys.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "storage/storage_media_prepare.h" #include "storage/localimageloader.h" #include "core/sandbox.h" @@ -293,7 +293,7 @@ std::unique_ptr Helper::Create(not_null session) { return valid ? std::make_unique(session) : nullptr; } -void Helper::registerWindow(not_null controller) { +void Helper::registerWindow(not_null controller) { controller->activeChatValue( ) | rpl::map([](Dialogs::Key key) { const auto history = key.history(); @@ -349,7 +349,7 @@ void Helper::checkOccupiedChats() { } void Helper::updateOccupiedHistory( - not_null controller, + not_null controller, History *history) { if (isOccupiedByMe(_occupiedHistory)) { _occupiedHistory->clearCloudDraft(); diff --git a/Telegram/SourceFiles/support/support_helper.h b/Telegram/SourceFiles/support/support_helper.h index c657774698..6076766164 100644 --- a/Telegram/SourceFiles/support/support_helper.h +++ b/Telegram/SourceFiles/support/support_helper.h @@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL class AuthSession; namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Support { @@ -41,7 +41,7 @@ public: static std::unique_ptr Create(not_null session); - void registerWindow(not_null controller); + void registerWindow(not_null controller); void cloudDraftChanged(not_null history); void chatOccupiedUpdated(not_null history); @@ -66,7 +66,7 @@ private: }; void checkOccupiedChats(); void updateOccupiedHistory( - not_null controller, + not_null controller, History *history); void setSupportName(const QString &name); void occupyIfNotYet(); diff --git a/Telegram/SourceFiles/ui/special_buttons.cpp b/Telegram/SourceFiles/ui/special_buttons.cpp index 2c59ee870c..cab5624df9 100644 --- a/Telegram/SourceFiles/ui/special_buttons.cpp +++ b/Telegram/SourceFiles/ui/special_buttons.cpp @@ -23,7 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "boxes/photo_crop_box.h" #include "boxes/confirm_box.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "lang/lang_keys.h" #include "auth_session.h" #include "apiwrap.h" @@ -445,7 +445,7 @@ UserpicButton::UserpicButton( UserpicButton::UserpicButton( QWidget *parent, - not_null controller, + not_null controller, not_null peer, Role role, const style::UserpicButton &st) @@ -880,7 +880,7 @@ void UserpicButton::prepareUserpicPixmap() { // // #feed //FeedUserpicButton::FeedUserpicButton( // QWidget *parent, -// not_null controller, +// not_null controller, // not_null feed, // const style::FeedUserpicButton &st) //: AbstractButton(parent) diff --git a/Telegram/SourceFiles/ui/special_buttons.h b/Telegram/SourceFiles/ui/special_buttons.h index 909aaa2c2f..1a07e5ca0a 100644 --- a/Telegram/SourceFiles/ui/special_buttons.h +++ b/Telegram/SourceFiles/ui/special_buttons.h @@ -20,7 +20,7 @@ class InfiniteRadialAnimation; } // namespace Ui namespace Window { -class Controller; +class SessionController; } // namespace Window namespace Ui { @@ -151,7 +151,7 @@ public: const style::UserpicButton &st); UserpicButton( QWidget *parent, - not_null controller, + not_null controller, not_null peer, Role role, const style::UserpicButton &st); @@ -201,7 +201,7 @@ private: void uploadNewPeerPhoto(); const style::UserpicButton &_st; - Window::Controller *_controller = nullptr; + Window::SessionController *_controller = nullptr; PeerData *_peer = nullptr; QString _cropTitle; Role _role = Role::ChangePhoto; @@ -226,7 +226,7 @@ private: //public: // FeedUserpicButton( // QWidget *parent, -// not_null controller, +// not_null controller, // not_null feed, // const style::FeedUserpicButton &st); // @@ -243,7 +243,7 @@ private: // QPoint countInnerPosition() const; // // const style::FeedUserpicButton &_st; -// not_null _controller; +// not_null _controller; // not_null _feed; // std::vector _parts; // diff --git a/Telegram/SourceFiles/window/layer_widget.cpp b/Telegram/SourceFiles/window/layer_widget.cpp index 6f574da049..f07806867a 100644 --- a/Telegram/SourceFiles/window/layer_widget.cpp +++ b/Telegram/SourceFiles/window/layer_widget.cpp @@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_main_menu.h" #include "auth_session.h" #include "chat_helpers/stickers.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "styles/style_boxes.h" #include "styles/style_widgets.h" #include "styles/style_chat_helpers.h" @@ -714,7 +714,7 @@ void LayerStackWidget::hideSpecialLayer(anim::type animated) { } void LayerStackWidget::showMainMenu( - not_null controller, + not_null controller, anim::type animated) { startAnimation([&] { _mainMenu.create(this, controller); @@ -849,7 +849,10 @@ LayerStackWidget::~LayerStackWidget() = default; } // namespace Window -MediaPreviewWidget::MediaPreviewWidget(QWidget *parent, not_null controller) : TWidget(parent) +MediaPreviewWidget::MediaPreviewWidget( + QWidget *parent, + not_null controller) +: TWidget(parent) , _controller(controller) , _emojiSize(Ui::Emoji::GetSizeLarge() / cIntRetinaFactor()) { setAttribute(Qt::WA_TransparentForMouseEvents); diff --git a/Telegram/SourceFiles/window/layer_widget.h b/Telegram/SourceFiles/window/layer_widget.h index fb3b30dd93..422cc3453b 100644 --- a/Telegram/SourceFiles/window/layer_widget.h +++ b/Telegram/SourceFiles/window/layer_widget.h @@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Window { class MainMenu; -class Controller; +class SessionController; class SectionMemento; struct SectionShow; @@ -97,7 +97,7 @@ public: object_ptr layer, anim::type animated); void showMainMenu( - not_null controller, + not_null controller, anim::type animated); bool takeToThirdSection(); @@ -197,7 +197,7 @@ private: class MediaPreviewWidget : public TWidget, private base::Subscriber { public: - MediaPreviewWidget(QWidget *parent, not_null controller); + MediaPreviewWidget(QWidget *parent, not_null controller); void showPreview( Data::FileOrigin origin, @@ -220,7 +220,7 @@ private: void fillEmojiString(); void resetGifAndCache(); - not_null _controller; + not_null _controller; Ui::Animations::Simple _a_shown; bool _hiding = false; diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp index b3420ed73c..8ce34415c5 100644 --- a/Telegram/SourceFiles/window/main_window.cpp +++ b/Telegram/SourceFiles/window/main_window.cpp @@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/platform_info.h" #include "history/history.h" #include "window/themes/window_theme.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "window/window_lock_widgets.h" #include "window/window_outdated_bar.h" #include "boxes/confirm_box.h" @@ -130,7 +130,7 @@ MainWindow::MainWindow() Core::App().activeAccount().sessionValue( ) | rpl::start_with_next([=](AuthSession *session) { _controller = session - ? std::make_unique(session, this) + ? std::make_unique(session, this) : nullptr; updateWindowIcon(); }, lifetime()); diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h index ed71d584df..4fbe41e805 100644 --- a/Telegram/SourceFiles/window/main_window.h +++ b/Telegram/SourceFiles/window/main_window.h @@ -15,7 +15,7 @@ class BoxContent; namespace Window { -class Controller; +class SessionController; class TitleWidget; struct TermsLock; @@ -30,7 +30,7 @@ class MainWindow : public Ui::RpWidget, protected base::Subscriber { public: MainWindow(); - Window::Controller *controller() const { + Window::SessionController *sessionController() const { return _controller.get(); } void setInactivePress(bool inactive); @@ -162,7 +162,7 @@ private: base::Timer _positionUpdatedTimer; bool _positionInited = false; - std::unique_ptr _controller; + std::unique_ptr _controller; object_ptr _title = { nullptr }; object_ptr _outdated; object_ptr _body; diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp index c7c39fc79a..5b6c007c44 100644 --- a/Telegram/SourceFiles/window/notifications_manager.cpp +++ b/Telegram/SourceFiles/window/notifications_manager.cpp @@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "data/data_session.h" #include "data/data_channel.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "core/application.h" #include "mainwindow.h" #include "mainwidget.h" @@ -489,7 +489,7 @@ void Manager::openNotificationMessage( if (openExactlyMessage) { Ui::showPeerHistory(history, messageId); //} else if (messageFeed) { // #feed - // App::wnd()->controller()->showSection( + // App::wnd()->sessionController()->showSection( // HistoryFeed::Memento(messageFeed)); } else { Ui::showPeerHistory(history, ShowAtUnreadMsgId); diff --git a/Telegram/SourceFiles/window/section_memento.h b/Telegram/SourceFiles/window/section_memento.h index dab1499e40..3bf78f478c 100644 --- a/Telegram/SourceFiles/window/section_memento.h +++ b/Telegram/SourceFiles/window/section_memento.h @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Window { -class Controller; +class SessionController; class SectionWidget; class LayerWidget; enum class Column; @@ -18,12 +18,12 @@ class SectionMemento { public: virtual object_ptr createWidget( QWidget *parent, - not_null controller, + not_null controller, Column column, const QRect &geometry) = 0; virtual object_ptr createLayer( - not_null controller, + not_null controller, const QRect &geometry) { return nullptr; } diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp index e60804d5c5..d66f899ba5 100644 --- a/Telegram/SourceFiles/window/section_widget.cpp +++ b/Telegram/SourceFiles/window/section_widget.cpp @@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/section_memento.h" #include "window/window_slide_animation.h" #include "window/themes/window_theme.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" namespace Window { @@ -22,7 +22,7 @@ AuthSession &AbstractSectionWidget::session() const { SectionWidget::SectionWidget( QWidget *parent, - not_null controller) + not_null controller) : AbstractSectionWidget(parent, controller) { } diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h index 13df024e8e..0bb6a27c18 100644 --- a/Telegram/SourceFiles/window/section_widget.h +++ b/Telegram/SourceFiles/window/section_widget.h @@ -14,7 +14,7 @@ class AuthSession; namespace Window { -class Controller; +class SessionController; class LayerWidget; class SlideAnimation; struct SectionShow; @@ -32,7 +32,7 @@ class AbstractSectionWidget public: AbstractSectionWidget( QWidget *parent, - not_null controller) + not_null controller) : RpWidget(parent) , _controller(controller) { } @@ -48,12 +48,12 @@ public: } protected: - not_null controller() const { + not_null controller() const { return _controller; } private: - not_null _controller; + not_null _controller; }; @@ -72,7 +72,7 @@ struct SectionSlideParams { class SectionWidget : public AbstractSectionWidget { public: - SectionWidget(QWidget *parent, not_null controller); + SectionWidget(QWidget *parent, not_null controller); virtual Dialogs::RowDescriptor activeChat() const { return {}; diff --git a/Telegram/SourceFiles/window/window_lock_widgets.cpp b/Telegram/SourceFiles/window/window_lock_widgets.cpp index a3520f1793..144faf67e5 100644 --- a/Telegram/SourceFiles/window/window_lock_widgets.cpp +++ b/Telegram/SourceFiles/window/window_lock_widgets.cpp @@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/toast/toast.h" #include "styles/style_boxes.h" #include "window/window_slide_animation.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "auth_session.h" namespace Window { @@ -30,7 +30,7 @@ LockWidget::LockWidget(QWidget *parent) : RpWidget(parent) { } void LockWidget::setInnerFocus() { - if (const auto controller = App::wnd()->controller()) { + if (const auto controller = App::wnd()->sessionController()) { controller->dialogsListFocused().set(false, true); } setFocus(); diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index 08ec868d9e..657cfd2fd0 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_main_menu.h" #include "window/themes/window_theme.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "ui/widgets/buttons.h" #include "ui/widgets/labels.h" #include "ui/widgets/menu.h" @@ -116,7 +116,7 @@ void MainMenu::ResetScaleButton::paintEvent(QPaintEvent *e) { MainMenu::MainMenu( QWidget *parent, - not_null controller) + not_null controller) : RpWidget(parent) , _controller(controller) , _menu(this, st::mainMenu) @@ -204,7 +204,7 @@ void MainMenu::refreshMenu() { box->closeBox(); }); box->addTopButton(st::callSettingsButton, [=] { - App::wnd()->controller()->showSettings( + App::wnd()->sessionController()->showSettings( Settings::Type::Calls, Window::SectionShow(anim::type::instant)); }); diff --git a/Telegram/SourceFiles/window/window_main_menu.h b/Telegram/SourceFiles/window/window_main_menu.h index 719154d295..41bebca36c 100644 --- a/Telegram/SourceFiles/window/window_main_menu.h +++ b/Telegram/SourceFiles/window/window_main_menu.h @@ -19,11 +19,11 @@ class UserpicButton; namespace Window { -class Controller; +class SessionController; class MainMenu : public Ui::RpWidget, private base::Subscriber { public: - MainMenu(QWidget *parent, not_null controller); + MainMenu(QWidget *parent, not_null controller); void setInnerFocus() { setFocus(); @@ -41,7 +41,7 @@ private: void refreshBackground(); class ResetScaleButton; - not_null _controller; + not_null _controller; object_ptr _userpicButton = { nullptr }; object_ptr _cloudButton = { nullptr }; object_ptr _resetScaleButton = { nullptr }; diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index aa2f016d34..1e467286b1 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwindow.h" #include "observer_peer.h" #include "history/history.h" -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "support/support_helper.h" #include "info/info_memento.h" #include "info/info_controller.h" @@ -47,7 +47,7 @@ constexpr auto kArchivedToastDuration = crl::time(3000); class Filler { public: Filler( - not_null controller, + not_null controller, not_null peer, const PeerMenuCallback &addAction, PeerMenuSource source); @@ -67,7 +67,7 @@ private: void addChatActions(not_null chat); void addChannelActions(not_null channel); - not_null _controller; + not_null _controller; not_null _peer; const PeerMenuCallback &_addAction; PeerMenuSource _source; @@ -77,7 +77,7 @@ private: class FolderFiller { public: FolderFiller( - not_null controller, + not_null controller, not_null folder, const PeerMenuCallback &addAction, PeerMenuSource source); @@ -92,7 +92,7 @@ private: //void addNotifications(); //void addUngroup(); - not_null _controller; + not_null _controller; not_null _folder; const PeerMenuCallback &_addAction; PeerMenuSource _source; @@ -174,7 +174,7 @@ void TogglePinnedDialog(Dialogs::Key key) { } Filler::Filler( - not_null controller, + not_null controller, not_null peer, const PeerMenuCallback &addAction, PeerMenuSource source) @@ -412,7 +412,7 @@ void Filler::addChatActions(not_null chat) { if (EditPeerInfoBox::Available(chat)) { const auto text = lang(lng_manage_group_title); _addAction(text, [=] { - App::wnd()->controller()->showEditPeerBox(chat); + App::wnd()->sessionController()->showEditPeerBox(chat); }); } if (chat->canAddMembers()) { @@ -455,8 +455,8 @@ void Filler::addChannelActions(not_null channel) { const auto text = lang(isGroup ? lng_manage_group_title : lng_manage_channel_title); - _addAction(text, [channel] { - App::wnd()->controller()->showEditPeerBox(channel); + _addAction(text, [=] { + App::wnd()->sessionController()->showEditPeerBox(channel); }); } if (channel->canAddMembers()) { @@ -534,7 +534,7 @@ void Filler::fill() { } FolderFiller::FolderFiller( - not_null controller, + not_null controller, not_null folder, const PeerMenuCallback &addAction, PeerMenuSource source) @@ -831,7 +831,7 @@ Fn DeleteAndLeaveHandler(not_null peer) { } void FillPeerMenu( - not_null controller, + not_null controller, not_null peer, const PeerMenuCallback &callback, PeerMenuSource source) { @@ -840,7 +840,7 @@ void FillPeerMenu( } void FillFolderMenu( - not_null controller, + not_null controller, not_null folder, const PeerMenuCallback &callback, PeerMenuSource source) { diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h index dedfdb1551..39a5729e15 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.h +++ b/Telegram/SourceFiles/window/window_peer_menu.h @@ -17,7 +17,7 @@ class Folder; namespace Window { -class Controller; +class SessionController; enum class PeerMenuSource { ChatsList, @@ -30,12 +30,12 @@ using PeerMenuCallback = Fn handler)>; void FillPeerMenu( - not_null controller, + not_null controller, not_null peer, const PeerMenuCallback &addAction, PeerMenuSource source); void FillFolderMenu( - not_null controller, + not_null controller, not_null folder, const PeerMenuCallback &addAction, PeerMenuSource source); diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp similarity index 82% rename from Telegram/SourceFiles/window/window_controller.cpp rename to Telegram/SourceFiles/window/window_session_controller.cpp index d398fdf31d..0e2dfcf7c2 100644 --- a/Telegram/SourceFiles/window/window_controller.cpp +++ b/Telegram/SourceFiles/window/window_session_controller.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "window/window_controller.h" +#include "window/window_session_controller.h" #include "boxes/peers/edit_peer_info_box.h" #include "window/main_window.h" @@ -48,17 +48,18 @@ void DateClickHandler::setDate(QDate date) { } void DateClickHandler::onClick(ClickContext context) const { - App::wnd()->controller()->showJumpToDate(_chat, _date); + App::wnd()->sessionController()->showJumpToDate(_chat, _date); } -Navigation::Navigation(not_null session) : _session(session) { +SessionNavigation::SessionNavigation(not_null session) +: _session(session) { } -AuthSession &Navigation::session() const { +AuthSession &SessionNavigation::session() const { return *_session; } -void Navigation::showPeerInfo( +void SessionNavigation::showPeerInfo( PeerId peerId, const SectionShow ¶ms) { //if (Adaptive::ThreeColumn() @@ -69,19 +70,19 @@ void Navigation::showPeerInfo( showSection(Info::Memento(peerId), params); } -void Navigation::showPeerInfo( +void SessionNavigation::showPeerInfo( not_null peer, const SectionShow ¶ms) { showPeerInfo(peer->id, params); } -void Navigation::showPeerInfo( +void SessionNavigation::showPeerInfo( not_null history, const SectionShow ¶ms) { showPeerInfo(history->peer->id, params); } -void Navigation::showSettings( +void SessionNavigation::showSettings( Settings::Type type, const SectionShow ¶ms) { showSection( @@ -91,14 +92,14 @@ void Navigation::showSettings( params); } -void Navigation::showSettings(const SectionShow ¶ms) { +void SessionNavigation::showSettings(const SectionShow ¶ms) { showSettings(Settings::Type::Main, params); } -Controller::Controller( +SessionController::SessionController( not_null session, not_null window) -: Navigation(session) +: SessionNavigation(session) , _window(window) { init(); @@ -120,18 +121,18 @@ Controller::Controller( }, lifetime()); } -void Controller::showEditPeerBox(PeerData *peer) { +void SessionController::showEditPeerBox(PeerData *peer) { _showEditPeer = peer; Auth().api().requestFullPeer(peer); } -void Controller::init() { +void SessionController::init() { if (session().supportMode()) { initSupportMode(); } } -void Controller::initSupportMode() { +void SessionController::initSupportMode() { session().supportHelper().registerWindow(this); Shortcuts::Requests( @@ -147,32 +148,32 @@ void Controller::initSupportMode() { }, lifetime()); } -bool Controller::uniqueChatsInSearchResults() const { +bool SessionController::uniqueChatsInSearchResults() const { return session().supportMode() && !session().settings().supportAllSearchResults() && !searchInChat.current(); } -void Controller::openFolder(not_null folder) { +void SessionController::openFolder(not_null folder) { _openedFolder = folder.get(); } -void Controller::closeFolder() { +void SessionController::closeFolder() { _openedFolder = nullptr; } -const rpl::variable &Controller::openedFolder() const { +const rpl::variable &SessionController::openedFolder() const { return _openedFolder; } -void Controller::setActiveChatEntry(Dialogs::RowDescriptor row) { +void SessionController::setActiveChatEntry(Dialogs::RowDescriptor row) { _activeChatEntry = row; if (session().supportMode()) { pushToChatEntryHistory(row); } } -bool Controller::chatEntryHistoryMove(int steps) { +bool SessionController::chatEntryHistoryMove(int steps) { if (_chatEntryHistory.empty()) { return false; } @@ -184,7 +185,7 @@ bool Controller::chatEntryHistoryMove(int steps) { return jumpToChatListEntry(_chatEntryHistory[position]); } -bool Controller::jumpToChatListEntry(Dialogs::RowDescriptor row) { +bool SessionController::jumpToChatListEntry(Dialogs::RowDescriptor row) { if (const auto history = row.key.history()) { Ui::showPeerHistory(history, row.fullId.msg); return true; @@ -198,7 +199,7 @@ bool Controller::jumpToChatListEntry(Dialogs::RowDescriptor row) { return false; } -void Controller::pushToChatEntryHistory(Dialogs::RowDescriptor row) { +void SessionController::pushToChatEntryHistory(Dialogs::RowDescriptor row) { if (!_chatEntryHistory.empty() && _chatEntryHistory[_chatEntryHistoryPosition] == row) { return; @@ -211,43 +212,43 @@ void Controller::pushToChatEntryHistory(Dialogs::RowDescriptor row) { } } -void Controller::setActiveChatEntry(Dialogs::Key key) { +void SessionController::setActiveChatEntry(Dialogs::Key key) { setActiveChatEntry({ key, FullMsgId() }); } -Dialogs::RowDescriptor Controller::activeChatEntryCurrent() const { +Dialogs::RowDescriptor SessionController::activeChatEntryCurrent() const { return _activeChatEntry.current(); } -Dialogs::Key Controller::activeChatCurrent() const { +Dialogs::Key SessionController::activeChatCurrent() const { return activeChatEntryCurrent().key; } -auto Controller::activeChatEntryChanges() const +auto SessionController::activeChatEntryChanges() const -> rpl::producer { return _activeChatEntry.changes(); } -rpl::producer Controller::activeChatChanges() const { +rpl::producer SessionController::activeChatChanges() const { return activeChatEntryChanges( ) | rpl::map([](const Dialogs::RowDescriptor &value) { return value.key; }) | rpl::distinct_until_changed(); } -auto Controller::activeChatEntryValue() const +auto SessionController::activeChatEntryValue() const -> rpl::producer { return _activeChatEntry.value(); } -rpl::producer Controller::activeChatValue() const { +rpl::producer SessionController::activeChatValue() const { return activeChatEntryValue( ) | rpl::map([](const Dialogs::RowDescriptor &value) { return value.key; }) | rpl::distinct_until_changed(); } -void Controller::enableGifPauseReason(GifPauseReason reason) { +void SessionController::enableGifPauseReason(GifPauseReason reason) { if (!(_gifPauseReasons & reason)) { auto notify = (static_cast(_gifPauseReasons) < static_cast(reason)); _gifPauseReasons |= reason; @@ -257,7 +258,7 @@ void Controller::enableGifPauseReason(GifPauseReason reason) { } } -void Controller::disableGifPauseReason(GifPauseReason reason) { +void SessionController::disableGifPauseReason(GifPauseReason reason) { if (_gifPauseReasons & reason) { _gifPauseReasons &= ~reason; if (_gifPauseReasons < reason) { @@ -266,24 +267,24 @@ void Controller::disableGifPauseReason(GifPauseReason reason) { } } -bool Controller::isGifPausedAtLeastFor(GifPauseReason reason) const { +bool SessionController::isGifPausedAtLeastFor(GifPauseReason reason) const { if (reason == GifPauseReason::Any) { return (_gifPauseReasons != 0) || !window()->isActive(); } return (static_cast(_gifPauseReasons) >= 2 * static_cast(reason)) || !window()->isActive(); } -int Controller::dialogsSmallColumnWidth() const { +int SessionController::dialogsSmallColumnWidth() const { return st::dialogsPadding.x() + st::dialogsPhotoSize + st::dialogsPadding.x(); } -int Controller::minimalThreeColumnWidth() const { +int SessionController::minimalThreeColumnWidth() const { return st::columnMinimalWidthLeft + st::columnMinimalWidthMain + st::columnMinimalWidthThird; } -bool Controller::forceWideDialogs() const { +bool SessionController::forceWideDialogs() const { if (dialogsListDisplayForced().value()) { return true; } else if (dialogsListFocused().value()) { @@ -292,7 +293,7 @@ bool Controller::forceWideDialogs() const { return !App::main()->isMainSectionShown(); } -Controller::ColumnLayout Controller::computeColumnLayout() const { +SessionController::ColumnLayout SessionController::computeColumnLayout() const { auto layout = Adaptive::WindowLayout::OneColumn; auto bodyWidth = window()->bodyWidget()->width(); @@ -342,21 +343,21 @@ Controller::ColumnLayout Controller::computeColumnLayout() const { return { bodyWidth, dialogsWidth, chatWidth, thirdWidth, layout }; } -int Controller::countDialogsWidthFromRatio(int bodyWidth) const { +int SessionController::countDialogsWidthFromRatio(int bodyWidth) const { auto result = qRound(bodyWidth * session().settings().dialogsWidthRatio()); accumulate_max(result, st::columnMinimalWidthLeft); // accumulate_min(result, st::columnMaximalWidthLeft); return result; } -int Controller::countThirdColumnWidthFromRatio(int bodyWidth) const { +int SessionController::countThirdColumnWidthFromRatio(int bodyWidth) const { auto result = session().settings().thirdColumnWidth(); accumulate_max(result, st::columnMinimalWidthThird); accumulate_min(result, st::columnMaximalWidthThird); return result; } -Controller::ShrinkResult Controller::shrinkDialogsAndThirdColumns( +SessionController::ShrinkResult SessionController::shrinkDialogsAndThirdColumns( int dialogsWidth, int thirdWidth, int bodyWidth) const { @@ -380,23 +381,23 @@ Controller::ShrinkResult Controller::shrinkDialogsAndThirdColumns( return { dialogsWidthNew, thirdWidthNew }; } -bool Controller::canShowThirdSection() const { +bool SessionController::canShowThirdSection() const { auto currentLayout = computeColumnLayout(); auto minimalExtendBy = minimalThreeColumnWidth() - currentLayout.bodyWidth; return (minimalExtendBy <= window()->maximalExtendBy()); } -bool Controller::canShowThirdSectionWithoutResize() const { +bool SessionController::canShowThirdSectionWithoutResize() const { auto currentWidth = computeColumnLayout().bodyWidth; return currentWidth >= minimalThreeColumnWidth(); } -bool Controller::takeThirdSectionFromLayer() { +bool SessionController::takeThirdSectionFromLayer() { return App::wnd()->takeThirdSectionFromLayer(); } -void Controller::resizeForThirdSection() { +void SessionController::resizeForThirdSection() { if (Adaptive::ThreeColumn()) { return; } @@ -445,7 +446,7 @@ void Controller::resizeForThirdSection() { thirdSectionInfoEnabled); } -void Controller::closeThirdSection() { +void SessionController::closeThirdSection() { auto newWindowSize = window()->size(); auto layout = computeColumnLayout(); if (layout.windowLayout == Adaptive::WindowLayout::ThreeColumn) { @@ -475,7 +476,7 @@ void Controller::closeThirdSection() { } } -void Controller::showJumpToDate(Dialogs::Key chat, QDate requestedDate) { +void SessionController::showJumpToDate(Dialogs::Key chat, QDate requestedDate) { const auto currentPeerDate = [&] { if (const auto history = chat.history()) { if (history->scrollTopItem) { @@ -563,22 +564,22 @@ void Controller::showJumpToDate(Dialogs::Key chat, QDate requestedDate) { Ui::show(std::move(box)); } -void Controller::showPassportForm(const Passport::FormRequest &request) { +void SessionController::showPassportForm(const Passport::FormRequest &request) { _passportForm = std::make_unique( this, request); _passportForm->show(); } -void Controller::clearPassportForm() { +void SessionController::clearPassportForm() { _passportForm = nullptr; } -void Controller::updateColumnLayout() { +void SessionController::updateColumnLayout() { App::main()->updateColumnLayout(); } -void Controller::showPeerHistory( +void SessionController::showPeerHistory( PeerId peerId, const SectionShow ¶ms, MsgId msgId) { @@ -588,7 +589,7 @@ void Controller::showPeerHistory( msgId); } -void Controller::showPeerHistory( +void SessionController::showPeerHistory( not_null peer, const SectionShow ¶ms, MsgId msgId) { @@ -598,7 +599,7 @@ void Controller::showPeerHistory( msgId); } -void Controller::showPeerHistory( +void SessionController::showPeerHistory( not_null history, const SectionShow ¶ms, MsgId msgId) { @@ -608,7 +609,7 @@ void Controller::showPeerHistory( msgId); } -void Controller::showSection( +void SessionController::showSection( SectionMemento &&memento, const SectionShow ¶ms) { if (!params.thirdColumn && App::wnd()->showSectionInExistingLayer( @@ -619,25 +620,25 @@ void Controller::showSection( App::main()->showSection(std::move(memento), params); } -void Controller::showBackFromStack(const SectionShow ¶ms) { +void SessionController::showBackFromStack(const SectionShow ¶ms) { chats()->showBackFromStack(params); } -void Controller::showSpecialLayer( +void SessionController::showSpecialLayer( object_ptr &&layer, anim::type animated) { App::wnd()->showSpecialLayer(std::move(layer), animated); } -void Controller::removeLayerBlackout() { +void SessionController::removeLayerBlackout() { App::wnd()->ui_removeLayerBlackout(); } -not_null Controller::chats() const { +not_null SessionController::chats() const { return App::wnd()->chatsWidget(); } -void Controller::setDefaultFloatPlayerDelegate( +void SessionController::setDefaultFloatPlayerDelegate( not_null delegate) { Expects(_defaultFloatPlayerDelegate == nullptr); @@ -646,7 +647,7 @@ void Controller::setDefaultFloatPlayerDelegate( delegate); } -void Controller::replaceFloatPlayerDelegate( +void SessionController::replaceFloatPlayerDelegate( not_null replacement) { Expects(_floatPlayers != nullptr); @@ -654,7 +655,7 @@ void Controller::replaceFloatPlayerDelegate( _floatPlayers->replaceDelegate(replacement); } -void Controller::restoreFloatPlayerDelegate( +void SessionController::restoreFloatPlayerDelegate( not_null replacement) { Expects(_floatPlayers != nullptr); @@ -664,12 +665,12 @@ void Controller::restoreFloatPlayerDelegate( } } -rpl::producer Controller::floatPlayerClosed() const { +rpl::producer SessionController::floatPlayerClosed() const { Expects(_floatPlayers != nullptr); return _floatPlayers->closeEvents(); } -Controller::~Controller() = default; +SessionController::~SessionController() = default; } // namespace Window diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_session_controller.h similarity index 95% rename from Telegram/SourceFiles/window/window_controller.h rename to Telegram/SourceFiles/window/window_session_controller.h index 2896f4cade..06878a4969 100644 --- a/Telegram/SourceFiles/window/window_controller.h +++ b/Telegram/SourceFiles/window/window_session_controller.h @@ -100,11 +100,11 @@ struct SectionShow { }; -class Controller; +class SessionController; -class Navigation { +class SessionNavigation { public: - explicit Navigation(not_null session); + explicit SessionNavigation(not_null session); AuthSession &session() const; @@ -113,7 +113,7 @@ public: const SectionShow ¶ms = SectionShow()) = 0; virtual void showBackFromStack( const SectionShow ¶ms = SectionShow()) = 0; - virtual not_null parentController() = 0; + virtual not_null parentController() = 0; void showPeerInfo( PeerId peerId, @@ -130,18 +130,18 @@ public: const SectionShow ¶ms = SectionShow()); void showSettings(const SectionShow ¶ms = SectionShow()); - virtual ~Navigation() = default; + virtual ~SessionNavigation() = default; private: const not_null _session; }; -class Controller - : public Navigation +class SessionController + : public SessionNavigation , private base::Subscriber { public: - Controller( + SessionController( not_null session, not_null window); @@ -251,7 +251,7 @@ public: return _dialogsListDisplayForced; } - not_null parentController() override { + not_null parentController() override { return this; } @@ -267,7 +267,7 @@ public: return _lifetime; } - ~Controller(); + ~SessionController(); private: void init(); diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index 929dac12db..76aae12d1e 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -827,8 +827,6 @@ <(src_loc)/window/section_widget.h <(src_loc)/window/window_connecting_widget.cpp <(src_loc)/window/window_connecting_widget.h -<(src_loc)/window/window_controller.cpp -<(src_loc)/window/window_controller.h <(src_loc)/window/window_history_hider.cpp <(src_loc)/window/window_history_hider.h <(src_loc)/window/window_lock_widgets.cpp @@ -839,6 +837,8 @@ <(src_loc)/window/window_outdated_bar.h <(src_loc)/window/window_peer_menu.cpp <(src_loc)/window/window_peer_menu.h +<(src_loc)/window/window_session_controller.cpp +<(src_loc)/window/window_session_controller.h <(src_loc)/window/window_slide_animation.cpp <(src_loc)/window/window_slide_animation.h <(src_loc)/window/window_title.h