[Telepathy-commits] [telepathy-qt4/master] Changed ConnectionManager::cmName to name as we are already a CM.

[Andre Moreira Magalhaes (andrunko)]

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

diff --git a/TelepathyQt4/cli-connection-manager.cpp b/TelepathyQt4/cli-connection-manager.cpp
index f50a91a..ad880fa 100644
--- a/TelepathyQt4/cli-connection-manager.cpp
+++ b/TelepathyQt4/cli-connection-manager.cpp
@@ -262,7 +262,7 @@ ConnectionManager::ConnectionManager(const QString& name, QObject* parent)
             Private::makeBusName(name), Private::makeObjectPath(name),
             parent),
       mPriv(new Private(*this, name)),
-      mCmName(name)
+      mName(name)
 {
 }
 
@@ -272,7 +272,7 @@ ConnectionManager::ConnectionManager(const QDBusConnection& bus,
     : StatelessDBusProxy(bus, Private::makeBusName(name),
             Private::makeObjectPath(name), parent),
       mPriv(new Private(*this, name)),
-      mCmName(name)
+      mName(name)
 {
 }
 
@@ -357,7 +357,7 @@ void ConnectionManager::onListProtocolsReturn(
     }
 
     Q_FOREACH (const QString &protocolName, protocols) {
-        mPriv->protocols.append(new ProtocolInfo(mCmName,
+        mPriv->protocols.append(new ProtocolInfo(mName,
                                                  protocolName));
 
         mPriv->getParametersQueue.enqueue(protocolName);
diff --git a/TelepathyQt4/cli-connection-manager.h b/TelepathyQt4/cli-connection-manager.h
index 3b0dada..0456a97 100644
--- a/TelepathyQt4/cli-connection-manager.h
+++ b/TelepathyQt4/cli-connection-manager.h
@@ -176,7 +176,7 @@ public:
 
     virtual ~ConnectionManager();
 
-    QString cmName() const { return mCmName; }
+    QString name() const { return mName; }
 
     QStringList interfaces() const;
 
@@ -225,7 +225,7 @@ private:
     struct Private;
     friend struct Private;
     Private *mPriv;
-    QString mCmName;
+    QString mName;
 };
 
 }
-- 
1.5.6.5