[telepathy-qt4/master] PendingContacts: Standardize class definition.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Mon Jun 29 08:36:54 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/pending-contacts.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/TelepathyQt4/pending-contacts.h b/TelepathyQt4/pending-contacts.h
index b4adc34..fec6bd6 100644
--- a/TelepathyQt4/pending-contacts.h
+++ b/TelepathyQt4/pending-contacts.h
@@ -45,6 +45,7 @@ class ContactManager;
class PendingContacts : public PendingOperation
{
Q_OBJECT
+ Q_DISABLE_COPY(PendingContacts);
public:
~PendingContacts();
@@ -74,7 +75,7 @@ private Q_SLOTS:
void onInspectHandlesFinished(QDBusPendingCallWatcher *);
private:
- Q_DISABLE_COPY(PendingContacts);
+ friend class ContactManager;
PendingContacts(ContactManager *manager, const UIntList &handles,
const QSet<Contact::Feature> &features,
@@ -90,7 +91,6 @@ private:
struct Private;
friend struct Private;
- friend class ContactManager;
Private *mPriv;
};
--
1.5.6.5
More information about the telepathy-commits
mailing list