From 479611f6df7dd70e72a13774c2bfe71765f815f8 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 27 Jul 2021 02:46:29 +0300 Subject: [PATCH] Removed ui_getPeerForMouseAction. --- Telegram/SourceFiles/core/application.cpp | 9 --------- Telegram/SourceFiles/core/application.h | 1 - Telegram/SourceFiles/facades.cpp | 4 ---- Telegram/SourceFiles/history/history_widget.cpp | 4 ---- Telegram/SourceFiles/history/history_widget.h | 2 -- Telegram/SourceFiles/mainwidget.cpp | 4 ---- Telegram/SourceFiles/mainwidget.h | 1 - .../SourceFiles/media/view/media_view_overlay_widget.cpp | 4 ---- .../SourceFiles/media/view/media_view_overlay_widget.h | 2 -- 9 files changed, 31 deletions(-) diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp index b21d839a9..eb66c9519 100644 --- a/Telegram/SourceFiles/core/application.cpp +++ b/Telegram/SourceFiles/core/application.cpp @@ -392,15 +392,6 @@ bool Application::hideMediaView() { return false; } -PeerData *Application::ui_getPeerForMouseAction() { - if (_mediaView && !_mediaView->isHidden()) { - return _mediaView->ui_getPeerForMouseAction(); - } else if (const auto m = App::main()) { // multi good - return m->ui_getPeerForMouseAction(); - } - return nullptr; -} - bool Application::eventFilter(QObject *object, QEvent *e) { switch (e->type()) { case QEvent::KeyPress: diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h index c1ae38481..fa4beced6 100644 --- a/Telegram/SourceFiles/core/application.h +++ b/Telegram/SourceFiles/core/application.h @@ -143,7 +143,6 @@ public: // Media view interface. void checkMediaViewActivation(); bool hideMediaView(); - [[nodiscard]] PeerData *ui_getPeerForMouseAction(); [[nodiscard]] QPoint getPointForCallPanelCenter() const; [[nodiscard]] QImage logo() const { diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index 9797bfcc9..ecffe7ac5 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -259,10 +259,6 @@ void showPeerHistory(not_null peer, MsgId msgId) { } } -PeerData *getPeerForMouseAction() { - return Core::App().ui_getPeerForMouseAction(); -} - bool skipPaintEvent(QWidget *widget, QPaintEvent *event) { if (auto w = App::wnd()) { if (w->contentOverlapped(widget, event)) { diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 3b3e3fed8..9e57b58ad 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -4593,10 +4593,6 @@ void HistoryWidget::updateHistoryItemsByTimer() { } } -PeerData *HistoryWidget::ui_getPeerForMouseAction() { - return _peer; -} - void HistoryWidget::handlePendingHistoryUpdate() { if (hasPendingResizedItems() || _updateHistoryGeometryRequired) { updateHistoryGeometry(); diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h index 36098584a..ca7847214 100644 --- a/Telegram/SourceFiles/history/history_widget.h +++ b/Telegram/SourceFiles/history/history_widget.h @@ -283,8 +283,6 @@ public: bool floatPlayerHandleWheelEvent(QEvent *e) override; QRect floatPlayerAvailableRect() override; - PeerData *ui_getPeerForMouseAction(); - bool notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo); ~HistoryWidget(); diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 8e3856a3c..1a83454ff 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -1609,10 +1609,6 @@ void MainWidget::ui_showPeerHistory( floatPlayerCheckVisibility(); } -PeerData *MainWidget::ui_getPeerForMouseAction() { - return _history->ui_getPeerForMouseAction(); -} - PeerData *MainWidget::peer() { return _history->peer(); } diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index 5a281bdc8..3f18b3263 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -218,7 +218,6 @@ public: PeerId peer, const SectionShow ¶ms, MsgId msgId); - PeerData *ui_getPeerForMouseAction(); bool notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo); diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index f8c1f4415..638f24f14 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -1577,10 +1577,6 @@ void OverlayWidget::handleDocumentClick() { } } -PeerData *OverlayWidget::ui_getPeerForMouseAction() { - return _history ? _history->peer.get() : nullptr; -} - void OverlayWidget::downloadMedia() { if (!_photo && !_document) { return; diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h index 24a1cb273..af83a5f9b 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h @@ -92,8 +92,6 @@ public: void activateControls(); void close(); - PeerData *ui_getPeerForMouseAction(); - void notifyFileDialogShown(bool shown); void clearSession();