Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

2 files changed, 4 insertions, 18 deletions

diff --git a/examples/corelib/tools/customtype/message.cpp b/examples/corelib/tools/customtype/message.cpp
index cc96aee978..e83697cb74 100644
--- a/examples/corelib/tools/customtype/message.cpp
+++ b/examples/corelib/tools/customtype/message.cpp
@@ -52,21 +52,6 @@
 
 #include <QDebug>
 
-//! [Message class implementation]
-Message::Message()
-{
-}
-
-Message::Message(const Message &other)
-    : m_body(other.m_body), m_headers(other.m_headers)
-{
-}
-
-Message::~Message()
-{
-}
-//! [Message class implementation]
-
 Message::Message(const QString &body, const QStringList &headers)
     : m_body(body), m_headers(headers)
 {
diff --git a/examples/corelib/tools/customtype/message.h b/examples/corelib/tools/customtype/message.h
index c1b8243237..bc30c45425 100644
--- a/examples/corelib/tools/customtype/message.h
+++ b/examples/corelib/tools/customtype/message.h
@@ -58,9 +58,10 @@
 class Message
 {
 public:
-    Message();
-    Message(const Message &other);
-    ~Message();
+    Message() = default;
+    ~Message() = default;
+    Message(const Message &) = default;
+    Message &operator=(const Message &) = default;
 
     Message(const QString &body, const QStringList &headers);