2 files changed, 9 insertions, 15 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
diff --git a/src/base/QXmppPacket_p.h b/src/base/QXmppPacket_p.h
index 565b053a..a7170a17 100644
--- a/src/base/QXmppPacket_p.h
+++ b/src/base/QXmppPacket_p.h
@@ -17,9 +17,8 @@ class QXmppNonza;
 class QXmppPacket
 {
 public:
-    QXmppPacket(const QXmppNonza &nonza);
-    QXmppPacket(const QXmppNonza &nonza, std::shared_ptr<QFutureInterface<QXmpp::SendResult>>);
-    QXmppPacket(const QByteArray &data, bool isXmppStanza, std::shared_ptr<QFutureInterface<QXmpp::SendResult>>);
+    QXmppPacket(const QXmppNonza &nonza, QFutureInterface<QXmpp::SendResult> = {});
+    QXmppPacket(const QByteArray &data, bool isXmppStanza, QFutureInterface<QXmpp::SendResult> = {});
 
     QByteArray data() const;
     bool isXmppStanza() const;
@@ -30,7 +29,7 @@ public:
     void reportResult(const QXmpp::SendResult &);
 
 private:
-    std::shared_ptr<QFutureInterface<QXmpp::SendResult>> m_interface;
+    QFutureInterface<QXmpp::SendResult> m_interface;
     QByteArray m_data;
     bool m_isXmppStanza;
 };