[Telepathy-commits] [telepathy-qt4/master] Changed ProtocolInfo::protocolName to name as we are already a protocol.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/cli-connection-manager.cpp |    8 ++++----
 TelepathyQt4/cli-connection-manager.h   |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/TelepathyQt4/cli-connection-manager.cpp b/TelepathyQt4/cli-connection-manager.cpp
index 2f5f73a..f50a91a 100644
--- a/TelepathyQt4/cli-connection-manager.cpp
+++ b/TelepathyQt4/cli-connection-manager.cpp
@@ -91,10 +91,10 @@ struct ProtocolInfo::Private
 };
 
 
-ProtocolInfo::ProtocolInfo(const QString &cmName, const QString &protocolName)
+ProtocolInfo::ProtocolInfo(const QString &cmName, const QString &name)
     : mPriv(new Private()),
       mCmName(cmName),
-      mProtocolName(protocolName)
+      mName(name)
 {
 }
 
@@ -212,7 +212,7 @@ QString ConnectionManager::Private::makeObjectPath(const QString& name)
 ProtocolInfo *ConnectionManager::Private::protocol(const QString &protocolName)
 {
     Q_FOREACH (ProtocolInfo *info, protocols) {
-        if (info->protocolName() == protocolName) {
+        if (info->name() == protocolName) {
             return info;
         }
     }
@@ -293,7 +293,7 @@ QStringList ConnectionManager::supportedProtocols() const
 {
     QStringList protocols;
     Q_FOREACH (const ProtocolInfo *info, mPriv->protocols) {
-        protocols.append(info->protocolName());
+        protocols.append(info->name());
     }
     return protocols;
 }
diff --git a/TelepathyQt4/cli-connection-manager.h b/TelepathyQt4/cli-connection-manager.h
index 6b227ed..3b0dada 100644
--- a/TelepathyQt4/cli-connection-manager.h
+++ b/TelepathyQt4/cli-connection-manager.h
@@ -106,7 +106,7 @@ public:
      * Get the untranslated name of the protocol as described in the Telepathy
      * D-Bus API Specification (e.g. "jabber").
      */
-    QString protocolName() const { return mProtocolName; }
+    QString name() const { return mName; }
 
     /**
      * Return all supported parameters. The parameters' names
@@ -139,7 +139,7 @@ public:
 private:
     Q_DISABLE_COPY(ProtocolInfo);
 
-    ProtocolInfo(const QString &cmName, const QString &protocolName);
+    ProtocolInfo(const QString &cmName, const QString &name);
 
     void addParameter(const ParamSpec &spec);
 
@@ -148,7 +148,7 @@ private:
     friend class ConnectionManager;
     Private *mPriv;
     QString mCmName;
-    QString mProtocolName;
+    QString mName;
 };
 
 
-- 
1.5.6.5