[Telepathy-commits] [telepathy-qt4/master] ReadyObject: Do not inherit QSharedData.

[Andre Moreira Magalhaes (andrunko)]

Make ReadyObject do not inherit QSharedData and do it in the classes itself.
---
 TelepathyQt4/Client/account-manager.h    |    5 ++++-
 TelepathyQt4/Client/account.h            |    5 ++++-
 TelepathyQt4/Client/channel.h            |    7 ++++---
 TelepathyQt4/Client/connection-manager.h |    5 ++++-
 TelepathyQt4/Client/connection.h         |    5 ++++-
 TelepathyQt4/Client/ready-object.h       |    4 +---
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/TelepathyQt4/Client/account-manager.h b/TelepathyQt4/Client/account-manager.h
index eec694a..57ee90e 100644
--- a/TelepathyQt4/Client/account-manager.h
+++ b/TelepathyQt4/Client/account-manager.h
@@ -36,7 +36,9 @@
 #include <TelepathyQt4/Client/ReadyObject>
 
 #include <QDBusObjectPath>
+#include <QExplicitlySharedDataPointer>
 #include <QSet>
+#include <QSharedData>
 #include <QString>
 #include <QVariantMap>
 
@@ -51,7 +53,8 @@ class PendingReady;
 
 class AccountManager : public StatelessDBusProxy,
                        private OptionalInterfaceFactory<AccountManager>,
-                       public ReadyObject
+                       public ReadyObject,
+                       public QSharedData
 {
     Q_OBJECT
     Q_DISABLE_COPY(AccountManager)
diff --git a/TelepathyQt4/Client/account.h b/TelepathyQt4/Client/account.h
index 625c381..57b0370 100644
--- a/TelepathyQt4/Client/account.h
+++ b/TelepathyQt4/Client/account.h
@@ -38,6 +38,7 @@
 
 #include <QExplicitlySharedDataPointer>
 #include <QSet>
+#include <QSharedData>
 #include <QString>
 #include <QStringList>
 #include <QVariantMap>
@@ -57,7 +58,9 @@ class ProtocolInfo;
 
 class Account : public StatelessDBusProxy,
                 private OptionalInterfaceFactory<Account>,
-                public ReadyObject
+                public ReadyObject,
+                public QSharedData
+
 {
     Q_OBJECT
     Q_DISABLE_COPY(Account)
diff --git a/TelepathyQt4/Client/channel.h b/TelepathyQt4/Client/channel.h
index 709c404..012167b 100644
--- a/TelepathyQt4/Client/channel.h
+++ b/TelepathyQt4/Client/channel.h
@@ -36,11 +36,11 @@
 #include <TelepathyQt4/Client/ReadinessHelper>
 #include <TelepathyQt4/Client/ReadyObject>
 
+#include <QExplicitlySharedDataPointer>
 #include <QSet>
+#include <QSharedData>
 #include <QVariantMap>
 
-class QDBusPendingCallWatcher;
-
 namespace Telepathy
 {
 namespace Client
@@ -52,7 +52,8 @@ class PendingReady;
 
 class Channel : public StatefulDBusProxy,
                 private OptionalInterfaceFactory<Channel>,
-                public ReadyObject
+                public ReadyObject,
+                public QSharedData
 {
     Q_OBJECT
     Q_DISABLE_COPY(Channel)
diff --git a/TelepathyQt4/Client/connection-manager.h b/TelepathyQt4/Client/connection-manager.h
index eaae440..a6b272a 100644
--- a/TelepathyQt4/Client/connection-manager.h
+++ b/TelepathyQt4/Client/connection-manager.h
@@ -35,7 +35,9 @@
 #include <TelepathyQt4/Client/ReadyObject>
 #include <TelepathyQt4/Constants>
 
+#include <QExplicitlySharedDataPointer>
 #include <QSet>
+#include <QSharedData>
 
 namespace Telepathy
 {
@@ -118,7 +120,8 @@ private:
 
 class ConnectionManager : public StatelessDBusProxy,
                           private OptionalInterfaceFactory<ConnectionManager>,
-                          public ReadyObject
+                          public ReadyObject,
+                          public QSharedData
 {
     Q_OBJECT
 
diff --git a/TelepathyQt4/Client/connection.h b/TelepathyQt4/Client/connection.h
index 1fb9f55..bb53b01 100644
--- a/TelepathyQt4/Client/connection.h
+++ b/TelepathyQt4/Client/connection.h
@@ -38,7 +38,9 @@
 #include <TelepathyQt4/Constants>
 #include <TelepathyQt4/Types>
 
+#include <QExplicitlySharedDataPointer>
 #include <QSet>
+#include <QSharedData>
 #include <QString>
 #include <QStringList>
 
@@ -58,7 +60,8 @@ class PendingReady;
 
 class Connection : public StatefulDBusProxy,
                    private OptionalInterfaceFactory<Connection>,
-                   public ReadyObject
+                   public ReadyObject,
+                   public QSharedData
 {
     Q_OBJECT
     Q_DISABLE_COPY(Connection)
diff --git a/TelepathyQt4/Client/ready-object.h b/TelepathyQt4/Client/ready-object.h
index 0c20d01..c8e8349 100644
--- a/TelepathyQt4/Client/ready-object.h
+++ b/TelepathyQt4/Client/ready-object.h
@@ -28,8 +28,6 @@
 
 #include <TelepathyQt4/Client/Feature>
 
-#include <QSharedData>
-
 namespace Telepathy
 {
 namespace Client
@@ -39,7 +37,7 @@ class DBusProxy;
 class PendingReady;
 class ReadinessHelper;
 
-class ReadyObject : public QSharedData
+class ReadyObject
 {
     Q_DISABLE_COPY(ReadyObject)
 
-- 
1.5.6.5