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

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

diff --git a/TelepathyQt4/pending-connection.h b/TelepathyQt4/pending-connection.h
index 5a509e8..e1dea66 100644
--- a/TelepathyQt4/pending-connection.h
+++ b/TelepathyQt4/pending-connection.h
@@ -42,6 +42,7 @@ class ConnectionManager;
 class PendingConnection : public PendingOperation
 {
     Q_OBJECT
+    Q_DISABLE_COPY(PendingConnection);
 
 public:
     ~PendingConnection();
@@ -58,13 +59,13 @@ private Q_SLOTS:
     void onCallFinished(QDBusPendingCallWatcher *watcher);
 
 private:
-    Q_DISABLE_COPY(PendingConnection);
+    friend class ConnectionManager;
+
     PendingConnection(const ConnectionManagerPtr &manager,
             const QString &protocol, const QVariantMap &parameters);
 
     struct Private;
     friend struct Private;
-    friend class ConnectionManager;
     Private *mPriv;
 };
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list