capabilitiesCollection to capabilitiesCache

6 files changed, 80 insertions, 80 deletions

diff --git a/examples/GuiClient/GuiClient.pro b/examples/GuiClient/GuiClient.pro
index 9bc0f0de..aab59ea2 100644
--- a/examples/GuiClient/GuiClient.pro
+++ b/examples/GuiClient/GuiClient.pro
@@ -23,7 +23,7 @@ SOURCES += main.cpp \
     customToolButton.cpp \
     vCardManager.cpp \
     profileDialog.cpp \
-    capabilitiesCollection.cpp \
+    capabilitiesCache.cpp \
     accountsCache.cpp
 
 HEADERS += messageGraphicsItem.h \
@@ -45,7 +45,7 @@ HEADERS += messageGraphicsItem.h \
     customToolButton.h \
     vCardManager.h \
     profileDialog.h \
-    capabilitiesCollection.h \
+    capabilitiesCache.h \
     accountsCache.h
 
 FORMS += mainDialog.ui \
diff --git a/examples/GuiClient/capabilitiesCollection.cpp b/examples/GuiClient/capabilitiesCache.cpp
index 138e5182..5c01e06f 100644
--- a/examples/GuiClient/capabilitiesCollection.cpp
+++ b/examples/GuiClient/capabilitiesCache.cpp
@@ -22,7 +22,7 @@
  */

 

 

-#include "capabilitiesCollection.h"

+#include "capabilitiesCache.h"

 

 #include "QXmppClient.h"

 #include "QXmppDiscoveryManager.h"

@@ -32,7 +32,7 @@
 #include <QXmlStreamWriter>

 #include <QDir>

 

-capabilitiesCollection::capabilitiesCollection(QXmppClient* client) :

+capabilitiesCache::capabilitiesCache(QXmppClient* client) :

     QObject(client), m_client(client)

 {

     QXmppDiscoveryManager* ext = m_client->findExtension<QXmppDiscoveryManager>();

@@ -44,12 +44,12 @@ capabilitiesCollection::capabilitiesCollection(QXmppClient* client) :
     }

 }

 

-bool capabilitiesCollection::isCapabilityAvailable(const QString& nodeVer)

+bool capabilitiesCache::isCapabilityAvailable(const QString& nodeVer)

 {

     return m_mapCapabilities.contains(nodeVer);

 }

 

-void capabilitiesCollection::requestInfo(const QString& jid, const QString& node)

+void capabilitiesCache::requestInfo(const QString& jid, const QString& node)

 {

     QXmppDiscoveryManager* ext = m_client->findExtension<QXmppDiscoveryManager>();

     if(ext)

@@ -72,7 +72,7 @@ void capabilitiesCollection::requestInfo(const QString& jid, const QString& node
     }

 }

 

-void capabilitiesCollection::infoReceived(const QXmppDiscoveryIq& discoIqRcv)

+void capabilitiesCache::infoReceived(const QXmppDiscoveryIq& discoIqRcv)

 {

     QXmppDiscoveryIq discoIq = discoIqRcv;

     if(discoIq.queryType() == QXmppDiscoveryIq::InfoQuery &&

@@ -92,7 +92,7 @@ void capabilitiesCollection::infoReceived(const QXmppDiscoveryIq& discoIqRcv)
     }

 }

 

-void capabilitiesCollection::loadAllFromCache()

+void capabilitiesCache::loadAllFromCache()

 {

     m_mapCapabilities.clear();

 

@@ -118,7 +118,7 @@ void capabilitiesCollection::loadAllFromCache()
     }

 }

 

-void capabilitiesCollection::saveToCache(const QString& nodeVer)

+void capabilitiesCache::saveToCache(const QString& nodeVer)

 {

     if(!m_mapCapabilities.contains(nodeVer))

         return;

@@ -145,7 +145,7 @@ void capabilitiesCollection::saveToCache(const QString& nodeVer)
     }

 }

 

-QStringList capabilitiesCollection::getFeatures(const QString& nodeVer)

+QStringList capabilitiesCache::getFeatures(const QString& nodeVer)

 {

     if(!m_mapCapabilities.contains(nodeVer))

         return QStringList();

@@ -153,7 +153,7 @@ QStringList capabilitiesCollection::getFeatures(const QString& nodeVer)
     return m_mapCapabilities[nodeVer].features();

 }

 

-QStringList capabilitiesCollection::getIdentities(const QString& nodeVer)

