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>

6 files changed, 10 insertions, 10 deletions

diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h
index 047ab3bbd9..ca2eaae2bd 100644
--- a/src/network/kernel/qhostinfo.h
+++ b/src/network/kernel/qhostinfo.h
@@ -106,12 +106,12 @@ public:
         typedef QtPrivate::FunctionPointer<Func> SlotType;
 
         typedef QtPrivate::FunctionPointer<void (*)(QHostInfo)> SignalType;
-        Q_STATIC_ASSERT_X(int(SignalType::ArgumentCount) >= int(SlotType::ArgumentCount),
+        static_assert(int(SignalType::ArgumentCount) >= int(SlotType::ArgumentCount),
                           "The slot requires more arguments than the signal provides.");
-        Q_STATIC_ASSERT_X((QtPrivate::CheckCompatibleArguments<typename SignalType::Arguments,
+        static_assert((QtPrivate::CheckCompatibleArguments<typename SignalType::Arguments,
                            typename SlotType::Arguments>::value),
                           "Signal and slot arguments are not compatible.");
-        Q_STATIC_ASSERT_X((QtPrivate::AreArgumentsCompatible<typename SlotType::ReturnType,
+        static_assert((QtPrivate::AreArgumentsCompatible<typename SlotType::ReturnType,
                            typename SignalType::ReturnType>::value),
                           "Return type of the slot is not compatible "
                           "with the return type of the signal.");
@@ -137,7 +137,7 @@ public:
     {
         typedef QtPrivate::FunctionPointer<Func1> SlotType;
 
-        Q_STATIC_ASSERT_X(int(SlotType::ArgumentCount) <= 1,
+        static_assert(int(SlotType::ArgumentCount) <= 1,
                           "The slot must not require more than one argument");
 
         auto slotObj = new QtPrivate::QFunctorSlotObject<Func1, 1,
diff --git a/src/network/kernel/qnetworkinterface_linux.cpp b/src/network/kernel/qnetworkinterface_linux.cpp
index 25aba5836e..a21ccf40c4 100644
--- a/src/network/kernel/qnetworkinterface_linux.cpp
+++ b/src/network/kernel/qnetworkinterface_linux.cpp
@@ -151,8 +151,8 @@ template <typename Lambda> struct ProcessNetlinkRequest
 
     static int expectedTypeForRequest(int rtype)
     {
-        Q_STATIC_ASSERT(RTM_NEWADDR == RTM_GETADDR - 2);
-        Q_STATIC_ASSERT(RTM_NEWLINK == RTM_GETLINK - 2);
+        static_assert(RTM_NEWADDR == RTM_GETADDR - 2);
+        static_assert(RTM_NEWLINK == RTM_GETLINK - 2);
         Q_ASSERT(rtype == RTM_GETADDR || rtype == RTM_GETLINK);
         return rtype - 2;
     }
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp
index a6b0886bc6..977a0dcde9 100644
--- a/src/network/kernel/qnetworkinterface_unix.cpp
+++ b/src/network/kernel/qnetworkinterface_unix.cpp
@@ -487,7 +487,7 @@ static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList)
     memset(&mediareq, 0, sizeof(mediareq));
 
     // ensure both structs start with the name field, of size IFNAMESIZ
-    Q_STATIC_ASSERT(sizeof(mediareq.ifm_name) == sizeof(req.ifr_name));
+    static_assert(sizeof(mediareq.ifm_name) == sizeof(req.ifr_name));
     Q_ASSERT(&mediareq.ifm_name == &req.ifr_name);
 
     // on NetBSD we use AF_LINK and sockaddr_dl
diff --git a/src/network/kernel/qtldurl.cpp b/src/network/kernel/qtldurl.cpp
index 1723acfc5b..2823a3157d 100644
--- a/src/network/kernel/qtldurl.cpp
+++ b/src/network/kernel/qtldurl.cpp
@@ -84,7 +84,7 @@ static bool containsTLDEntry(QStringView entry, TLDMatchType match)
     Q_ASSERT(tldGroupOffset <= tldIndices[index + 1]);
     // The last extra entry in tldIndices
     // should be equal to the total of all chunks' lengths.
-    Q_STATIC_ASSERT(tldIndices[tldCount] == tldChunks[tldChunkCount - 1]);
+    static_assert(tldIndices[tldCount] == tldChunks[tldChunkCount - 1]);
 
     // Find which chunk contains the tldGroupOffset
     while (tldGroupOffset >= tldChunks[chunk]) {
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index e5b9fbbdb2..a39b345d30 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -1044,7 +1044,7 @@ qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxS
             if (cmsgptr->cmsg_len == CMSG_LEN(sizeof(int))
                     && ((cmsgptr->cmsg_level == IPPROTO_IPV6 && cmsgptr->cmsg_type == IPV6_HOPLIMIT)
                         || (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_TTL))) {
-                Q_STATIC_ASSERT(sizeof(header->hopLimit) == sizeof(int));
+                static_assert(sizeof(header->hopLimit) == sizeof(int));
                 memcpy(&header->hopLimit, CMSG_DATA(cmsgptr), sizeof(header->hopLimit));
             }
 
diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp
index c355abad73..c87d599aff 100644
--- a/src/network/ssl/qsslsocket_schannel.cpp
+++ b/src/network/ssl/qsslsocket_schannel.cpp
@@ -1617,7 +1617,7 @@ QList<QSslCipher> QSslSocketBackendPrivate::defaultCiphers()
     const QSsl::SslProtocol protocols[] = { QSsl::TlsV1_0, QSsl::TlsV1_1,
                                             QSsl::TlsV1_2, QSsl::TlsV1_3 };
     const int size = ARRAYSIZE(protocols);
-    Q_STATIC_ASSERT(size == ARRAYSIZE(protocolStrings));
+    static_assert(size == ARRAYSIZE(protocolStrings));
     ciphers.reserve(size);
     for (int i = 0; i < size; ++i) {
         QSslCipher cipher;