From 29bbf3589573218fd742328f8b6a25c33a054a28 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 19 Jul 2022 18:58:20 +0200 Subject: [PATCH] TextBrowserHelpViewer: Avoid using sender() Avoid setting / getting QAction data. Change-Id: I61d62f2376e09c1dfeadbbe5ada32938ff8bc821 Reviewed-by: Eike Ziller Reviewed-by: --- src/plugins/help/textbrowserhelpviewer.cpp | 31 ++++++---------------- src/plugins/help/textbrowserhelpviewer.h | 1 - 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/src/plugins/help/textbrowserhelpviewer.cpp b/src/plugins/help/textbrowserhelpviewer.cpp index fe179f9c986..f6f7b9eaf08 100644 --- a/src/plugins/help/textbrowserhelpviewer.cpp +++ b/src/plugins/help/textbrowserhelpviewer.cpp @@ -144,8 +144,10 @@ void TextBrowserHelpViewer::addBackHistoryItems(QMenu *backMenu) for (int i = 1; i <= m_textBrowser->backwardHistoryCount(); ++i) { auto action = new QAction(backMenu); action->setText(m_textBrowser->historyTitle(-i)); - action->setData(-i); - connect(action, &QAction::triggered, this, &TextBrowserHelpViewer::goToHistoryItem); + connect(action, &QAction::triggered, this, [this, index = i] { + for (int i = 0; i < index; ++i) + m_textBrowser->backward(); + }); backMenu->addAction(action); } } @@ -155,8 +157,10 @@ void TextBrowserHelpViewer::addForwardHistoryItems(QMenu *forwardMenu) for (int i = 1; i <= m_textBrowser->forwardHistoryCount(); ++i) { auto action = new QAction(forwardMenu); action->setText(m_textBrowser->historyTitle(i)); - action->setData(i); - connect(action, &QAction::triggered, this, &TextBrowserHelpViewer::goToHistoryItem); + connect(action, &QAction::triggered, this, [this, index = i] { + for (int i = 0; i < index; ++i) + m_textBrowser->forward(); + }); forwardMenu->addAction(action); } } @@ -242,25 +246,6 @@ void TextBrowserHelpViewer::print(QPrinter *printer) m_textBrowser->print(printer); } -void TextBrowserHelpViewer::goToHistoryItem() -{ - auto action = qobject_cast(sender()); - QTC_ASSERT(action, return); - bool ok = false; - int index = action->data().toInt(&ok); - QTC_ASSERT(ok, return); - // go back? - while (index < 0) { - m_textBrowser->backward(); - ++index; - } - // go forward? - while (index > 0) { - m_textBrowser->forward(); - --index; - } -} - // -- private TextBrowserHelpWidget::TextBrowserHelpWidget(TextBrowserHelpViewer *parent) diff --git a/src/plugins/help/textbrowserhelpviewer.h b/src/plugins/help/textbrowserhelpviewer.h index ecdf3effbcf..d349339e8ef 100644 --- a/src/plugins/help/textbrowserhelpviewer.h +++ b/src/plugins/help/textbrowserhelpviewer.h @@ -70,7 +70,6 @@ public: void print(QPrinter *printer) override; private: - void goToHistoryItem(); void setFontAndScale(const QFont &font, qreal scale); TextBrowserHelpWidget *m_textBrowser;