[telepathy-qt4/master] AccountManager: Standardize class definition.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Mon Jun 29 08:21:32 PDT 2009


- Moved public xxxInterface methods definition to the end of the public methods
  declaration.
- Added friend struct Private declaration.
- Added Q_DISABLE_COPY(xxx) to all classes that can not be copied.
- Moved Q_DISABLE_COPY(xxx) declaration to the top of the class definition,
  before the public keyword.
- Reorder public, protected, SIGNALS declaration as follows:
   public
   public Q_SLOTS
   Q_SIGNALS
   protected
   protected Q_SLOTS
   private Q_SLOTS
   private
- Moved friend class xxx definitions to be placed right bellow private keyword.
---
 TelepathyQt4/account-manager.h |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/TelepathyQt4/account-manager.h b/TelepathyQt4/account-manager.h
index b22da8a..1751ffa 100644
--- a/TelepathyQt4/account-manager.h
+++ b/TelepathyQt4/account-manager.h
@@ -65,11 +65,6 @@ public:
 
     virtual ~AccountManager();
 
-    inline Client::DBus::PropertiesInterface *propertiesInterface() const
-    {
-        return OptionalInterfaceFactory<AccountManager>::interface<Client::DBus::PropertiesInterface>();
-    }
-
     QStringList validAccountPaths() const;
     QStringList invalidAccountPaths() const;
     QStringList allAccountPaths() const;
@@ -89,6 +84,11 @@ public:
 
     // TODO: enabledAccounts(), accountsByProtocol(), ... ?
 
+    inline Client::DBus::PropertiesInterface *propertiesInterface() const
+    {
+        return OptionalInterfaceFactory<AccountManager>::interface<Client::DBus::PropertiesInterface>();
+    }
+
 Q_SIGNALS:
     void accountCreated(const QString &path);
     void accountRemoved(const QString &path);
@@ -106,9 +106,10 @@ private Q_SLOTS:
     void onAccountRemoved(const QDBusObjectPath &);
 
 private:
+    friend class PendingAccount;
+
     struct Private;
     friend struct Private;
-    friend class PendingAccount;
     Private *mPriv;
 };
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list