[telepathy-qt4/master] DBusProxy: Standardize class definition.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Mon Jun 29 08:34:04 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/dbus-proxy.h | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/TelepathyQt4/dbus-proxy.h b/TelepathyQt4/dbus-proxy.h
index 458c1d8..8a775cc 100644
--- a/TelepathyQt4/dbus-proxy.h
+++ b/TelepathyQt4/dbus-proxy.h
@@ -52,15 +52,15 @@ public:
QString invalidationReason() const;
QString invalidationMessage() const;
+Q_SIGNALS:
+ void invalidated(Tp::DBusProxy *proxy,
+ const QString &errorName, const QString &errorMessage);
+
protected:
void setBusName(const QString &busName);
void invalidate(const QString &reason, const QString &message);
void invalidate(const QDBusError &error);
-Q_SIGNALS:
- void invalidated(Tp::DBusProxy *proxy,
- const QString &errorName, const QString &errorMessage);
-
private Q_SLOTS:
void emitInvalidated();
@@ -73,6 +73,7 @@ private:
class StatelessDBusProxy : public DBusProxy
{
Q_OBJECT
+ Q_DISABLE_COPY(StatelessDBusProxy)
public:
StatelessDBusProxy(const QDBusConnection &dbusConnection,
@@ -90,6 +91,7 @@ private:
class StatefulDBusProxy : public DBusProxy
{
Q_OBJECT
+ Q_DISABLE_COPY(StatefulDBusProxy)
public:
StatefulDBusProxy(const QDBusConnection &dbusConnection,
--
1.5.6.5
More information about the telepathy-commits
mailing list