diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-06-11 11:35:19 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-06-19 19:38:23 +0200 |
| commit | 3e1d03b1eaf6a5e842bed4ae4f9bb8cca05e5b31 (patch) | |
| tree | 74dd3478dce3bc96121238300fc0bbc6ef97fc3e /src/widgets | |
| parent | 5b686e208ffc68f9f660d36c468280d50a40e3ad (diff) | |
Port Q_STATIC_ASSERT(_X) to static_assert
There is no reason for keep using our macro now that we have C++17.
The macro itself is left in for the moment being, as well as its
detection logic, because it's needed for C code (not everything
supports C11 yet). A few more cleanups will arrive in the next few
patches.
Note that this is a mere search/replace; some places were using
double braces to work around the presence of commas in a macro, no
attempt has been done to fix those.
tst_qglobal had just some minor changes to keep testing the macro.
Change-Id: I1c1c397d9f3e63db3338842bf350c9069ea57639
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qerrormessage.cpp | 10 | ||||
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qkeysequenceedit.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp index 790d09414b..ba57faa898 100644 --- a/src/widgets/dialogs/qerrormessage.cpp +++ b/src/widgets/dialogs/qerrormessage.cpp @@ -163,11 +163,11 @@ static bool metFatal = false; static QString msgType2i18nString(QtMsgType t) { - Q_STATIC_ASSERT(QtDebugMsg == 0); - Q_STATIC_ASSERT(QtWarningMsg == 1); - Q_STATIC_ASSERT(QtCriticalMsg == 2); - Q_STATIC_ASSERT(QtFatalMsg == 3); - Q_STATIC_ASSERT(QtInfoMsg == 4); + static_assert(QtDebugMsg == 0); + static_assert(QtWarningMsg == 1); + static_assert(QtCriticalMsg == 2); + static_assert(QtFatalMsg == 3); + static_assert(QtInfoMsg == 4); // adjust the array below if any of the above fire... diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index ff2f202bb4..97d61a9a15 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -163,7 +163,7 @@ static const char *changed_signal(int which) case 5: return SIGNAL(currentRowChanged(int)); case 6: return SIGNAL(valueChanged(int)); }; - Q_STATIC_ASSERT(7 == NFallbackDefaultProperties); + static_assert(7 == NFallbackDefaultProperties); Q_UNREACHABLE(); return nullptr; } diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index c7303dde66..b7396f2b6b 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -10869,7 +10869,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) return; Q_D(QWidget); - Q_STATIC_ASSERT_X(sizeof(d->high_attributes)*8 >= (Qt::WA_AttributeCount - sizeof(uint)*8), + static_assert(sizeof(d->high_attributes)*8 >= (Qt::WA_AttributeCount - sizeof(uint)*8), "QWidget::setAttribute(WidgetAttribute, bool): " "QWidgetPrivate::high_attributes[] too small to contain all attributes in WidgetAttribute"); #ifdef Q_OS_WIN diff --git a/src/widgets/widgets/qkeysequenceedit.cpp b/src/widgets/widgets/qkeysequenceedit.cpp index b63b0b4d72..a38250c195 100644 --- a/src/widgets/widgets/qkeysequenceedit.cpp +++ b/src/widgets/widgets/qkeysequenceedit.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -Q_STATIC_ASSERT(QKeySequencePrivate::MaxKeyCount == 4); // assumed by the code around here +static_assert(QKeySequencePrivate::MaxKeyCount == 4); // assumed by the code around here void QKeySequenceEditPrivate::init() { |