diff options
-rw-r--r-- | src/assistant/assistant/bookmarkmanager.cpp | 8 | ||||
-rw-r--r-- | src/assistant/assistant/bookmarkmanagerwidget.cpp | 16 | ||||
-rw-r--r-- | src/assistant/assistant/contentwindow.cpp | 2 | ||||
-rw-r--r-- | src/assistant/assistant/helpviewer_qtb.cpp | 2 | ||||
-rw-r--r-- | src/assistant/assistant/helpviewer_qwv.cpp | 11 | ||||
-rw-r--r-- | src/assistant/assistant/indexwindow.cpp | 2 | ||||
-rw-r--r-- | src/assistant/assistant/searchwidget.cpp | 4 | ||||
-rw-r--r-- | src/designer/src/components/formeditor/formwindow.cpp | 6 |
8 files changed, 26 insertions, 25 deletions
diff --git a/src/assistant/assistant/bookmarkmanager.cpp b/src/assistant/assistant/bookmarkmanager.cpp index 331cea864..f60fda991 100644 --- a/src/assistant/assistant/bookmarkmanager.cpp +++ b/src/assistant/assistant/bookmarkmanager.cpp @@ -270,14 +270,14 @@ bool BookmarkManager::eventFilter(QObject *object, QEvent *event) if (event->type() == QEvent::MouseButtonRelease && !isWidget) { QMouseEvent *me = static_cast<QMouseEvent*>(event); switch (me->button()) { - case Qt::LeftButton: { + case Qt::LeftButton: if (me->modifiers() & Qt::ControlModifier) setSourceFromIndex(bookmarkTreeView->currentIndex(), true); - } break; + break; - case Qt::MidButton: { + case Qt::MiddleButton: setSourceFromIndex(bookmarkTreeView->currentIndex(), true); - } break; + break; default: break; } diff --git a/src/assistant/assistant/bookmarkmanagerwidget.cpp b/src/assistant/assistant/bookmarkmanagerwidget.cpp index ba4f5cfd4..0313ece45 100644 --- a/src/assistant/assistant/bookmarkmanagerwidget.cpp +++ b/src/assistant/assistant/bookmarkmanagerwidget.cpp @@ -143,13 +143,13 @@ bool BookmarkManagerWidget::eventFilter(QObject *object, QEvent *event) if (event->type() == QEvent::KeyPress) { QKeyEvent *ke = static_cast<QKeyEvent*>(event); switch (ke->key()) { - case Qt::Key_F2: { + case Qt::Key_F2: renameItem(ui.treeView->currentIndex()); - } break; + break; - case Qt::Key_Delete: { + case Qt::Key_Delete: removeItem(ui.treeView->currentIndex()); - } break; + break; default: break; } @@ -158,14 +158,14 @@ bool BookmarkManagerWidget::eventFilter(QObject *object, QEvent *event) if (event->type() == QEvent::MouseButtonRelease) { QMouseEvent *me = static_cast<QMouseEvent*>(event); switch (me->button()) { - case Qt::LeftButton: { + case Qt::LeftButton: if (me->modifiers() & Qt::ControlModifier) setSourceFromIndex(ui.treeView->currentIndex(), true); - } break; + break; - case Qt::MidButton: { + case Qt::MiddleButton: setSourceFromIndex(ui.treeView->currentIndex(), true); - } break; + break; default: break; } diff --git a/src/assistant/assistant/contentwindow.cpp b/src/assistant/assistant/contentwindow.cpp index c932c06b7..3482fd7ba 100644 --- a/src/assistant/assistant/contentwindow.cpp +++ b/src/assistant/assistant/contentwindow.cpp @@ -131,7 +131,7 @@ bool ContentWindow::eventFilter(QObject *o, QEvent *e) QItemSelectionModel *sm = m_contentWidget->selectionModel(); if (sm->isSelected(index)) { if ((button == Qt::LeftButton && (me->modifiers() & Qt::ControlModifier)) - || (button == Qt::MidButton)) { + || (button == Qt::MiddleButton)) { QHelpContentModel *contentModel = qobject_cast<QHelpContentModel*>(m_contentWidget->model()); if (contentModel) { diff --git a/src/assistant/assistant/helpviewer_qtb.cpp b/src/assistant/assistant/helpviewer_qtb.cpp index 260dbfc1d..3d64f772d 100644 --- a/src/assistant/assistant/helpviewer_qtb.cpp +++ b/src/assistant/assistant/helpviewer_qtb.cpp @@ -305,7 +305,7 @@ void HelpViewer::mouseReleaseEvent(QMouseEvent *e) bool controlPressed = e->modifiers() & Qt::ControlModifier; if ((controlPressed && d->hasAnchorAt(this, e->pos())) || - (e->button() == Qt::MidButton && d->hasAnchorAt(this, e->pos()))) { + (e->button() == Qt::MiddleButton && d->hasAnchorAt(this, e->pos()))) { d->openLinkInNewPage(); return; } diff --git a/src/assistant/assistant/helpviewer_qwv.cpp b/src/assistant/assistant/helpviewer_qwv.cpp index 7d9cfc07f..5f2c5583a 100644 --- a/src/assistant/assistant/helpviewer_qwv.cpp +++ b/src/assistant/assistant/helpviewer_qwv.cpp @@ -124,11 +124,12 @@ bool HelpPage::acceptNavigationRequest(QWebFrame *, } if (type == QWebPage::NavigationTypeLinkClicked - && (m_keyboardModifiers & Qt::ControlModifier || m_pressedButtons == Qt::MidButton)) { - m_pressedButtons = Qt::NoButton; - m_keyboardModifiers = Qt::NoModifier; - OpenPagesManager::instance()->createPage(url); - return false; + && (m_keyboardModifiers & Qt::ControlModifier + || m_pressedButtons == Qt::MiddleButton)) { + m_pressedButtons = Qt::NoButton; + m_keyboardModifiers = Qt::NoModifier; + OpenPagesManager::instance()->createPage(url); + return false; } m_loadingUrl = url; // because of async page loading, we will hit some kind diff --git a/src/assistant/assistant/indexwindow.cpp b/src/assistant/assistant/indexwindow.cpp index c0647ca6f..5e7ece6cb 100644 --- a/src/assistant/assistant/indexwindow.cpp +++ b/src/assistant/assistant/indexwindow.cpp @@ -151,7 +151,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(m_indexWidget, idx); } } diff --git a/src/assistant/assistant/searchwidget.cpp b/src/assistant/assistant/searchwidget.cpp index f4d991df7..ae7b58f2c 100644 --- a/src/assistant/assistant/searchwidget.cpp +++ b/src/assistant/assistant/searchwidget.cpp @@ -149,8 +149,8 @@ bool SearchWidget::eventFilter(QObject* o, QEvent *e) QUrl link = resultWidget->linkAt(me->pos()); if (!link.isEmpty() || link.isValid()) { bool controlPressed = me->modifiers() & Qt::ControlModifier; - if((me->button() == Qt::LeftButton && controlPressed) - || (me->button() == Qt::MidButton)) { + if ((me->button() == Qt::LeftButton && controlPressed) + || (me->button() == Qt::MiddleButton)) { emit requestShowLinkInNewTab(link); } } diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index 84e065bcb..da856c212 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -596,7 +596,7 @@ bool FormWindow::handleMousePressEvent(QWidget * widget, QWidget *managedWidget, core()->formWindowManager()->setActiveFormWindow(this); const Qt::MouseButtons buttons = e->buttons(); - if (buttons != Qt::LeftButton && buttons != Qt::MidButton) + if (buttons != Qt::LeftButton && buttons != Qt::MiddleButton) return true; m_startPos = mapFromGlobal(e->globalPos()); @@ -604,7 +604,7 @@ bool FormWindow::handleMousePressEvent(QWidget * widget, QWidget *managedWidget, if (debugFormWindow) qDebug() << "handleMousePressEvent:" << widget << ',' << managedWidget; - if (buttons == Qt::MidButton || isMainContainer(managedWidget)) { // press was on the formwindow + if (buttons == Qt::MiddleButton || isMainContainer(managedWidget)) { // press was on the formwindow clearObjectInspectorSelection(m_core); // We might have a toolbar or non-widget selected in the object inspector. clearSelection(false); @@ -788,7 +788,7 @@ bool FormWindow::handleMouseReleaseEvent(QWidget *w, QWidget *mw, QMouseEvent *e * MousePressEvent. */ switch (e->button()) { case Qt::LeftButton: - case Qt::MidButton: + case Qt::MiddleButton: case Qt::RightButton: emitSelectionChanged(); break; |