- disabled gui for a moment

[enigma2.git] / lib / base / smartptr.h

diff --git a/lib/base/smartptr.h b/lib/base/smartptr.h
index 029fd1dc721cd041a1dbfa511ee357f3d6a6d562..aafecf0eacfc169e8fe8c8872c9ea138023bcad5 100644 (file)
--- a/lib/base/smartptr.h
+++ b/lib/base/smartptr.h
@@ -7,6 +7,22 @@
 template<class T>
 class ePtr
 {
+               /* read doc/iObject about the ePtrHelper */
+       template<class T1>
+       class ePtrHelper
+       {
+               T1 *m_obj;
+       public:
+               inline ePtrHelper(T1 *obj): m_obj(obj)
+               {
+                       m_obj->AddRef();
+               }
+               inline ~ePtrHelper()
+               {
+                       m_obj->Release();
+               }
+               inline T1* operator->() { return m_obj; }
+       };
 protected:
        T *ptr;
 public:
@@ -27,21 +43,21 @@ public:
        }
        ePtr &operator=(T *c)
        {
+               if (c)
+                       c->AddRef();
                if (ptr)
                        ptr->Release();
                ptr=c;
-               if (ptr)
-                       ptr->AddRef();
                return *this;
        }
        
        ePtr &operator=(ePtr<T> &c)
        {
+               if (c.ptr)
+                       c.ptr->AddRef();
                if (ptr)
                        ptr->Release();
                ptr=c.ptr;
-               if (ptr)
-                       ptr->AddRef();
                return *this;
        }
        
@@ -50,8 +66,15 @@ public:
                if (ptr)
                        ptr->Release();
        }
+       
+       T* grabRef() { if (!ptr) return 0; ptr->AddRef(); return ptr; }
        T* &ptrref() { assert(!ptr); return ptr; }
-       T* operator->() { assert(ptr); return ptr; }
+       ePtrHelper<T> operator->() { assert(ptr); return ePtrHelper<T>(ptr); }
+
+                       /* for const objects, we don't need the helper, as they can't */
+                       /* be changed outside the program flow. at least this is */
+                       /* what the compiler assumes, so in case you're using const */
+                       /* ePtrs note that they have to be const. */
        const T* operator->() const { assert(ptr); return ptr; }
        operator T*() const { return this->ptr; }
 };