extensions do not need to know about QXmppOutgoingClient

14 files changed, 15 insertions, 23 deletions

diff --git a/src/QXmppArchiveManager.cpp b/src/QXmppArchiveManager.cpp
index db1fd548..55fe65ef 100644
--- a/src/QXmppArchiveManager.cpp
+++ b/src/QXmppArchiveManager.cpp
@@ -25,7 +25,7 @@
 
 #include "QXmppArchiveIq.h"
 #include "QXmppArchiveManager.h"
-#include "QXmppOutgoingClient.h"
+#include "QXmppClient.h"
 
 void QXmppArchiveManager::archiveChatIqReceived(const QXmppArchiveChatIq &chatIq)
 {
diff --git a/src/QXmppArchiveManager.h b/src/QXmppArchiveManager.h
index 5265e007..5c01074c 100644
--- a/src/QXmppArchiveManager.h
+++ b/src/QXmppArchiveManager.h
@@ -32,7 +32,6 @@ class QXmppArchiveChat;
 class QXmppArchiveChatIq;
 class QXmppArchiveListIq;
 class QXmppArchivePrefIq;
-class QXmppOutgoingClient;
 
 /// \brief The QXmppArchiveManager class makes it possible to access message
 /// archives as defined by XEP-0136: Message Archiving.
diff --git a/src/QXmppCallManager.cpp b/src/QXmppCallManager.cpp
index 9ad9826d..6853e1bb 100644
--- a/src/QXmppCallManager.cpp
+++ b/src/QXmppCallManager.cpp
@@ -25,10 +25,10 @@
 #include <QTimer>
 
 #include "QXmppCallManager.h"
+#include "QXmppClient.h"
 #include "QXmppCodec.h"
 #include "QXmppConstants.h"
 #include "QXmppJingleIq.h"
-#include "QXmppOutgoingClient.h"
 #include "QXmppStun.h"
 #include "QXmppUtils.h"
 
diff --git a/src/QXmppCallManager.h b/src/QXmppCallManager.h
index 694067c7..358a09a9 100644
--- a/src/QXmppCallManager.h
+++ b/src/QXmppCallManager.h
@@ -36,7 +36,6 @@ class QXmppIceConnection;
 class QXmppJingleCandidate;
 class QXmppJingleIq;
 class QXmppJinglePayloadType;
-class QXmppOutgoingClient;
 
 /// \brief The QXmppCall class represents a Voice-Over-IP call to a remote party.
 ///
diff --git a/src/QXmppDiscoveryManager.h b/src/QXmppDiscoveryManager.h
index b34e8da6..4f6a7e31 100644
--- a/src/QXmppDiscoveryManager.h
+++ b/src/QXmppDiscoveryManager.h
@@ -26,7 +26,6 @@
 

 #include "QXmppClientExtension.h"

 

-class QXmppOutgoingClient;

 class QXmppDiscoveryIq;

 

 /// \brief The QXmppDiscoveryManager class makes it possible to discover information

diff --git a/src/QXmppEntityTimeManager.cpp b/src/QXmppEntityTimeManager.cpp
index ea88a800..59a851c8 100644
--- a/src/QXmppEntityTimeManager.cpp
+++ b/src/QXmppEntityTimeManager.cpp
@@ -27,8 +27,8 @@
 #include <QDomElement>

 #include <QDateTime>

 

+#include "QXmppClient.h"

 #include "QXmppConstants.h"

-#include "QXmppOutgoingClient.h"

 #include "QXmppEntityTimeIq.h"

 #include "QXmppUtils.h"

 

@@ -51,6 +51,8 @@ QStringList QXmppEntityTimeManager::discoveryFeatures() const
 

 bool QXmppEntityTimeManager::handleStanza(QXmppStream *stream, const QDomElement &element)

 {

+    Q_UNUSED(stream);

+

     if(element.tagName() == "iq" && QXmppEntityTimeIq::isEntityTimeIq(element))

     {

         QXmppEntityTimeIq entityTime;

@@ -83,7 +85,7 @@ bool QXmppEntityTimeManager::handleStanza(QXmppStream *stream, const QDomElement
 

             responseIq.setTzo(tzo);

 

-            stream->sendPacket(responseIq);

+            client()->sendPacket(responseIq);

         }

 

         emit timeReceived(entityTime);

diff --git a/src/QXmppEntityTimeManager.h b/src/QXmppEntityTimeManager.h
index 0bbf157f..b5a24026 100644
--- a/src/QXmppEntityTimeManager.h
+++ b/src/QXmppEntityTimeManager.h
@@ -27,7 +27,6 @@
 

 #include "QXmppClientExtension.h"

 

-class QXmppOutgoingClient;

 class QXmppEntityTimeIq;

 

 /// \brief The QXmppEntityTimeManager class provided the functionality to get

diff --git a/src/QXmppMucManager.cpp b/src/QXmppMucManager.cpp
index fa98b98f..e1ebaeb2 100644
--- a/src/QXmppMucManager.cpp
+++ b/src/QXmppMucManager.cpp
@@ -23,11 +23,11 @@
 
 #include <QDomElement>
 
+#include "QXmppClient.h"
 #include "QXmppConstants.h"
 #include "QXmppMessage.h"
 #include "QXmppMucIq.h"
 #include "QXmppMucManager.h"
-#include "QXmppOutgoingClient.h"
 #include "QXmppUtils.h"
 
 QXmppMucManager::QXmppMucManager(QXmppClient* client)
diff --git a/src/QXmppMucManager.h b/src/QXmppMucManager.h
index cdcdcdc8..621d4f76 100644
--- a/src/QXmppMucManager.h
+++ b/src/QXmppMucManager.h
@@ -34,7 +34,6 @@ class QXmppDataForm;
 class QXmppMessage;
 class QXmppMucAdminIq;
 class QXmppMucOwnerIq;
-class QXmppOutgoingClient;
 
 /// \brief The QXmppMucManager class makes it possible to interact with
 /// multi-user chat rooms as defined by XEP-0045: Multi-User Chat.
@@ -87,7 +86,6 @@ private slots:
     void presenceReceived(const QXmppPresence &presence);
 
 private:
-    QXmppOutgoingClient *m_stream;
     QMap<QString, QString> m_nickNames;
     QMap<QString, QMap<QString, QXmppPresence> > m_participants;
 };
diff --git a/src/QXmppTransferManager.cpp b/src/QXmppTransferManager.cpp
index d1b5cb57..e168eacc 100644
--- a/src/QXmppTransferManager.cpp
+++ b/src/QXmppTransferManager.cpp
@@ -28,10 +28,10 @@
 #include <QTimer>
 
 #include "QXmppByteStreamIq.h"
+#include "QXmppClient.h"
 #include "QXmppConstants.h"
 #include "QXmppIbbIq.h"
 #include "QXmppSocks.h"
-#include "QXmppOutgoingClient.h"
 #include "QXmppStreamInitiationIq.h"
 #include "QXmppTransferManager.h"
 #include "QXmppUtils.h"
diff --git a/src/QXmppVCardManager.cpp b/src/QXmppVCardManager.cpp
index e006eeb1..e776f647 100644
--- a/src/QXmppVCardManager.cpp
+++ b/src/QXmppVCardManager.cpp
@@ -22,10 +22,10 @@
  */
 
 
-#include "QXmppVCardManager.h"
-#include "QXmppOutgoingClient.h"
-#include "QXmppUtils.h"
+#include "QXmppClient.h"
 #include "QXmppConstants.h"
+#include "QXmppUtils.h"
+#include "QXmppVCardManager.h"
 
 QXmppVCardManager::QXmppVCardManager()
     : QXmppClientExtension(),
diff --git a/src/QXmppVCardManager.h b/src/QXmppVCardManager.h
index 50c4be30..552c97e2 100644
--- a/src/QXmppVCardManager.h
+++ b/src/QXmppVCardManager.h
@@ -34,8 +34,6 @@
 #include "QXmppVCard.h"
 #undef QXMPP_SUPRESS_INTERNAL_VCARD_WARNING
 
-class QXmppOutgoingClient;
-
 /// \brief The QXmppVCardManager gets/sets XMPP vCards. It is an
 /// implentation of <B>XEP-0054: vcard-temp</B>.
 ///
@@ -92,9 +90,6 @@ signals:
     /// \endcond
 
 private:
-    // reference to the xmpp stream (no ownership)
-    QXmppOutgoingClient* m_stream;
-
     QXmppVCardIq m_clientVCard;  ///< Stores the vCard of the connected client
     bool m_isClientVCardReceived;
 };
diff --git a/src/QXmppVersionManager.cpp b/src/QXmppVersionManager.cpp
index 8a3c461d..3c3ec599 100644
--- a/src/QXmppVersionManager.cpp
+++ b/src/QXmppVersionManager.cpp
@@ -24,9 +24,9 @@
 #include <QCoreApplication>
 #include <QDomElement>
 
+#include "QXmppClient.h"
 #include "QXmppConstants.h"
 #include "QXmppGlobal.h"
-#include "QXmppOutgoingClient.h"
 #include "QXmppVersionManager.h"
 #include "QXmppVersionIq.h"
 
@@ -49,6 +49,8 @@ QStringList QXmppVersionManager::discoveryFeatures() const
 
 bool QXmppVersionManager::handleStanza(QXmppStream *stream, const QDomElement &element)
 {
+    Q_UNUSED(stream);
+
     if (element.tagName() == "iq" && QXmppVersionIq::isVersionIq(element))
     {
         QXmppVersionIq versionIq;
@@ -67,7 +69,7 @@ bool QXmppVersionManager::handleStanza(QXmppStream *stream, const QDomElement &e
             responseIq.setOs(clientOs());
 
             // TODO set OS aswell
-            stream->sendPacket(responseIq);
+            client()->sendPacket(responseIq);
         }
 
         emit versionReceived(versionIq);
diff --git a/src/QXmppVersionManager.h b/src/QXmppVersionManager.h
index 1d3a1c7f..b2da936b 100644
--- a/src/QXmppVersionManager.h
+++ b/src/QXmppVersionManager.h
@@ -26,7 +26,6 @@
 
 #include "QXmppClientExtension.h"
 
-class QXmppOutgoingClient;
 class QXmppVersionIq;
 
 /// \brief The QXmppVersionManager class makes it possible to request for