QMessageLogContext: simplify construction

By using NSDMI.

Change-Id: I171133b07ba2c7050e0d279caff0c393e03df182
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 
 
 

1 files changed, 9 insertions, 10 deletions

diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h
index 14c5d66bcd..4a528a2973 100644
--- a/src/corelib/global/qlogging.h
+++ b/src/corelib/global/qlogging.h
@@ -63,16 +63,15 @@ class QMessageLogContext
 {
     Q_DISABLE_COPY(QMessageLogContext)
 public:
-    Q_DECL_CONSTEXPR QMessageLogContext()
-        : version(2), line(0), file(nullptr), function(nullptr), category(nullptr) {}
-    Q_DECL_CONSTEXPR QMessageLogContext(const char *fileName, int lineNumber, const char *functionName, const char *categoryName)
-        : version(2), line(lineNumber), file(fileName), function(functionName), category(categoryName) {}
-
-    int version;
-    int line;
-    const char *file;
-    const char *function;
-    const char *category;
+    Q_DECL_CONSTEXPR QMessageLogContext() noexcept = default;
+    Q_DECL_CONSTEXPR QMessageLogContext(const char *fileName, int lineNumber, const char *functionName, const char *categoryName) noexcept
+        : line(lineNumber), file(fileName), function(functionName), category(categoryName) {}
+
+    int version = 2;
+    int line = 0;
+    const char *file = nullptr;
+    const char *function = nullptr;
+    const char *category = nullptr;
 
 private:
     QMessageLogContext &copyContextFrom(const QMessageLogContext &logContext) noexcept;