vCardManager to vCardCache

5 files changed, 33 insertions, 33 deletions

diff --git a/examples/GuiClient/GuiClient.pro b/examples/GuiClient/GuiClient.pro
index aab59ea2..dd528beb 100644
--- a/examples/GuiClient/GuiClient.pro
+++ b/examples/GuiClient/GuiClient.pro
@@ -21,7 +21,7 @@ SOURCES += main.cpp \
     avatarWidget.cpp \
     statusTextWidget.cpp \
     customToolButton.cpp \
-    vCardManager.cpp \
+    vCardCache.cpp \
     profileDialog.cpp \
     capabilitiesCache.cpp \
     accountsCache.cpp
@@ -43,7 +43,7 @@ HEADERS += messageGraphicsItem.h \
     avatarWidget.h \
     statusTextWidget.h \
     customToolButton.h \
-    vCardManager.h \
+    vCardCache.h \
     profileDialog.h \
     capabilitiesCache.h \
     accountsCache.h
diff --git a/examples/GuiClient/mainDialog.cpp b/examples/GuiClient/mainDialog.cpp
index 1c7ee434..c0972317 100644
--- a/examples/GuiClient/mainDialog.cpp
+++ b/examples/GuiClient/mainDialog.cpp
@@ -45,7 +45,7 @@
 
 mainDialog::mainDialog(QWidget *parent): QDialog(parent, Qt::Window),
     ui(new Ui::mainDialogClass), m_rosterItemModel(this),
-    m_rosterItemSortFilterModel(this), m_vCardManager(&m_xmppClient),
+    m_rosterItemSortFilterModel(this), m_vCardCache(&m_xmppClient),
     m_capabilitiesCache(&m_xmppClient), m_accountsCache(this),
     m_trayIcon(this), m_trayIconMenu(this), m_quitAction("Quit", this),
     m_signOutAction("Sign out", this)
@@ -152,11 +152,11 @@ mainDialog::mainDialog(QWidget *parent): QDialog(parent, Qt::Window),
     Q_ASSERT(check);
 
     check = connect(&m_xmppClient.vCardManager(),
-                    SIGNAL(vCardReceived(const QXmppVCardIq&)), &m_vCardManager,
+                    SIGNAL(vCardReceived(const QXmppVCardIq&)), &m_vCardCache,
                     SLOT(vCardReceived(const QXmppVCardIq&)));
     Q_ASSERT(check);
 
-    check = connect(&m_vCardManager,
+    check = connect(&m_vCardCache,
                     SIGNAL(vCardReadyToUse(const QString&)),
                     SLOT(updateVCard(const QString&)));
     Q_ASSERT(check);
@@ -167,14 +167,14 @@ void mainDialog::rosterChanged(const QString& bareJid)
     m_rosterItemModel.updateRosterEntry(bareJid, m_xmppClient.rosterManager().
                                         getRosterEntry(bareJid));
 
-    bool check = m_vCardManager.isVCardAvailable(bareJid);
+    bool check = m_vCardCache.isVCardAvailable(bareJid);
     if(check)
     {
         updateVCard(bareJid);
     }
     else
     {
-        m_vCardManager.requestVCard(bareJid);
+        m_vCardCache.requestVCard(bareJid);
     }
 }
 
@@ -227,11 +227,11 @@ void mainDialog::presenceChanged(const QString& bareJid, const QString& resource
 
 //    QXmppPresence::Type presenceType = presences.begin().value().getType();
 
-//    if(!m_vCardManager.isVCardAvailable(bareJid) &&
+//    if(!m_vCardCache.isVCardAvailable(bareJid) &&
 //       presenceType == QXmppPresence::Available)
 //    {
 //        m_rosterItemModel.updateAvatar(bareJid,
-//                                   m_vCardManager.getVCard(bareJid).image);
+//                                   m_vCardCache.getVCard(bareJid).image);
 //    }
 }
 
@@ -418,7 +418,7 @@ void mainDialog::signIn()
 
     m_rosterItemModel.clear();
 
-    m_vCardManager.loadAllFromCache();
+    m_vCardCache.loadAllFromCache();
     m_capabilitiesCache.loadAllFromCache();
 
     startConnection();
@@ -514,17 +514,17 @@ void mainDialog::updateVCard(const QString& bareJid)
     if(bareJid != m_xmppClient.configuration().jidBare())
     {
         m_rosterItemModel.updateAvatar(bareJid,
-                                   m_vCardManager.getAvatar(bareJid));
-        m_rosterItemModel.updateName(bareJid, m_vCardManager.getVCard(bareJid).fullName());
+                                   m_vCardCache.getAvatar(bareJid));
+        m_rosterItemModel.updateName(bareJid, m_vCardCache.getVCard(bareJid).fullName());
     }
     else
     {
-        if(m_vCardManager.getSelfFullName().isEmpty())
+        if(m_vCardCache.getSelfFullName().isEmpty())
             m_statusWidget.setDisplayName(m_xmppClient.configuration().jidBare());
         else
-            m_statusWidget.setDisplayName(m_vCardManager.getSelfFullName());
+            m_statusWidget.setDisplayName(m_vCardCache.getSelfFullName());
 
-        m_statusWidget.setAvatar(m_vCardManager.getAvatar(bareJid));
+        m_statusWidget.setAvatar(m_vCardCache.getAvatar(bareJid));
     }
 }
 
@@ -536,13 +536,13 @@ void mainDialog::showProfile(const QString& bareJid)
     profileDialog dlg(this, bareJid, m_xmppClient, m_capabilitiesCache);
     dlg.setBareJid(bareJid);
     // TODO use original image
