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

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Mon Jun 29 08:37:31 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-ready.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TelepathyQt4/pending-ready.h b/TelepathyQt4/pending-ready.h
index a407b2e..5436f41 100644
--- a/TelepathyQt4/pending-ready.h
+++ b/TelepathyQt4/pending-ready.h
@@ -37,6 +37,7 @@ namespace Tp
 class PendingReady: public PendingOperation
 {
     Q_OBJECT
+    Q_DISABLE_COPY(PendingReady);
 
 public:
     PendingReady(const Features &requestedFeatures, QObject *object,
@@ -48,11 +49,10 @@ public:
     Features requestedFeatures() const;
 
 private:
-    Q_DISABLE_COPY(PendingReady);
+    friend class ReadinessHelper;
 
     struct Private;
     friend struct Private;
-    friend class ReadinessHelper;
     Private *mPriv;
 };
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list