diff options
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qinputdialog.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/itemviews/qheaderview.cpp | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp index 80e329bcfe..89ea6e6746 100644 --- a/src/widgets/dialogs/qinputdialog.cpp +++ b/src/widgets/dialogs/qinputdialog.cpp @@ -38,8 +38,7 @@ static const char *candidateSignal(int which) case NumCandidateSignals: break; }; - Q_UNREACHABLE(); - return nullptr; + Q_UNREACHABLE_RETURN(nullptr); } static const char *signalForMember(const char *member) diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 884517d53f..1716d8182b 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -129,8 +129,7 @@ static const char *changed_signal(int which) case 6: return SIGNAL(valueChanged(int)); }; static_assert(7 == NFallbackDefaultProperties); - Q_UNREACHABLE(); - return nullptr; + Q_UNREACHABLE_RETURN(nullptr); } class QWizardDefaultProperty @@ -1350,8 +1349,7 @@ static QString object_name_for_button(QWizard::WizardButton which) //case QWizard::NButtons: ; } - Q_UNREACHABLE(); - return QString(); + Q_UNREACHABLE_RETURN(QString()); } bool QWizardPrivate::ensureButton(QWizard::WizardButton which) const diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp index 90c3b282ee..e231345437 100644 --- a/src/widgets/itemviews/qheaderview.cpp +++ b/src/widgets/itemviews/qheaderview.cpp @@ -3723,8 +3723,7 @@ static Qt::SortOrder flipOrder(Qt::SortOrder order) case Qt::DescendingOrder: return Qt::AscendingOrder; }; - Q_UNREACHABLE(); - return Qt::AscendingOrder; + Q_UNREACHABLE_RETURN(Qt::AscendingOrder); }; void QHeaderViewPrivate::flipSortIndicator(int section) |