From 431479599221e4b62c2fdb501cd8e508e06dce88 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 27 Aug 2020 18:19:46 +0200 Subject: [PATCH] Help: Replace Qt::MidButton by Qt::MiddleButton Task-number: QTCREATORBUG-24098 Change-Id: I46e06ec1402be345ebd1e4543ed67a726caa42a7 Reviewed-by: Eike Ziller --- src/plugins/help/searchwidget.cpp | 2 +- src/plugins/help/textbrowserhelpviewer.cpp | 2 +- src/shared/help/bookmarkmanager.cpp | 2 +- src/shared/help/contentwindow.cpp | 2 +- src/shared/help/indexwindow.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp index 7f6da5b847b..48d48347374 100644 --- a/src/plugins/help/searchwidget.cpp +++ b/src/plugins/help/searchwidget.cpp @@ -216,7 +216,7 @@ bool SearchWidget::eventFilter(QObject *o, QEvent *e) if (!link.isEmpty() || link.isValid()) { bool controlPressed = me->modifiers() & Qt::ControlModifier; if ((me->button() == Qt::LeftButton && controlPressed) - || (me->button() == Qt::MidButton)) { + || (me->button() == Qt::MiddleButton)) { emit linkActivated(link, currentSearchTerms(), true/*newPage*/); } } diff --git a/src/plugins/help/textbrowserhelpviewer.cpp b/src/plugins/help/textbrowserhelpviewer.cpp index b388d247424..3c84e94229e 100644 --- a/src/plugins/help/textbrowserhelpviewer.cpp +++ b/src/plugins/help/textbrowserhelpviewer.cpp @@ -443,7 +443,7 @@ void TextBrowserHelpWidget::mouseReleaseEvent(QMouseEvent *e) bool controlPressed = e->modifiers() & Qt::ControlModifier; const QString link = linkAt(e->pos()); if (m_parent->isActionVisible(HelpViewer::Action::NewPage) - && (controlPressed || e->button() == Qt::MidButton) && !link.isEmpty()) { + && (controlPressed || e->button() == Qt::MiddleButton) && !link.isEmpty()) { emit m_parent->newPageRequested(QUrl(link)); return; } diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp index 54817c3e7aa..562750f0cb0 100644 --- a/src/shared/help/bookmarkmanager.cpp +++ b/src/shared/help/bookmarkmanager.cpp @@ -513,7 +513,7 @@ bool BookmarkWidget::eventFilter(QObject *object, QEvent *e) QMouseEvent *me = static_cast(e); bool controlPressed = me->modifiers() & Qt::ControlModifier; if (((me->button() == Qt::LeftButton) && controlPressed) - || (me->button() == Qt::MidButton)) { + || (me->button() == Qt::MiddleButton)) { QString data = index.data(Qt::UserRole + 10).toString(); if (!data.isEmpty() && data != QLatin1String("Folder")) emit createPage(QUrl(data), false); diff --git a/src/shared/help/contentwindow.cpp b/src/shared/help/contentwindow.cpp index 067627c03b6..2917268188f 100644 --- a/src/shared/help/contentwindow.cpp +++ b/src/shared/help/contentwindow.cpp @@ -107,7 +107,7 @@ bool ContentWindow::eventFilter(QObject *o, QEvent *e) if (index.isValid() && sm->isSelected(index)) { if ((button == Qt::LeftButton && (me->modifiers() & Qt::ControlModifier)) - || (button == Qt::MidButton)) { + || (button == Qt::MiddleButton)) { QHelpContentItem *itm = m_contentModel->contentItemAt(index); if (itm) emit linkActivated(itm->url(), true/*newPage*/); diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp index 0f8b51bab06..88e44f4b0e0 100644 --- a/src/shared/help/indexwindow.cpp +++ b/src/shared/help/indexwindow.cpp @@ -178,7 +178,7 @@ bool IndexWindow::eventFilter(QObject *obj, QEvent *e) if (idx.isValid()) { Qt::MouseButtons button = mouseEvent->button(); if (((button == Qt::LeftButton) && (mouseEvent->modifiers() & Qt::ControlModifier)) - || (button == Qt::MidButton)) { + || (button == Qt::MiddleButton)) { open(idx); } }