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

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

diff --git a/TelepathyQt4/message.h b/TelepathyQt4/message.h
index 75d0300..180746f 100644
--- a/TelepathyQt4/message.h
+++ b/TelepathyQt4/message.h
@@ -43,7 +43,6 @@ class TextChannel;
 class Message
 {
 public:
-
     Message(ChannelTextMessageType, const QString &);
     Message(const Message &other);
     ~Message();
@@ -88,7 +87,8 @@ private:
     Message(const MessagePartList &parts);
     Message(uint, uint, const QString &);
 
-    class Private;
+    struct Private;
+    friend struct Private;
     QSharedDataPointer<Private> mPriv;
 };
 
@@ -108,9 +108,11 @@ public:
 
 private:
     friend class TextChannel;
+
     ReceivedMessage(const MessagePartList &parts,
             const TextChannelPtr &channel);
     ReceivedMessage();
+
     uint senderHandle() const;
     uint pendingId() const;
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list