Use variadic templates and forwarding references for better flexibility

[libs/datafile.git] / source / dynamicobjectloader.h

diff --git a/source/dynamicobjectloader.h b/source/dynamicobjectloader.h
index e29633d7b6724ab7bc39071a39938887e851dcf3..be4bf8af79a93b75b95df4ec8d928cf5fa410b03 100644 (file)
--- a/source/dynamicobjectloader.h
+++ b/source/dynamicobjectloader.h
@@ -30,11 +30,11 @@ protected:
 
        typedef Msp::TypeRegistry<CreateObject, DynamicObjectLoader &> TypeRegistry;
 
-       Collection *coll;
+       Collection *coll = nullptr;
+       T *object = nullptr;
 private:
-       T *object;
-       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;
 
@@ -50,9 +50,10 @@ public:
        T *get_object() { T *o = object; object = 0; return o; }
        T *store_object(Collection &, const std::string &);
 
-private:
-       void type(const Symbol &);
+protected:
+       virtual void type(const Symbol &);
 
+private:
        template<typename U>
        typename std::enable_if<NeedsCollection<typename U::Loader>::value, typename U::Loader *>::type create_object_loader(U &obj) const;
 
@@ -69,9 +70,7 @@ Loader::ActionMap DynamicObjectLoader<T, C>::shared_actions;
 
 template<typename T, typename C>
 DynamicObjectLoader<T, C>::DynamicObjectLoader(Collection *c):
-       coll(c),
-       object(0),
-       obj_loader(0)
+       coll(c)
 {
        set_actions(shared_actions);
 }