diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-10 16:08:03 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-12 07:10:25 +0000 |
commit | 9031069e12a9870c61de2fb7bfe3569f8c8859b0 (patch) | |
tree | 5964cdd7cd106ca81be94424cdefc99769d9564f /src/widgets/widgets | |
parent | cf7a4016a17615df2952389bae11149a49b151bc (diff) |
Add more Q_FALLTHROUGH()
Silence g++ 7.X warnings.
Change-Id: Id06d06e7e3b5be2cf3934d81f1891da58dea2649
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qabstractscrollarea.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 6 | ||||
-rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qdialogbuttonbox.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qmdiarea.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qmenubar.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qpushbutton.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qsplitter.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 4 |
9 files changed, 12 insertions, 12 deletions
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index c6d66bafd4..917cddce6f 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -1163,7 +1163,7 @@ bool QAbstractScrollArea::event(QEvent *e) case QEvent::ApplicationLayoutDirectionChange: case QEvent::LayoutRequest: d->layoutChildren(); - // fall through + Q_FALLTHROUGH(); default: return QFrame::event(e); } diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 4e8668b001..7d4498af5b 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -3215,7 +3215,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e) case Qt::Key_Up: if (e->modifiers() & Qt::ControlModifier) break; // pass to line edit for auto completion - // fall through + Q_FALLTHROUGH(); case Qt::Key_PageUp: #ifdef QT_KEYPAD_NAVIGATION if (QApplication::keypadNavigationEnabled()) @@ -3303,7 +3303,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e) switch (move) { case MoveFirst: newIndex = -1; - // fall through + Q_FALLTHROUGH(); case MoveDown: newIndex++; while (newIndex < rowCount && !(d->model->index(newIndex, d->modelColumn, d->root).flags() & Qt::ItemIsEnabled)) @@ -3311,7 +3311,7 @@ void QComboBox::keyPressEvent(QKeyEvent *e) break; case MoveLast: newIndex = rowCount; - // fall through + Q_FALLTHROUGH(); case MoveUp: newIndex--; while ((newIndex >= 0) && !(d->model->flags(d->model->index(newIndex,d->modelColumn,d->root)) & Qt::ItemIsEnabled)) diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 17cea09b1f..fca81bec48 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -1129,7 +1129,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event) } #endif } - // else fall through + Q_FALLTHROUGH(); case Qt::Key_Backtab: case Qt::Key_Tab: { event->accept(); diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp index 788ec67fb2..9f5b739230 100644 --- a/src/widgets/widgets/qdialogbuttonbox.cpp +++ b/src/widgets/widgets/qdialogbuttonbox.cpp @@ -927,8 +927,8 @@ void QDialogButtonBox::changeEvent(QEvent *event) for (StandardButtonHash::iterator it = d->standardButtonHash.begin(); it != end; ++it) it.key()->setStyle(newStyle); } - // fallthrough intended #ifdef Q_OS_MAC + Q_FALLTHROUGH(); case QEvent::MacSizeChange: #endif d->resetLayout(); diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index bc7333df2e..ff3e9d2d3b 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -2638,7 +2638,7 @@ bool QMdiArea::eventFilter(QObject *object, QEvent *event) d->tabBar->setTabEnabled(tabIndex, true); } #endif // QT_CONFIG(tabbar) - // fall through + Q_FALLTHROUGH(); case QEvent::Hide: d->isSubWindowsTiled = false; break; diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index 384c3b4c2c..7bc764030a 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -1542,7 +1542,7 @@ bool QMenuBar::eventFilter(QObject *object, QEvent *event) d->setKeyboardMode(!d->keyboardState); } } - // fall through + Q_FALLTHROUGH(); case QEvent::MouseButtonPress: case QEvent::MouseButtonRelease: case QEvent::MouseMove: diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp index 8187b8f35c..afb17f533b 100644 --- a/src/widgets/widgets/qpushbutton.cpp +++ b/src/widgets/widgets/qpushbutton.cpp @@ -461,7 +461,7 @@ void QPushButton::keyPressEvent(QKeyEvent *e) click(); break; } - // fall through + Q_FALLTHROUGH(); default: QAbstractButton::keyPressEvent(e); } diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index 5f49623941..8e4c846402 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -1372,7 +1372,7 @@ bool QSplitter::event(QEvent *e) if (!d->firstShow) break; d->firstShow = false; - // fall through + Q_FALLTHROUGH(); case QEvent::HideToParent: case QEvent::ShowToParent: case QEvent::LayoutRequest: diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index adaafc7d21..258e018151 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -1034,7 +1034,7 @@ void QTabBar::removeTab(int index) newIndex--; if (d->validIndex(newIndex)) break; - // else fallthrough + Q_FALLTHROUGH(); case SelectRightTab: newIndex = index; if (newIndex >= d->tabList.size()) @@ -2221,7 +2221,7 @@ void QTabBar::changeEvent(QEvent *event) d->elideMode = Qt::TextElideMode(style()->styleHint(QStyle::SH_TabBar_ElideMode, 0, this)); if (!d->useScrollButtonsSetByUser) d->useScrollButtons = !style()->styleHint(QStyle::SH_TabBar_PreferNoArrows, 0, this); - // fallthrough + Q_FALLTHROUGH(); case QEvent::FontChange: d->textSizes.clear(); d->refresh(); |