diff options
| author | Linus Jahn <lnj@kaidan.im> | 2022-06-17 18:26:01 +0200 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2022-06-18 12:45:19 +0200 |
| commit | 31ef165cbbf918ba0ddd00f86c6dee257a0b936b (patch) | |
| tree | e891a37cf70fbc60354d9a9cd69d4e9cb7d34a80 /src/base/QXmppJingleIq.cpp | |
| parent | 675f57b1d7facab15eff303f022c332a8220777e (diff) | |
| download | qxmpp-31ef165cbbf918ba0ddd00f86c6dee257a0b936b.tar.gz | |
Add move constructors and move assignment operators everywhere
This is so std::move() on implicitly-shared types actually moves the
content and doesn't call the copy ctor/assignment operator.
Diffstat (limited to 'src/base/QXmppJingleIq.cpp')
| -rw-r--r-- | src/base/QXmppJingleIq.cpp | 96 |
1 files changed, 30 insertions, 66 deletions
diff --git a/src/base/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp index 16537b1e..7b7def33 100644 --- a/src/base/QXmppJingleIq.cpp +++ b/src/base/QXmppJingleIq.cpp @@ -147,34 +147,21 @@ QXmppJingleIqContentPrivate::QXmppJingleIqContentPrivate() } /// Constructs an empty content. - QXmppJingleIq::Content::Content() : d(new QXmppJingleIqContentPrivate()) { } -/// Constructs a copy of other. -/// -/// \param other - -QXmppJingleIq::Content::Content(const QXmppJingleIq::Content &other) - : d(other.d) -{ -} - -/// Assigns the other content to this one. -/// -/// \param other - -QXmppJingleIq::Content &QXmppJingleIq::Content::operator=(const QXmppJingleIq::Content &other) -{ - d = other.d; - return *this; -} +/// Copy-constructor. +QXmppJingleIq::Content::Content(const QXmppJingleIq::Content &other) = default; +/// Move-constructor. +QXmppJingleIq::Content::Content(QXmppJingleIq::Content &&) = default; +/// Assignment operator. +QXmppJingleIq::Content &QXmppJingleIq::Content::operator=(const QXmppJingleIq::Content &) = default; +/// Move-assignment operator. +QXmppJingleIq::Content &QXmppJingleIq::Content::operator=(QXmppJingleIq::Content &&) = default; -QXmppJingleIq::Content::~Content() -{ -} +QXmppJingleIq::Content::~Content() = default; QString QXmppJingleIq::Content::creator() const { @@ -715,37 +702,26 @@ QXmppJingleIqPrivate::QXmppJingleIqPrivate() } /// Constructs a QXmppJingleIq. - QXmppJingleIq::QXmppJingleIq() : d(new QXmppJingleIqPrivate()) { } -/// Constructs a copy of other. -/// -/// \param other +/// Copy-constructor. +QXmppJingleIq::QXmppJingleIq(const QXmppJingleIq &) = default; +/// Move-constructor. +QXmppJingleIq::QXmppJingleIq(QXmppJingleIq &&) = default; -QXmppJingleIq::QXmppJingleIq(const QXmppJingleIq &other) - : QXmppIq(other), d(other.d) -{ -} +QXmppJingleIq::~QXmppJingleIq() = default; -QXmppJingleIq::~QXmppJingleIq() -{ -} +/// Assignment operator. +QXmppJingleIq &QXmppJingleIq::operator=(const QXmppJingleIq &) = default; +/// Move-assignment operator. +QXmppJingleIq &QXmppJingleIq::operator=(QXmppJingleIq &&) = default; -/// Assigns the other Jingle IQ to this one. /// -/// \param other - -QXmppJingleIq &QXmppJingleIq::operator=(const QXmppJingleIq &other) -{ - d = other.d; - return *this; -} - /// Returns the Jingle IQ's action. - +/// QXmppJingleIq::Action QXmppJingleIq::action() const { return d->action; @@ -951,35 +927,23 @@ QXmppJingleCandidatePrivate::QXmppJingleCandidatePrivate() { } +/// /// Constructs an empty candidate. - +/// QXmppJingleCandidate::QXmppJingleCandidate() : d(new QXmppJingleCandidatePrivate()) { } -/// Constructs a copy of other. -/// -/// \param other - -QXmppJingleCandidate::QXmppJingleCandidate(const QXmppJingleCandidate &other) - : d(other.d) -{ -} - -QXmppJingleCandidate::~QXmppJingleCandidate() -{ -} - -/// Assigns the other candidate to this one. -/// -/// \param other - -QXmppJingleCandidate &QXmppJingleCandidate::operator=(const QXmppJingleCandidate &other) -{ - d = other.d; - return *this; -} +/// Copy-constructor. +QXmppJingleCandidate::QXmppJingleCandidate(const QXmppJingleCandidate &other) = default; +/// Move-constructor. +QXmppJingleCandidate::QXmppJingleCandidate(QXmppJingleCandidate &&) = default; +QXmppJingleCandidate::~QXmppJingleCandidate() = default; +/// Assignment operator. +QXmppJingleCandidate &QXmppJingleCandidate::operator=(const QXmppJingleCandidate &other) = default; +/// Move-assignment operator. +QXmppJingleCandidate &QXmppJingleCandidate::operator=(QXmppJingleCandidate &&) = default; /// Returns the candidate's component ID. |
