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

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

diff --git a/TelepathyQt4/pending-contact-attributes.h b/TelepathyQt4/pending-contact-attributes.h
index 8e6aedb..35e0155 100644
--- a/TelepathyQt4/pending-contact-attributes.h
+++ b/TelepathyQt4/pending-contact-attributes.h
@@ -39,6 +39,7 @@ class ReferencedHandles;
 class PendingContactAttributes : public PendingOperation
 {
     Q_OBJECT
+    Q_DISABLE_COPY(PendingContactAttributes)
 
 public:
     ~PendingContactAttributes();
@@ -59,8 +60,10 @@ private Q_SLOTS:
 private:
     friend class Connection;
 
-    PendingContactAttributes(const ConnectionPtr &connection, const UIntList &handles,
+    PendingContactAttributes(const ConnectionPtr &connection,
+            const UIntList &handles,
             const QStringList &interfaces, bool reference);
+
     void failImmediately(const QString &error, const QString &errorMessage);
 
     struct Private;
-- 
1.5.6.5




More information about the telepathy-commits mailing list