diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:00:44 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:00:45 +0100 |
| commit | 7a13a091161851b7fa38d838d3c6ef3a96e19422 (patch) | |
| tree | f8902e9b8dca7f10c519de9a90919d34fc34240b /examples | |
| parent | 36e277e91732d6d75fb6d9cb691fe9c0f83f6178 (diff) | |
| parent | 37b4c07c705d068d00863ee0373322f8a94cb06e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ic13ef00d76c81295076bb2432576db70ec84fe29
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/corelib/tools/customtype/message.cpp | 15 | ||||
| -rw-r--r-- | examples/corelib/tools/customtype/message.h | 7 | ||||
| -rw-r--r-- | examples/corelib/tools/customtypesending/message.cpp | 13 | ||||
| -rw-r--r-- | examples/corelib/tools/customtypesending/message.h | 7 | ||||
| -rw-r--r-- | examples/corelib/tools/doc/src/customtype.qdoc | 5 |
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 |