1 files changed, 9 insertions, 9 deletions

diff --git a/src/corelib/serialization/qjson_p.h b/src/corelib/serialization/qjson_p.h
index feba1faac6..85fb2a1254 100644
--- a/src/corelib/serialization/qjson_p.h
+++ b/src/corelib/serialization/qjson_p.h
@@ -304,7 +304,7 @@ public:
         return *this;
     }
 
-    QLatin1String toQLatin1String() const Q_DECL_NOTHROW {
+    QLatin1String toQLatin1String() const noexcept {
         return QLatin1String(d->latin1, d->length);
     }
 
@@ -339,23 +339,23 @@ public:
 };
 
 #define DEF_OP(op) \
-    inline bool operator op(Latin1String lhs, Latin1String rhs) Q_DECL_NOTHROW \
+    inline bool operator op(Latin1String lhs, Latin1String rhs) noexcept \
     { \
         return lhs.toQLatin1String() op rhs.toQLatin1String(); \
     } \
-    inline bool operator op(QLatin1String lhs, Latin1String rhs) Q_DECL_NOTHROW \
+    inline bool operator op(QLatin1String lhs, Latin1String rhs) noexcept \
     { \
         return lhs op rhs.toQLatin1String(); \
     } \
-    inline bool operator op(Latin1String lhs, QLatin1String rhs) Q_DECL_NOTHROW \
+    inline bool operator op(Latin1String lhs, QLatin1String rhs) noexcept \
     { \
         return lhs.toQLatin1String() op rhs; \
     } \
-    inline bool operator op(const QString &lhs, Latin1String rhs) Q_DECL_NOTHROW \
+    inline bool operator op(const QString &lhs, Latin1String rhs) noexcept \
     { \
         return lhs op rhs.toQLatin1String(); \
     } \
-    inline bool operator op(Latin1String lhs, const QString &rhs) Q_DECL_NOTHROW \
+    inline bool operator op(Latin1String lhs, const QString &rhs) noexcept \
     { \
         return lhs.toQLatin1String() op rhs; \
     } \
@@ -686,7 +686,7 @@ public:
     {
     }
     inline Data(int reserved, QJsonValue::Type valueType)
-        : rawData(0), compactionCounter(0), ownsData(true)
+        : rawData(nullptr), compactionCounter(0), ownsData(true)
     {
         Q_ASSERT(valueType == QJsonValue::Array || valueType == QJsonValue::Object);
 
@@ -728,7 +728,7 @@ public:
             size = qMax(size + reserve, qMin(size *2, (int)Value::MaxSize));
             if (size > Value::MaxSize) {
                 qWarning("QJson: Document too large to store in data structure");
-                return 0;
+                return nullptr;
             }
         }
         char *raw = (char *)malloc(size);
@@ -746,7 +746,7 @@ public:
     bool valid() const;
 
 private:
-    Q_DISABLE_COPY(Data)
+    Q_DISABLE_COPY_MOVE(Data)
 };
 
 }