X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdynamicobjectloader.h;h=687dacaf5363cf74b179a486c017731ae4976451;hb=HEAD;hp=ee1827bbd067f10e32123bde3e484743e64d0495;hpb=daca21051927eabee098e422fe5a0990acacfb96;p=libs%2Fdatafile.git

diff --git a/source/dynamicobjectloader.h b/source/dynamicobjectloader.h
index ee1827b..687daca 100644
--- a/source/dynamicobjectloader.h
+++ b/source/dynamicobjectloader.h
@@ -30,11 +30,11 @@ protected:
 
 	typedef Msp::TypeRegistry<CreateObject, DynamicObjectLoader &> TypeRegistry;
 
-	Collection *coll;
-	T *object;
+	Collection *coll = nullptr;
+	T *object = nullptr;
 private:
-	Loader *obj_loader;
-	std::function<void(Collection &, const std::string &, T *)> store_func;
+	Loader *obj_loader = nullptr;
+	void (*store_func)(Collection &, const std::string &, T *) = nullptr;
 
 	static ActionMap shared_actions;
 
@@ -44,7 +44,7 @@ public:
 	~DynamicObjectLoader() { delete object; delete obj_loader; }
 
 private:
-	virtual void init_actions();
+	void init_actions() override;
 
 public:
 	T *get_object() { T *o = object; object = 0; return o; }
@@ -70,9 +70,7 @@ Loader::ActionMap DynamicObjectLoader<T, C>::shared_actions;
 
 template<typename T, typename C>
 DynamicObjectLoader<T, C>::DynamicObjectLoader(Collection *c):
-	coll(c),
-	object(nullptr),
-	obj_loader(nullptr)
+	coll(c)
 {
 	set_actions(shared_actions);
 }