add support for first/middle/last name in vCards

2 files changed, 65 insertions, 9 deletions

diff --git a/source/QXmppVCard.cpp b/source/QXmppVCard.cpp
index de865f5b..4385166f 100644
--- a/source/QXmppVCard.cpp
+++ b/source/QXmppVCard.cpp
@@ -36,6 +36,16 @@ QXmppVCard::QXmppVCard(const QString& jid) : QXmppIq(QXmppIq::Get)
     setTo(jid);
 }
 
+QString QXmppVCard::firstName() const
+{
+    return m_firstName;
+}
+
+void QXmppVCard::setFirstName(const QString &firstName)
+{
+    m_firstName = firstName;
+}
+
 QString QXmppVCard::fullName() const
 {
     return m_fullName;
@@ -46,6 +56,26 @@ void QXmppVCard::setFullName(const QString& str)
     m_fullName = str;
 }
 
+QString QXmppVCard::lastName() const
+{
+    return m_lastName;
+}
+
+void QXmppVCard::setLastName(const QString &lastName)
+{
+    m_lastName = lastName;
+}
+
+QString QXmppVCard::middleName() const
+{
+    return m_middleName;
+}
+
+void QXmppVCard::setMiddleName(const QString &middleName)
+{
+    m_middleName = middleName;
+}
+
 QString QXmppVCard::nickName() const
 {
     return m_nickName;
@@ -82,11 +112,14 @@ void QXmppVCard::parse(const QDomElement& nodeRecv)
     setTypeFromStr(nodeRecv.attribute("type"));
 
     // vCard
-    setFullName(nodeRecv.firstChildElement("vCard").
-                firstChildElement("FN").text());
-    setNickName(nodeRecv.firstChildElement("vCard").
-                firstChildElement("NICKNAME").text());
-    QByteArray base64data = nodeRecv.firstChildElement("vCard").
+    QDomElement cardElement = nodeRecv.firstChildElement("vCard");
+    m_fullName = cardElement.firstChildElement("FN").text();
+    m_nickName = cardElement.firstChildElement("NICKNAME").text();
+    QDomElement nameElement = cardElement.firstChildElement("N");
+    m_firstName = nameElement.firstChildElement("GIVEN").text();
+    m_lastName = nameElement.firstChildElement("FAMILY").text();
+    m_middleName = nameElement.firstChildElement("MIDDLE").text();
+    QByteArray base64data = cardElement.
                             firstChildElement("PHOTO").
                             firstChildElement("BINVAL").text().toAscii();
     setPhoto(QByteArray::fromBase64(base64data));
@@ -96,9 +129,23 @@ void QXmppVCard::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     writer->writeStartElement("vCard");
     helperToXmlAddAttribute(writer,"xmlns", ns_vcard);
-    helperToXmlAddTextElement(writer, "FN", fullName());
-    if(!nickName().isEmpty())
-        helperToXmlAddTextElement(writer, "NICKNAME", nickName());
+    if (!m_fullName.isEmpty())
+        helperToXmlAddTextElement(writer, "FN", m_fullName);
+    if(!m_nickName.isEmpty())
+        helperToXmlAddTextElement(writer, "NICKNAME", m_nickName);
+    if (!m_firstName.isEmpty() ||
+        !m_lastName.isEmpty() ||
+        !m_middleName.isEmpty())
+    {
+        writer->writeStartElement("N");
+        if (!m_firstName.isEmpty())
+            helperToXmlAddTextElement(writer, "GIVEN", m_firstName);
+        if (!m_lastName.isEmpty())
+            helperToXmlAddTextElement(writer, "FAMILY", m_lastName);
+        if (!m_middleName.isEmpty())
+            helperToXmlAddTextElement(writer, "MIDDLE", m_middleName);
+        writer->writeEndElement();
+    }
 
     if(!photo().isEmpty())
     {
diff --git a/source/QXmppVCard.h b/source/QXmppVCard.h
index 03e617ed..08a4b456 100644
--- a/source/QXmppVCard.h
+++ b/source/QXmppVCard.h
@@ -36,8 +36,10 @@ class QXmppVCard : public QXmppIq
 public:
     QXmppVCard(const QString& bareJid = "");
 
+    void setFirstName(const QString&);
     void setFullName(const QString&);
-
+    void setLastName(const QString&);
+    void setMiddleName(const QString&);
     void setNickName(const QString&);
 
     void setPhoto(const QByteArray&);
@@ -45,8 +47,12 @@ public:
 
     void parse(const QDomElement&);
 
+    QString firstName() const;
     QString fullName() const;
+    QString lastName() const;
+    QString middleName() const;
     QString nickName() const;
+
     QImage photoAsImage() const;
     const QByteArray& photo() const;
 
@@ -61,7 +67,10 @@ public:
 private:
     void toXmlElementFromChild(QXmlStreamWriter *writer) const;
 
+    QString m_firstName;
     QString m_fullName;
+    QString m_lastName;
+    QString m_middleName;
     QString m_nickName;
 
     // not as 64 base