[Telepathy-commits] [telepathy-qt4/master] DBusProxy: coding style adjustments

[Simon McVittie]

---
 TelepathyQt4/Client/dbus-proxy.cpp |   36 ++++++++++++++++++++++--------------
 TelepathyQt4/Client/dbus-proxy.h   |   36 ++++++++++++++++++------------------
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/TelepathyQt4/Client/dbus-proxy.cpp b/TelepathyQt4/Client/dbus-proxy.cpp
index 7fb33e0..20d4a62 100644
--- a/TelepathyQt4/Client/dbus-proxy.cpp
+++ b/TelepathyQt4/Client/dbus-proxy.cpp
@@ -33,17 +33,20 @@ namespace Telepathy
 namespace Client
 {
 
-struct DBusProxy::Private
+// ==== DBusProxy ======================================================
+
+class DBusProxy::Private
 {
+public:
     // Public object
-    DBusProxy& parent;
+    DBusProxy &parent;
 
     QDBusConnection dbusConnection;
     QString busName;
     QString objectPath;
 
-    Private(const QDBusConnection& dbusConnection, const QString& busName,
-            const QString& objectPath, DBusProxy& p)
+    Private(const QDBusConnection &dbusConnection, const QString &busName,
+            const QString &objectPath, DBusProxy &p)
         : parent(p),
           dbusConnection(dbusConnection),
           busName(busName),
@@ -53,8 +56,8 @@ struct DBusProxy::Private
     }
 };
 
-DBusProxy::DBusProxy(const QDBusConnection& dbusConnection,
-        const QString& busName, const QString& path, QObject* parent)
+DBusProxy::DBusProxy(const QDBusConnection &dbusConnection,
+        const QString &busName, const QString &path, QObject *parent)
  : QObject(parent),
    mPriv(new Private(dbusConnection, busName, path, *this))
 {
@@ -80,21 +83,26 @@ QString DBusProxy::busName() const
     return mPriv->busName;
 }
 
+// ==== StatelessDBusProxy =============================================
+
 StatelessDBusProxy::StatelessDBusProxy(const QDBusConnection& dbusConnection,
-        const QString& busName, const QString& objectPath, QObject* parent)
+        const QString &busName, const QString &objectPath, QObject *parent)
     : DBusProxy(dbusConnection, busName, objectPath, parent)
 {
 }
 
-struct StatefulDBusProxy::Private
+// ==== StatefulDBusProxy ==============================================
+
+class StatefulDBusProxy::Private
 {
+public:
     // Public object
-    StatefulDBusProxy& parent;
+    StatefulDBusProxy &parent;
 
     QString invalidationReason;
     QString invalidationMessage;
 
-    Private(StatefulDBusProxy& p)
+    Private(StatefulDBusProxy &p)
         : parent(p),
           invalidationReason(QString()),
           invalidationMessage(QString())
@@ -103,8 +111,8 @@ struct StatefulDBusProxy::Private
     }
 };
 
-StatefulDBusProxy::StatefulDBusProxy(const QDBusConnection& dbusConnection,
-        const QString& busName, const QString& objectPath, QObject* parent)
+StatefulDBusProxy::StatefulDBusProxy(const QDBusConnection &dbusConnection,
+        const QString &busName, const QString &objectPath, QObject *parent)
     : DBusProxy(dbusConnection, busName, objectPath, parent)
 {
     // FIXME: Am I on crack?
@@ -127,7 +135,7 @@ QString StatefulDBusProxy::invalidationMessage() const
     return mPriv->invalidationMessage;
 }
 
-void StatefulDBusProxy::invalidate(const QString& reason, const QString& message)
+void StatefulDBusProxy::invalidate(const QString &reason, const QString &message)
 {
     Q_ASSERT(isValid());
     Q_ASSERT(!reason.isEmpty());
@@ -149,7 +157,7 @@ void StatefulDBusProxy::emitInvalidated()
     emit invalidated(this, mPriv->invalidationReason, mPriv->invalidationMessage);
 }
 
-void StatefulDBusProxy::onServiceOwnerChanged(const QString& name, const QString& oldOwner, const QString& newOwner)
+void StatefulDBusProxy::onServiceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner)
 {
     // We only want to invalidate this object if it is not already invalidated,
     // and it's (not any other object's) name owner changed signal is emitted.
diff --git a/TelepathyQt4/Client/dbus-proxy.h b/TelepathyQt4/Client/dbus-proxy.h
index 3a489ac..f146d7e 100644
--- a/TelepathyQt4/Client/dbus-proxy.h
+++ b/TelepathyQt4/Client/dbus-proxy.h
@@ -55,8 +55,8 @@ public:
     /**
      * Constructor
      */
-    DBusProxy(const QDBusConnection& dbusConnection, const QString& busName,
-            const QString& objectPath, QObject* parent = 0);
+    DBusProxy(const QDBusConnection &dbusConnection, const QString& busName,
+            const QString &objectPath, QObject *parent = 0);
 
     /**
      * Destructor
@@ -87,8 +87,8 @@ public:
     QString objectPath() const;
 
 private:
-    struct Private;
-    friend struct Private;
+    class Private;
+    friend class Private;
     Private *mPriv;
 };
 
@@ -109,13 +109,13 @@ class StatelessDBusProxy : public DBusProxy
     Q_OBJECT
 
 public:
-    StatelessDBusProxy(const QDBusConnection& dbusConnection,
-        const QString& busName, const QString& objectPath,
-        QObject* parent = 0);
+    StatelessDBusProxy(const QDBusConnection &dbusConnection,
+        const QString &busName, const QString &objectPath,
+        QObject *parent = 0);
 
 private:
-    struct Private;
-    friend struct Private;
+    class Private;
+    friend class Private;
     Private *mPriv;
 };
 
@@ -135,9 +135,9 @@ class StatefulDBusProxy : public DBusProxy
     Q_OBJECT
 
 public:
-    StatefulDBusProxy(const QDBusConnection& dbusConnection,
-        const QString& busName, const QString& objectPath,
-        QObject* parent = 0);
+    StatefulDBusProxy(const QDBusConnection &dbusConnection,
+        const QString &busName, const QString &objectPath,
+        QObject *parent = 0);
 
     /**
      * If this object is usable (has not emitted #invalidated()), returns
@@ -172,7 +172,7 @@ protected:
      * This method takes care of setting the invalidationReason,
      * invalidationMessage, and emitting the invalidated signal.
      */
-    void invalidate(const QString& reason, const QString& message);
+    void invalidate(const QString &reason, const QString &message);
 
 Q_SIGNALS:
     /**
@@ -187,17 +187,17 @@ Q_SIGNALS:
      *                  of ASCII, prefixed with a reversed domain name)
      * \param errorMessage A debugging message associated with the error
      */
-    void invalidated(StatefulDBusProxy* proxy, QString errorName,
+    void invalidated(StatefulDBusProxy *proxy, QString errorName,
             QString errorMessage);
 
 private Q_SLOTS:
     void emitInvalidated();
-    void onServiceOwnerChanged(const QString& name, const QString& oldOwner,
-            const QString& newOwner);
+    void onServiceOwnerChanged(const QString &name, const QString &oldOwner,
+            const QString &newOwner);
 
 private:
-    struct Private;
-    friend struct Private;
+    class Private;
+    friend class Private;
     Private *mPriv;
 };
 
-- 
1.5.6.5