telepathy-qt: BaseConnection: Fixed code style (no actual changes).

[Alexandr Akulich]

Module: telepathy-qt
Branch: master
Commit: 6d1d51f2ce03ef4dfaa0603a43c9f09c5f4ca14d
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=6d1d51f2ce03ef4dfaa0603a43c9f09c5f4ca14d

Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Tue Apr 21 13:16:33 2015 +0500

BaseConnection: Fixed code style (no actual changes).

Reviewed-by: David Edmundson

---

 TelepathyQt/base-connection-internal.h |    2 +-
 TelepathyQt/base-connection.cpp        |   15 ++++++++-------
 TelepathyQt/base-connection.h          |    4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/TelepathyQt/base-connection-internal.h b/TelepathyQt/base-connection-internal.h
index d13fa29..7b395e8 100644
--- a/TelepathyQt/base-connection-internal.h
+++ b/TelepathyQt/base-connection-internal.h
@@ -39,7 +39,7 @@ class TP_QT_NO_EXPORT BaseConnection::Adaptee : public QObject
     Q_PROPERTY(bool hasImmortalHandles READ hasImmortalHandles)
 
 public:
-    Adaptee(const QDBusConnection &dbusConnection, BaseConnection *cm);
+    Adaptee(const QDBusConnection &dbusConnection, BaseConnection *connection);
     ~Adaptee();
 
     QStringList interfaces() const;
diff --git a/TelepathyQt/base-connection.cpp b/TelepathyQt/base-connection.cpp
index 05cf4ba..9de1e5d 100644
--- a/TelepathyQt/base-connection.cpp
+++ b/TelepathyQt/base-connection.cpp
@@ -39,19 +39,20 @@ namespace Tp
 {
 
 struct TP_QT_NO_EXPORT BaseConnection::Private {
-    Private(BaseConnection *parent, const QDBusConnection &dbusConnection,
+    Private(BaseConnection *connection, const QDBusConnection &dbusConnection,
             const QString &cmName, const QString &protocolName,
             const QVariantMap &parameters)
-        : parent(parent),
+        : connection(connection),
           cmName(cmName),
           protocolName(protocolName),
           parameters(parameters),
           selfHandle(0),
           status(Tp::ConnectionStatusDisconnected),
-          adaptee(new BaseConnection::Adaptee(dbusConnection, parent)) {
+          adaptee(new BaseConnection::Adaptee(dbusConnection, connection))
+    {
     }
 
-    BaseConnection *parent;
+    BaseConnection *connection;
     QString cmName;
     QString protocolName;
     QVariantMap parameters;
@@ -81,7 +82,7 @@ BaseConnection::Adaptee::~Adaptee()
 QStringList BaseConnection::Adaptee::interfaces() const
 {
     QStringList ret;
-    foreach(const AbstractConnectionInterfacePtr & iface, mConnection->interfaces()) {
+    foreach(const AbstractConnectionInterfacePtr &iface, mConnection->interfaces()) {
         ret << iface->interfaceName();
     }
     return ret;
@@ -430,11 +431,11 @@ void BaseConnection::setRequestHandlesCallback(const RequestHandlesCallback &cb)
     mPriv->requestHandlesCB = cb;
 }
 
-UIntList BaseConnection::requestHandles(uint handleType, const QStringList &identifiers, DBusError* error)
+Tp::UIntList BaseConnection::requestHandles(uint handleType, const QStringList &identifiers, DBusError *error)
 {
     if (!mPriv->requestHandlesCB.isValid()) {
         error->set(TP_QT_ERROR_NOT_IMPLEMENTED, QLatin1String("Not implemented"));
-        return UIntList();
+        return Tp::UIntList();
     }
     return mPriv->requestHandlesCB(handleType, identifiers, error);
 }
diff --git a/TelepathyQt/base-connection.h b/TelepathyQt/base-connection.h
index d69d19f..67a756c 100644
--- a/TelepathyQt/base-connection.h
+++ b/TelepathyQt/base-connection.h
@@ -87,9 +87,9 @@ public:
     void setInspectHandlesCallback(const InspectHandlesCallback &cb);
     QStringList inspectHandles(uint handleType, const Tp::UIntList &handles, DBusError *error);
 
-    typedef Callback3<UIntList, uint, const QStringList&, DBusError*> RequestHandlesCallback;
+    typedef Callback3<Tp::UIntList, uint, const QStringList &, DBusError*> RequestHandlesCallback;
     void setRequestHandlesCallback(const RequestHandlesCallback &cb);
-    UIntList requestHandles(uint handleType, const QStringList &identifiers, DBusError *error);
+    Tp::UIntList requestHandles(uint handleType, const QStringList &identifiers, DBusError *error);
 
     Tp::ChannelInfoList channelsInfo();
     Tp::ChannelDetailsList channelsDetails();