X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..HEAD:/lib/base/init.h?ds=sidebyside

diff --git a/lib/base/init.h b/lib/base/init.h
index 465bac40..4b40bea0 100644
--- a/lib/base/init.h
+++ b/lib/base/init.h
@@ -3,6 +3,7 @@
 
 #include <list>
 #include <utility>
+#include <lib/base/object.h>
 
 class eAutoInit;
 
@@ -26,9 +27,9 @@ class eAutoInit
 	virtual void closeNow()=0;
 protected:
 	int rl;
-	char *description;
+	const char *description;
 public:
-	eAutoInit(int rl, char *description): rl(rl), description(description)
+	eAutoInit(int rl, const char *description): rl(rl), description(description)
 	{
 	}
 	virtual ~eAutoInit();
@@ -53,7 +54,7 @@ public:
 	{
 		return t;
 	}
-	eAutoInitP1(const T2 &arg, int runl, char *description): eAutoInit(runl, description), arg(arg)
+	eAutoInitP1(const T2 &arg, int runl, const char *description): eAutoInit(runl, description), arg(arg)
 	{
 		eInit::add(rl, this);
 	}
@@ -84,7 +85,7 @@ public:
 	{
 		return t;
 	}
-	eAutoInitP0(int runl, char *description): eAutoInit(runl, description)
+	eAutoInitP0(int runl, const char *description): eAutoInit(runl, description)
 	{
 		eInit::add(rl, this);
 	}
@@ -94,4 +95,35 @@ public:
 	}
 };
 
+template<class T1> class
+eAutoInitPtr: protected eAutoInit
+{
+	ePtr<T1> t;
+	void initNow()
+	{
+		t = new T1();
+	}
+	void closeNow()
+	{
+		t = 0;
+	}
+public:
+	operator T1*()
+	{
+		return t;
+	}
+	T1 *operator->()
+	{
+		return t;
+	}
+	eAutoInitPtr(int runl, const char *description): eAutoInit(runl, description)
+	{
+		eInit::add(rl, this);
+	}
+	~eAutoInitPtr()
+	{
+		eInit::remove(rl, this);
+	}
+};
+
 #endif