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

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

diff --git a/TelepathyQt4/manager-file.h b/TelepathyQt4/manager-file.h
index ed65a5b..124594c 100644
--- a/TelepathyQt4/manager-file.h
+++ b/TelepathyQt4/manager-file.h
@@ -37,6 +37,8 @@ namespace Tp
 
 class ManagerFile
 {
+    Q_DISABLE_COPY(ManagerFile);
+
 public:
     ManagerFile(const QString &cmName);
     ~ManagerFile();
@@ -50,9 +52,8 @@ public:
     static QVariant::Type variantTypeFromDBusSignature(const QString &signature);
 
 private:
-    Q_DISABLE_COPY(ManagerFile);
-
     struct Private;
+    friend struct Private;
     Private *mPriv;
 };
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list