diff options
| author | Linus Jahn <lnj@kaidan.im> | 2021-12-05 16:07:38 +0100 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2022-03-03 12:50:18 +0100 |
| commit | b7010fb164381e3852b4b43658910014ac374259 (patch) | |
| tree | 75ee9ca1a34bea6f2646c83162c898747d6e1c50 /src/base/QXmppPacket.cpp | |
| parent | 30fb4de15cfb4586bba0f7f379011e46298941f4 (diff) | |
| download | qxmpp-b7010fb164381e3852b4b43658910014ac374259.tar.gz | |
QXmppPacket: Use QFutureInterface directly without shared_ptr
Diffstat (limited to 'src/base/QXmppPacket.cpp')
| -rw-r--r-- | src/base/QXmppPacket.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/base/QXmppPacket.cpp b/src/base/QXmppPacket.cpp index f058a569..d61af9da 100644 --- a/src/base/QXmppPacket.cpp +++ b/src/base/QXmppPacket.cpp @@ -17,22 +17,17 @@ inline QByteArray serialize(const QXmppNonza &nonza) } /// \cond -QXmppPacket::QXmppPacket(const QXmppNonza &nonza) - : QXmppPacket(nonza, std::make_shared<QFutureInterface<QXmpp::SendResult>>()) -{ -} - -QXmppPacket::QXmppPacket(const QXmppNonza &nonza, std::shared_ptr<QFutureInterface<QXmpp::SendResult>> interface) +QXmppPacket::QXmppPacket(const QXmppNonza &nonza, QFutureInterface<QXmpp::SendResult> interface) : QXmppPacket(serialize(nonza), nonza.isXmppStanza(), std::move(interface)) { } -QXmppPacket::QXmppPacket(const QByteArray &data, bool isXmppStanza, std::shared_ptr<QFutureInterface<QXmpp::SendResult>> interface) +QXmppPacket::QXmppPacket(const QByteArray &data, bool isXmppStanza, QFutureInterface<QXmpp::SendResult> interface) : m_interface(std::move(interface)), m_data(data), m_isXmppStanza(isXmppStanza) { - m_interface->reportStarted(); + m_interface.reportStarted(); } QByteArray QXmppPacket::data() const @@ -47,16 +42,16 @@ bool QXmppPacket::isXmppStanza() const QFuture<QXmpp::SendResult> QXmppPacket::future() { - return m_interface->future(); + return m_interface.future(); } void QXmppPacket::reportFinished() { - m_interface->reportFinished(); + m_interface.reportFinished(); } void QXmppPacket::reportResult(const QXmpp::SendResult &result) { - m_interface->reportResult(result); + m_interface.reportResult(result); } /// \endcond |
