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

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Mon Jun 29 08:35:52 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/pending-account.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/TelepathyQt4/pending-account.h b/TelepathyQt4/pending-account.h
index 82cbe22..ac21772 100644
--- a/TelepathyQt4/pending-account.h
+++ b/TelepathyQt4/pending-account.h
@@ -42,6 +42,7 @@ class AccountManager;
 class PendingAccount : public PendingOperation
 {
     Q_OBJECT
+    Q_DISABLE_COPY(PendingAccount);
 
 public:
     ~PendingAccount();
@@ -56,7 +57,8 @@ private Q_SLOTS:
     void onCallFinished(QDBusPendingCallWatcher *watcher);
 
 private:
-    Q_DISABLE_COPY(PendingAccount);
+    friend class AccountManager;
+
     PendingAccount(const AccountManagerPtr &manager,
             const QString &connectionManager, const QString &protocol,
             const QString &displayName, const QVariantMap &parameters,
@@ -64,7 +66,6 @@ private:
 
     struct Private;
     friend struct Private;
-    friend class AccountManager;
     Private *mPriv;
 };
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list