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

[Andre Moreira Magalhaes (andrunko)]

- 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/channel.h |   58 +++++++++++++++++++++++------------------------
 1 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/TelepathyQt4/channel.h b/TelepathyQt4/channel.h
index bfa275f..345fd31 100644
--- a/TelepathyQt4/channel.h
+++ b/TelepathyQt4/channel.h
@@ -144,32 +144,11 @@ public:
     bool groupIsSelfContactTracked() const;
     ContactPtr groupSelfContact() const;
 
-Q_SIGNALS:
-    void groupFlagsChanged(uint flags, uint added, uint removed);
-
-    void groupCanAddContactsChanged(bool canAddContacts);
-    void groupCanRemoveContactsChanged(bool canRemoveContacts);
-    void groupCanRescindContactsChanged(bool canRescindContacts);
-
-    void groupMembersChanged(
-            const Tp::Contacts &groupMembersAdded,
-            const Tp::Contacts &groupLocalPendingMembersAdded,
-            const Tp::Contacts &groupRemotePendingMembersAdded,
-            const Tp::Contacts &groupMembersRemoved,
-            const Tp::Channel::GroupMemberChangeDetails &details);
-
-    void groupHandleOwnersChanged(const Tp::HandleOwnerMap &owners,
-            const Tp::UIntList &added, const Tp::UIntList &removed);
-
-    void groupSelfContactChanged();
-
-protected:
-    bool groupSelfHandleIsLocalPending() const;
-
-protected Q_SLOTS:
-    PendingOperation *groupAddSelfHandle();
+    inline Client::DBus::PropertiesInterface *propertiesInterface() const
+    {
+        return optionalInterface<Client::DBus::PropertiesInterface>(BypassInterfaceCheck);
+    }
 
-public:
     inline Client::ChannelInterfaceCallStateInterface *callStateInterface(
             InterfaceSupportedChecking check = CheckInterfaceSupported) const
     {
@@ -212,11 +191,6 @@ public:
         return optionalInterface<Client::ChannelInterfacePasswordInterface>(check);
     }
 
-    inline Client::DBus::PropertiesInterface *propertiesInterface() const
-    {
-        return optionalInterface<Client::DBus::PropertiesInterface>(BypassInterfaceCheck);
-    }
-
     template <class Interface>
     inline Interface *typeInterface(
             InterfaceSupportedChecking check = CheckInterfaceSupported) const
@@ -254,6 +228,25 @@ public:
         return typeInterface<Client::ChannelTypeTubesInterface>(check);
     }
 
+Q_SIGNALS:
+    void groupFlagsChanged(uint flags, uint added, uint removed);
+
+    void groupCanAddContactsChanged(bool canAddContacts);
+    void groupCanRemoveContactsChanged(bool canRemoveContacts);
+    void groupCanRescindContactsChanged(bool canRescindContacts);
+
+    void groupMembersChanged(
+            const Tp::Contacts &groupMembersAdded,
+            const Tp::Contacts &groupLocalPendingMembersAdded,
+            const Tp::Contacts &groupRemotePendingMembersAdded,
+            const Tp::Contacts &groupMembersRemoved,
+            const Tp::Channel::GroupMemberChangeDetails &details);
+
+    void groupHandleOwnersChanged(const Tp::HandleOwnerMap &owners,
+            const Tp::UIntList &added, const Tp::UIntList &removed);
+
+    void groupSelfContactChanged();
+
 protected:
     Channel(const ConnectionPtr &connection,const QString &objectPath,
             const QVariantMap &immutableProperties);
@@ -266,6 +259,11 @@ protected:
         return optionalInterface<Client::ChannelInterfaceGroupInterface>(check);
     }
 
+    bool groupSelfHandleIsLocalPending() const;
+
+protected Q_SLOTS:
+    PendingOperation *groupAddSelfHandle();
+
 private Q_SLOTS:
     void gotMainProperties(QDBusPendingCallWatcher *watcher);
     void gotChannelType(QDBusPendingCallWatcher *watcher);
-- 
1.5.6.5