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

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

diff --git a/TelepathyQt4/contact-manager.h b/TelepathyQt4/contact-manager.h
index 30d1539..ffa9ee3 100644
--- a/TelepathyQt4/contact-manager.h
+++ b/TelepathyQt4/contact-manager.h
@@ -46,6 +46,7 @@ class PendingOperation;
 class ContactManager : public QObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(ContactManager)
 
 public:
     ConnectionPtr connection() const;
@@ -123,6 +124,9 @@ private Q_SLOTS:
         const Tp::Channel::GroupMemberChangeDetails &details);
 
 private:
+    friend class Connection;
+    friend class PendingContacts;
+
     struct ContactListChannel
     {
         enum Type {
@@ -167,8 +171,6 @@ private:
 
     struct Private;
     friend struct Private;
-    friend class Connection;
-    friend class PendingContacts;
     Private *mPriv;
 };
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list