added

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

diff --git a/lib/base/smartptr.h b/lib/base/smartptr.h
index 029fd1dc721cd041a1dbfa511ee357f3d6a6d562..159eeb2c0122ff43fa16786fb7dd787c20eaeb62 100644 (file)
--- a/lib/base/smartptr.h
+++ b/lib/base/smartptr.h
@@ -4,6 +4,14 @@
 #include "object.h"
 #include <stdio.h>
 
 #include "object.h"
 #include <stdio.h>
 

+#ifdef SWIG
+#define TEMPLATE_TYPEDEF(x, y) \
+%template(y) x; \
+typedef x y
+#else
+#define TEMPLATE_TYPEDEF(x, y) typedef x y
+#endif
+

 template<class T>
 class ePtr
 {
 template<class T>
 class ePtr
 {


@@ -27,21 +35,21 @@ public:
        }
        ePtr &operator=(T *c)
        {
        }
        ePtr &operator=(T *c)
        {

+               if (c)
+                       c->AddRef();

                if (ptr)
                        ptr->Release();
                ptr=c;
                if (ptr)
                        ptr->Release();
                ptr=c;

-               if (ptr)
-                       ptr->AddRef();

                return *this;
        }
        
        ePtr &operator=(ePtr<T> &c)
        {
                return *this;
        }
        
        ePtr &operator=(ePtr<T> &c)
        {

+               if (c.ptr)
+                       c.ptr->AddRef();

                if (ptr)
                        ptr->Release();
                ptr=c.ptr;
                if (ptr)
                        ptr->Release();
                ptr=c.ptr;

-               if (ptr)
-                       ptr->AddRef();

                return *this;
        }
        
                return *this;
        }
        


@@ -50,11 +58,65 @@ public:
                if (ptr)
                        ptr->Release();
        }
                if (ptr)
                        ptr->Release();
        }

+       
+       T* grabRef() { if (!ptr) return 0; ptr->AddRef(); return ptr; }

        T* &ptrref() { assert(!ptr); return ptr; }
        T* &ptrref() { assert(!ptr); return ptr; }

-       T* operator->() { assert(ptr); return ptr; }
-       const T* operator->() const { assert(ptr); return ptr; }
+       T* operator->() const { assert(ptr); return ptr; }

        operator T*() const { return this->ptr; }
 };
 
 
        operator T*() const { return this->ptr; }
 };
 
 

+
+#ifndef SWIG
+template<class T>
+class eMutablePtr: public ePtr<T>
+{
+               /* 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:
+       eMutablePtr(): ePtr<T>(0)
+       {
+       }
+       
+       eMutablePtr(T *c): ePtr<T>(c)
+       {
+       }
+
+       eMutablePtr(const eMutablePtr &c): ePtr<T>(c)
+       {
+       }
+       
+       eMutablePtr &operator=(T *c)
+       {
+               ePtr<T>::operator=(c);
+               return *this;
+       }
+       
+       
+       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 */
+                       /* eMutablePtrs note that they have to be const. */
+       const T* operator->() const { assert(ptr); return ptr; }
+};
+#endif
+

 #endif
 #endif