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

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

diff --git a/TelepathyQt4/contact.h b/TelepathyQt4/contact.h
index 41c5396..ceb8fa1 100644
--- a/TelepathyQt4/contact.h
+++ b/TelepathyQt4/contact.h
@@ -43,6 +43,7 @@ class ReferencedHandles;
 class Contact : public QObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(Contact);
 
 public:
     enum Feature {
@@ -104,8 +105,6 @@ Q_SIGNALS:
     // want to signal that change right away with a handle?
 
 private:
-    Q_DISABLE_COPY(Contact);
-
     Contact(ContactManager *manager, const ReferencedHandles &handle,
             const QSet<Feature> &requestedFeatures, const QVariantMap &attributes);
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list