remove internal usage

4 files changed, 17 insertions, 18 deletions

diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp
index 17a90060..de8f409e 100644
--- a/src/QXmppOutgoingClient.cpp
+++ b/src/QXmppOutgoingClient.cpp
@@ -51,7 +51,7 @@
 #include "QXmppRosterIq.h"
 #include "QXmppSessionIq.h"
 #include "QXmppStreamInitiationIq.h"
-#include "QXmppVCard.h"
+#include "QXmppVCardIq.h"
 #include "QXmppVersionIq.h"
 
 #include <QBuffer>
@@ -533,9 +533,9 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
                 emit ibbOpenIqReceived(ibbOpenIq);
             }
             // XEP-0054: vcard-temp
-            else if(QXmppVCard::isVCard(nodeRecv))
+            else if(QXmppVCardIq::isVCard(nodeRecv))
             {
-                QXmppVCard vcardIq;
+                QXmppVCardIq vcardIq;
                 vcardIq.parse(nodeRecv);
                 emit vCardIqReceived(vcardIq);
             }
diff --git a/src/QXmppOutgoingClient.h b/src/QXmppOutgoingClient.h
index 5909962b..75d1b2ec 100644
--- a/src/QXmppOutgoingClient.h
+++ b/src/QXmppOutgoingClient.h
@@ -40,7 +40,7 @@ class QXmppPresence;
 class QXmppIq;
 class QXmppBind;
 class QXmppRosterIq;
-class QXmppVCard;
+class QXmppVCardIq;
 class QXmppMessage;
 class QXmppRpcResponseIq;
 class QXmppRpcErrorIq;
@@ -110,7 +110,7 @@ signals:
     void mucOwnerIqReceived(const QXmppMucOwnerIq&);
 
     // XEP-0054: vcard-temp
-    void vCardIqReceived(const QXmppVCard&);
+    void vCardIqReceived(const QXmppVCardIq&);
 
     // XEP-0065: SOCKS5 Bytestreams
     void byteStreamIqReceived(const QXmppByteStreamIq&);
diff --git a/src/QXmppVCardManager.cpp b/src/QXmppVCardManager.cpp
index 8a3cb1dd..b4300d5d 100644
--- a/src/QXmppVCardManager.cpp
+++ b/src/QXmppVCardManager.cpp
@@ -31,8 +31,8 @@ QXmppVCardManager::QXmppVCardManager(QXmppOutgoingClient* stream, QObject *paren
     m_stream(stream),
     m_isClientVCardReceived(false)
 {
-    bool check = QObject::connect(m_stream, SIGNAL(vCardIqReceived(const QXmppVCard&)),
-        this, SLOT(vCardIqReceived(const QXmppVCard&)));
+    bool check = QObject::connect(m_stream, SIGNAL(vCardIqReceived(const QXmppVCardIq&)),
+        this, SLOT(vCardIqReceived(const QXmppVCardIq&)));
     Q_ASSERT(check);
     Q_UNUSED(check);
 }
@@ -44,11 +44,11 @@ QXmppVCardManager::QXmppVCardManager(QXmppOutgoingClient* stream, QObject *paren
 ///
 void QXmppVCardManager::requestVCard(const QString& jid)
 {
-    QXmppVCard vcardIq(jid);
+    QXmppVCardIq vcardIq(jid);
     m_stream->sendPacket(vcardIq);
 }
 
-void QXmppVCardManager::vCardIqReceived(const QXmppVCard& vcard)
+void QXmppVCardManager::vCardIqReceived(const QXmppVCardIq& vcard)
 {
     // self vCard received
     if(vcard.from().isEmpty())
@@ -65,7 +65,7 @@ void QXmppVCardManager::vCardIqReceived(const QXmppVCard& vcard)
 ///
 /// \return QXmppVCard
 ///
-const QXmppVCard& QXmppVCardManager::clientVCard() const
+const QXmppVCardIq& QXmppVCardManager::clientVCard() const
 {
     return m_clientVCard;
 }
@@ -74,7 +74,7 @@ const QXmppVCard& QXmppVCardManager::clientVCard() const
 ///
 /// \param clientVCard QXmppVCard
 ///
-void QXmppVCardManager::setClientVCard(const QXmppVCard& clientVCard)
+void QXmppVCardManager::setClientVCard(const QXmppVCardIq& clientVCard)
 {
     m_clientVCard = clientVCard;
     m_clientVCard.setTo("");
@@ -100,4 +100,3 @@ bool QXmppVCardManager::isClientVCardReceived()
 {
     return m_isClientVCardReceived;
 }
-
diff --git a/src/QXmppVCardManager.h b/src/QXmppVCardManager.h
index e42fd2a4..91cd9f04 100644
--- a/src/QXmppVCardManager.h
+++ b/src/QXmppVCardManager.h
@@ -27,7 +27,7 @@
 
 #include <QObject>
 
-#include "QXmppVCard.h"
+#include "QXmppVCardIq.h"
 
 class QXmppOutgoingClient;
 
@@ -62,28 +62,28 @@ public:
     QXmppVCardManager(QXmppOutgoingClient* stream, QObject *parent = 0);
     void requestVCard(const QString& bareJid = "");
 
-    const QXmppVCard& clientVCard() const;
-    void setClientVCard(const QXmppVCard&);
+    const QXmppVCardIq& clientVCard() const;
+    void setClientVCard(const QXmppVCardIq&);
     void requestClientVCard();
     bool isClientVCardReceived();
 
 signals:
     /// This signal is emitted when the requested vCard is received
     /// after calling the requestVCard() function.
-    void vCardReceived(const QXmppVCard&);
+    void vCardReceived(const QXmppVCardIq&);
 
     /// This signal is emitted when the client's vCard is received
     /// after calling the requestClientVCard() function.
     void clientVCardReceived();
 
 private slots:
-    void vCardIqReceived(const QXmppVCard&);
+    void vCardIqReceived(const QXmppVCardIq&);
 
 private:
     // reference to the xmpp stream (no ownership)
     QXmppOutgoingClient* m_stream;
 
-    QXmppVCard m_clientVCard;  ///< Stores the vCard of the connected client
+    QXmppVCardIq m_clientVCard;  ///< Stores the vCard of the connected client
     bool m_isClientVCardReceived;
 };