[telepathy-qt4/master] shared-ptr: Renamed SharedData to RefCounted.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Tue Apr 7 07:06:23 PDT 2009


---
 TelepathyQt4/Client/account-manager.h        |    2 +-
 TelepathyQt4/Client/account.h                |    2 +-
 TelepathyQt4/Client/channel.h                |    2 +-
 TelepathyQt4/Client/connection-manager.h     |    2 +-
 TelepathyQt4/Client/connection.h             |    2 +-
 TelepathyQt4/Client/streamed-media-channel.h |    2 +-
 TelepathyQt4/shared-ptr.h                    |   14 +++++++-------
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/TelepathyQt4/Client/account-manager.h b/TelepathyQt4/Client/account-manager.h
index b961c92..4e3e2ea 100644
--- a/TelepathyQt4/Client/account-manager.h
+++ b/TelepathyQt4/Client/account-manager.h
@@ -54,7 +54,7 @@ class PendingReady;
 class AccountManager : public StatelessDBusProxy,
                        private OptionalInterfaceFactory<AccountManager>,
                        public ReadyObject,
-                       public SharedData
+                       public RefCounted
 {
     Q_OBJECT
     Q_DISABLE_COPY(AccountManager)
diff --git a/TelepathyQt4/Client/account.h b/TelepathyQt4/Client/account.h
index 6d0bc98..7390c5d 100644
--- a/TelepathyQt4/Client/account.h
+++ b/TelepathyQt4/Client/account.h
@@ -58,7 +58,7 @@ class ProtocolInfo;
 class Account : public StatelessDBusProxy,
                 private OptionalInterfaceFactory<Account>,
                 public ReadyObject,
-                public SharedData
+                public RefCounted
 
 {
     Q_OBJECT
diff --git a/TelepathyQt4/Client/channel.h b/TelepathyQt4/Client/channel.h
index 6793536..77c75e8 100644
--- a/TelepathyQt4/Client/channel.h
+++ b/TelepathyQt4/Client/channel.h
@@ -53,7 +53,7 @@ class PendingReady;
 class Channel : public StatefulDBusProxy,
                 private OptionalInterfaceFactory<Channel>,
                 public ReadyObject,
-                public SharedData
+                public RefCounted
 {
     Q_OBJECT
     Q_DISABLE_COPY(Channel)
diff --git a/TelepathyQt4/Client/connection-manager.h b/TelepathyQt4/Client/connection-manager.h
index 1826e43..80801f9 100644
--- a/TelepathyQt4/Client/connection-manager.h
+++ b/TelepathyQt4/Client/connection-manager.h
@@ -121,7 +121,7 @@ private:
 class ConnectionManager : public StatelessDBusProxy,
                           private OptionalInterfaceFactory<ConnectionManager>,
                           public ReadyObject,
-                          public SharedData
+                          public RefCounted
 {
     Q_OBJECT
 
diff --git a/TelepathyQt4/Client/connection.h b/TelepathyQt4/Client/connection.h
index 5514010..3c3ce06 100644
--- a/TelepathyQt4/Client/connection.h
+++ b/TelepathyQt4/Client/connection.h
@@ -61,7 +61,7 @@ class PendingReady;
 class Connection : public StatefulDBusProxy,
                    private OptionalInterfaceFactory<Connection>,
                    public ReadyObject,
-                   public SharedData
+                   public RefCounted
 {
     Q_OBJECT
     Q_DISABLE_COPY(Connection)
diff --git a/TelepathyQt4/Client/streamed-media-channel.h b/TelepathyQt4/Client/streamed-media-channel.h
index 923fbb6..a444a37 100644
--- a/TelepathyQt4/Client/streamed-media-channel.h
+++ b/TelepathyQt4/Client/streamed-media-channel.h
@@ -68,7 +68,7 @@ private:
 
 class MediaStream : public QObject,
                     private ReadyObject,
-                    public SharedData
+                    public RefCounted
 {
     Q_OBJECT
     Q_DISABLE_COPY(MediaStream)
diff --git a/TelepathyQt4/shared-ptr.h b/TelepathyQt4/shared-ptr.h
index 0ef2b91..bc37aa0 100644
--- a/TelepathyQt4/shared-ptr.h
+++ b/TelepathyQt4/shared-ptr.h
@@ -31,7 +31,7 @@
 namespace Telepathy
 {
 
-class SharedData;
+class RefCounted;
 class WeakData;
 template <class T> class SharedPtr;
 template <class T> class WeakPtr;
@@ -41,19 +41,19 @@ class WeakData
     Q_DISABLE_COPY(WeakData)
 
 public:
-    WeakData(SharedData *d) : d(d), weakref(0) { }
+    WeakData(RefCounted *d) : d(d), weakref(0) { }
 
-    SharedData *d;
+    RefCounted *d;
     mutable QAtomicInt weakref;
 };
 
-class SharedData
+class RefCounted
 {
-    Q_DISABLE_COPY(SharedData)
+    Q_DISABLE_COPY(RefCounted)
 
 public:
-    inline SharedData() : strongref(0), wd(0) { }
-    inline virtual ~SharedData() { if (wd) { wd->d = 0; } }
+    inline RefCounted() : strongref(0), wd(0) { }
+    inline virtual ~RefCounted() { if (wd) { wd->d = 0; } }
 
     inline void ref() { strongref.ref(); }
     inline bool deref() { return strongref.deref(); }
-- 
1.5.6.5




More information about the telepathy-commits mailing list