From b7010fb164381e3852b4b43658910014ac374259 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Sun, 5 Dec 2021 16:07:38 +0100 Subject: QXmppPacket: Use QFutureInterface directly without shared_ptr --- src/base/QXmppPacket.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/base/QXmppPacket.cpp') 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>()) -{ -} - -QXmppPacket::QXmppPacket(const QXmppNonza &nonza, std::shared_ptr> interface) +QXmppPacket::QXmppPacket(const QXmppNonza &nonza, QFutureInterface interface) : QXmppPacket(serialize(nonza), nonza.isXmppStanza(), std::move(interface)) { } -QXmppPacket::QXmppPacket(const QByteArray &data, bool isXmppStanza, std::shared_ptr> interface) +QXmppPacket::QXmppPacket(const QByteArray &data, bool isXmppStanza, QFutureInterface 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 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 -- cgit v1.2.3