Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I256a4b0bac4d2f5eb170967fedc4eccaec8c7f2a

5 files changed, 8 insertions, 39 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);
 
diff --git a/examples/corelib/tools/customtypesending/message.cpp b/examples/corelib/tools/customtypesending/message.cpp
index 9386b93898..76f90e5144 100644
--- a/examples/corelib/tools/customtypesending/message.cpp
+++ b/examples/corelib/tools/customtypesending/message.cpp
@@ -50,19 +50,6 @@
 
 #include "message.h"
 
-Message::Message()
-{
-}
-
-Message::Message(const Message &other)
-    : m_body(other.m_body), m_headers(other.m_headers)
-{
-}
-
-Message::~Message()
-{
-}
-
 Message::Message(const QString &body, const QStringList &headers)
     : m_body(body), m_headers(headers)
 {
diff --git a/examples/corelib/tools/customtypesending/message.h b/examples/corelib/tools/customtypesending/message.h
index a93f111e45..38b5c8205f 100644
--- a/examples/corelib/tools/customtypesending/message.h
+++ b/examples/corelib/tools/customtypesending/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);
 
diff --git a/examples/corelib/tools/doc/src/customtype.qdoc b/examples/corelib/tools/doc/src/customtype.qdoc
index 7ccfc95c70..fb63bc539c 100644
--- a/examples/corelib/tools/doc/src/customtype.qdoc
+++ b/examples/corelib/tools/doc/src/customtype.qdoc
@@ -81,11 +81,6 @@
 
     \section1 The Message Class Implementation
 
-    The implementation of the default constructor, copy constructor and destructor
-    are straightforward for the \c Message class:
-
-    \snippet tools/customtype/message.cpp Message class implementation
-
     The streaming operator is implemented in the following way:
 
     \snippet tools/customtype/message.cpp custom type streaming operator