+QStringList capabilitiesCache::getIdentities(const QString& nodeVer)

 {

     if(!m_mapCapabilities.contains(nodeVer))

         return QStringList();

diff --git a/examples/GuiClient/capabilitiesCollection.h b/examples/GuiClient/capabilitiesCache.h
index 59a78758..530076dc 100644
--- a/examples/GuiClient/capabilitiesCollection.h
+++ b/examples/GuiClient/capabilitiesCache.h
@@ -1,63 +1,63 @@
-/*

- * Copyright (C) 2008-2010 The QXmpp developers

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef CAPABILITIESCOLLECTION_H

-#define CAPABILITIESCOLLECTION_H

-

-#include <QObject>

-#include <QDomElement>

-#include <QMap>

-

-class QXmppClient;

-

-#include "QXmppDiscoveryIq.h"

-

-class capabilitiesCollection : public QObject

-{

-    Q_OBJECT

-

-public:

-    capabilitiesCollection(QXmppClient* client);

-    bool isCapabilityAvailable(const QString& nodeVer);

-    void requestInfo(const QString& jid, const QString& nodeVer);

-

-    void loadAllFromCache();

-    void saveToCache(const QString& nodeVer);

-

-    QStringList getFeatures(const QString& nodeVer);

-    QStringList getIdentities(const QString& nodeVer);

-

-signals:

-

-private slots:

-    void infoReceived(const QXmppDiscoveryIq&);

-

-private:

-    QXmppClient* m_client;

-

-    QMap<QString, QXmppDiscoveryIq> m_mapCapabilities;

-    QMap<QString, QString> m_mapIdNodeVer;

-};

-

-#endif // CAPABILITIESCOLLECTION_H

+/*
+ * Copyright (C) 2008-2010 The QXmpp developers
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef CAPABILITIESCOLLECTION_H
+#define CAPABILITIESCOLLECTION_H
+
+#include <QObject>
+#include <QDomElement>
+#include <QMap>
+
+class QXmppClient;
+
+#include "QXmppDiscoveryIq.h"
+
+class capabilitiesCache : public QObject
+{
+    Q_OBJECT
+
+public:
+    capabilitiesCache(QXmppClient* client);
+    bool isCapabilityAvailable(const QString& nodeVer);
+    void requestInfo(const QString& jid, const QString& nodeVer);
+
+    void loadAllFromCache();
+    void saveToCache(const QString& nodeVer);
+
+    QStringList getFeatures(const QString& nodeVer);
+    QStringList getIdentities(const QString& nodeVer);
+
+signals:
+
+private slots:
+    void infoReceived(const QXmppDiscoveryIq&);
+
+private:
+    QXmppClient* m_client;
+
+    QMap<QString, QXmppDiscoveryIq> m_mapCapabilities;
+    QMap<QString, QString> m_mapIdNodeVer;
+};
+
+#endif // CAPABILITIESCOLLECTION_H
diff --git a/examples/GuiClient/mainDialog.h b/examples/GuiClient/mainDialog.h
index 39fb903b..f70387c3 100644
--- a/examples/GuiClient/mainDialog.h
+++ b/examples/GuiClient/mainDialog.h
@@ -34,7 +34,7 @@
 #include "statusWidget.h"
 #include "chatDialog.h"
 #include "vCardManager.h"
-#include "capabilitiesCollection.h"
+#include "capabilitiesCache.h"
 #include "accountsCache.h"
 #include <QSystemTrayIcon>
 #include <QMenu>
@@ -99,7 +99,7 @@ private:
     rosterItemSortFilterProxyModel m_rosterItemSortFilterModel;
     statusWidget m_statusWidget;
     vCardManager m_vCardManager;
-    capabilitiesCollection m_capabilitiesCollection;
+    capabilitiesCache m_capabilitiesCollection;
     accountsCache m_accountsCache;
 
     // map of bare jids and respective chatdlg
diff --git a/examples/GuiClient/profileDialog.cpp b/examples/GuiClient/profileDialog.cpp
index 7cef4599..fc5c0a44 100644
--- a/examples/GuiClient/profileDialog.cpp
+++ b/examples/GuiClient/profileDialog.cpp
@@ -11,7 +11,7 @@
 #include "QXmppEntityTimeIq.h"
 #include "QXmppConstants.h"
 
-profileDialog::profileDialog(QWidget *parent, const QString& bareJid, QXmppClient& client, capabilitiesCollection& caps) :
+profileDialog::profileDialog(QWidget *parent, const QString& bareJid, QXmppClient& client, capabilitiesCache& caps) :
     QDialog(parent, Qt::WindowTitleHint|Qt::WindowSystemMenuHint),
     ui(new Ui::profileDialog), m_bareJid(bareJid), m_xmppClient(client), m_caps(caps)
 {
diff --git a/examples/GuiClient/profileDialog.h b/examples/GuiClient/profileDialog.h
index aafbc357..efe54a67 100644
--- a/examples/GuiClient/profileDialog.h
+++ b/examples/GuiClient/profileDialog.h
@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include <QMap>
-#include "capabilitiesCollection.h"
+#include "capabilitiesCache.h"
 
 namespace Ui {
     class profileDialog;
@@ -18,7 +18,7 @@ class profileDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit profileDialog(QWidget *parent, const QString& bareJid, QXmppClient& client, capabilitiesCollection& caps);
+    explicit profileDialog(QWidget *parent, const QString& bareJid, QXmppClient& client, capabilitiesCache& caps);
     ~profileDialog();
 
     void setClientRef(QXmppClient& m_xmppClient);
@@ -39,7 +39,7 @@ private:
     Ui::profileDialog *ui;
     QString m_bareJid;
     QXmppClient& m_xmppClient;  // reference to the active QXmppClient (No ownership)
-    capabilitiesCollection& m_caps;  // reference to the active QXmppClient (No ownership)
+    capabilitiesCache& m_caps;  // reference to the active QXmppClient (No ownership)
     QMap<QString, QXmppVersionIq> m_versions;
     QMap<QString, QXmppEntityTimeIq> m_time;
 };