-    if(!m_vCardManager.getAvatar(bareJid).isNull())
-        dlg.setAvatar(m_vCardManager.getAvatar(bareJid));
+    if(!m_vCardCache.getAvatar(bareJid).isNull())
+        dlg.setAvatar(m_vCardCache.getAvatar(bareJid));
     QStringList resources = m_xmppClient.rosterManager().getResources(bareJid);
 
-    dlg.setFullName(m_vCardManager.getVCard(bareJid).fullName());
+    dlg.setFullName(m_vCardCache.getVCard(bareJid).fullName());
 
-    if(m_vCardManager.getVCard(bareJid).fullName().isEmpty())
+    if(m_vCardCache.getVCard(bareJid).fullName().isEmpty())
         dlg.setFullName(m_xmppClient.rosterManager().getRosterEntry(bareJid).name());
 
     dlg.exec();
diff --git a/examples/GuiClient/mainDialog.h b/examples/GuiClient/mainDialog.h
index 5e60476d..9c3f6ae9 100644
--- a/examples/GuiClient/mainDialog.h
+++ b/examples/GuiClient/mainDialog.h
@@ -33,7 +33,7 @@
 #include <QMap>
 #include "statusWidget.h"
 #include "chatDialog.h"
-#include "vCardManager.h"
+#include "vCardCache.h"
 #include "capabilitiesCache.h"
 #include "accountsCache.h"
 #include <QSystemTrayIcon>
@@ -99,7 +99,7 @@ private:
     rosterItemModel m_rosterItemModel;
     rosterItemSortFilterProxyModel m_rosterItemSortFilterModel;
     statusWidget m_statusWidget;
-    vCardManager m_vCardManager;
+    vCardCache m_vCardCache;
     capabilitiesCache m_capabilitiesCache;
     accountsCache m_accountsCache;
 
diff --git a/examples/GuiClient/vCardManager.cpp b/examples/GuiClient/vCardCache.cpp
index 778b7a08..858edd5d 100644
--- a/examples/GuiClient/vCardManager.cpp
+++ b/examples/GuiClient/vCardCache.cpp
@@ -22,7 +22,7 @@
  */
 
 
-#include "vCardManager.h"
+#include "vCardCache.h"
 #include "QXmppClient.h"
 #include "QXmppUtils.h"
 #include "utils.h"
@@ -34,12 +34,12 @@
 #include <QCoreApplication>
 #include <QDomDocument>
 
-vCardManager::vCardManager(QXmppClient* client) : QObject(client),
+vCardCache::vCardCache(QXmppClient* client) : QObject(client),
                 m_client(client)
 {
 }
 
-void vCardManager::vCardReceived(const QXmppVCardIq& vcard)
+void vCardCache::vCardReceived(const QXmppVCardIq& vcard)
 {
     QString from = vcard.from();
     if(from.isEmpty() && m_client)
@@ -55,24 +55,24 @@ void vCardManager::vCardReceived(const QXmppVCardIq& vcard)
     emit vCardReadyToUse(from);
 }
 
-bool vCardManager::isVCardAvailable(const QString& bareJid)
+bool vCardCache::isVCardAvailable(const QString& bareJid)
 {
     return m_mapBareJidVcard.contains(bareJid);
 }
 
-void vCardManager::requestVCard(const QString& bareJid)
+void vCardCache::requestVCard(const QString& bareJid)
 {
     if(m_client)
         m_client->vCardManager().requestVCard(bareJid);
 }
 
 //TODO not a good way to handle
-QXmppVCardIq& vCardManager::getVCard(const QString& bareJid)
+QXmppVCardIq& vCardCache::getVCard(const QString& bareJid)
 {
     return m_mapBareJidVcard[bareJid];
 }
 
-void vCardManager::saveToCache(const QString& bareJid)
+void vCardCache::saveToCache(const QString& bareJid)
 {
     QDir dir;
     if(!dir.exists(getSettingsDir(m_client->configuration().jidBare())))
@@ -98,7 +98,7 @@ void vCardManager::saveToCache(const QString& bareJid)
     }
 }
 
-void vCardManager::loadAllFromCache()
+void vCardCache::loadAllFromCache()
 {
     m_mapBareJidVcard.clear();
 
@@ -126,13 +126,13 @@ void vCardManager::loadAllFromCache()
     }
 }
 
-QString vCardManager::getSelfFullName()
+QString vCardCache::getSelfFullName()
 {
     return m_selfFullName;
 }
 
 // this should return scaled image
-QImage vCardManager::getAvatar(const QString& bareJid) const
+QImage vCardCache::getAvatar(const QString& bareJid) const
 {
     if(m_mapBareJidVcard.contains(bareJid))
         return getImageFromByteArray(m_mapBareJidVcard[bareJid].photo());
diff --git a/examples/GuiClient/vCardManager.h b/examples/GuiClient/vCardCache.h
index dcd5e774..f96ff18c 100644
--- a/examples/GuiClient/vCardManager.h
+++ b/examples/GuiClient/vCardCache.h
@@ -34,12 +34,12 @@
 
 class QXmppClient;
 
-class vCardManager : public QObject
+class vCardCache : public QObject
 {
     Q_OBJECT
 
 public:
-    vCardManager(QXmppClient* client);
+    vCardCache(QXmppClient* client);
     void requestVCard(const QString& bareJid);
     bool isVCardAvailable(const QString& bareJid);
     QImage getAvatar(const QString& bareJid) const;