refactor vCardCache

3 files changed, 10 insertions, 16 deletions

diff --git a/examples/GuiClient/mainDialog.cpp b/examples/GuiClient/mainDialog.cpp
index c0972317..cf0a05e3 100644
--- a/examples/GuiClient/mainDialog.cpp
+++ b/examples/GuiClient/mainDialog.cpp
@@ -519,10 +519,13 @@ void mainDialog::updateVCard(const QString& bareJid)
     }
     else
     {
-        if(m_vCardCache.getSelfFullName().isEmpty())
-            m_statusWidget.setDisplayName(m_xmppClient.configuration().jidBare());
-        else
-            m_statusWidget.setDisplayName(m_vCardCache.getSelfFullName());
+        QXmppVCardIq& vCard = m_vCardCache.getVCard(m_xmppClient.configuration().jidBare());
+        QString fullName = vCard.fullName();
+
+        if(fullName.isEmpty())
+            fullName = m_xmppClient.configuration().jidBare();
+
+        m_statusWidget.setDisplayName(fullName);
 
         m_statusWidget.setAvatar(m_vCardCache.getAvatar(bareJid));
     }
diff --git a/examples/GuiClient/vCardCache.cpp b/examples/GuiClient/vCardCache.cpp
index f5915bd1..9c0c18d0 100644
--- a/examples/GuiClient/vCardCache.cpp
+++ b/examples/GuiClient/vCardCache.cpp
@@ -42,11 +42,9 @@ vCardCache::vCardCache(QXmppClient* client) : QObject(client),
 void vCardCache::vCardReceived(const QXmppVCardIq& vcard)
 {
     QString from = vcard.from();
+
     if(from.isEmpty() && m_client)
-    {
         from = m_client->configuration().jidBare();
-        m_selfFullName = vcard.fullName();
-    }
 
     m_mapBareJidVcard[from] = vcard;
 
@@ -126,11 +124,6 @@ void vCardCache::loadAllFromCache()
     }
 }
 
-QString vCardCache::getSelfFullName()
-{
-    return m_selfFullName;
-}
-
 // this should return scaled image
 QImage vCardCache::getAvatar(const QString& bareJid) const
 {
diff --git a/examples/GuiClient/vCardCache.h b/examples/GuiClient/vCardCache.h
index dbd708b8..707144f1 100644
--- a/examples/GuiClient/vCardCache.h
+++ b/examples/GuiClient/vCardCache.h
@@ -30,8 +30,6 @@
 #include <QImage>
 #include "QXmppVCardIq.h"
 
-// use sqlite
-
 class QXmppClient;
 
 class vCardCache : public QObject
@@ -40,13 +38,14 @@ class vCardCache : public QObject
 
 public:
     vCardCache(QXmppClient* client);
+
     void requestVCard(const QString& bareJid);
     bool isVCardAvailable(const QString& bareJid);
     QImage getAvatar(const QString& bareJid) const;
     QXmppVCardIq& getVCard(const QString& bareJid);
+
     void loadAllFromCache();
     void saveToCache(const QString& bareJid);
-    QString getSelfFullName();
 
 signals:
     void vCardReadyToUse(const QString& bareJid);
@@ -55,7 +54,6 @@ public slots:
     void vCardReceived(const QXmppVCardIq&);
 
 private:
-    QString m_selfFullName;
     QXmppClient* m_client;
 
     QMap<QString, QXmppVCardIq> m_mapBareJidVcard;