From e2e56fc1426f408aacb4b458e8773aae1d2494e9 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Thu, 26 Aug 2010 07:53:46 +0000 Subject: add QXmppVCard::isVCard for consistency --- src/QXmppOutgoingClient.cpp | 3 +-- src/QXmppVCard.cpp | 5 +++++ src/QXmppVCard.h | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp index d6788914..9756eb76 100644 --- a/src/QXmppOutgoingClient.cpp +++ b/src/QXmppOutgoingClient.cpp @@ -508,8 +508,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) emit ibbOpenIqReceived(ibbOpenIq); } // XEP-0054: vcard-temp - else if(nodeRecv.firstChildElement("vCard"). - namespaceURI() == ns_vcard) + else if(QXmppVCard::isVCard(nodeRecv)) { QXmppVCard vcardIq; vcardIq.parse(nodeRecv); diff --git a/src/QXmppVCard.cpp b/src/QXmppVCard.cpp index c6d8fb84..598ed1f7 100644 --- a/src/QXmppVCard.cpp +++ b/src/QXmppVCard.cpp @@ -149,6 +149,11 @@ void QXmppVCard::setPhoto(const QImage& image) } #endif +bool QXmppVCard::isVCard(const QDomElement &nodeRecv) +{ + return nodeRecv.firstChildElement("vCard").namespaceURI() == ns_vcard; +} + void QXmppVCard::parseElementFromChild(const QDomElement& nodeRecv) { // vCard diff --git a/src/QXmppVCard.h b/src/QXmppVCard.h index 446f645e..7e731e83 100644 --- a/src/QXmppVCard.h +++ b/src/QXmppVCard.h @@ -66,6 +66,8 @@ public: QImage photoAsImage() const; const QByteArray& photo() const; + static bool isVCard(const QDomElement &element); + // deprecated accessors, use the form without "get" instead /// \cond QString Q_DECL_DEPRECATED getFullName() const; -- cgit v1.2.3