Use the override specifier to mark overridden virtual functions

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

diff --git a/source/dynamicobjectloader.h b/source/dynamicobjectloader.h
index c83d91407f4312520911807d67145cfb63a54282..687dacaf5363cf74b179a486c017731ae4976451 100644 (file)
--- a/source/dynamicobjectloader.h
+++ b/source/dynamicobjectloader.h
@@ -2,6 +2,7 @@
 #define MSP_DATAFILE_DYNAMICOBJECTLOADER_H_
 
 #include <msp/core/typeregistry.h>
+#include "collection.h"
 #include "except.h"
 #include "loader.h"
 
@@ -29,10 +30,11 @@ protected:
 
        typedef Msp::TypeRegistry<CreateObject, DynamicObjectLoader &> TypeRegistry;
 
-       Collection *coll;
+       Collection *coll = nullptr;
+       T *object = nullptr;
 private:
-       T *object;
-       Loader *obj_loader;
+       Loader *obj_loader = nullptr;
+       void (*store_func)(Collection &, const std::string &, T *) = nullptr;
 
        static ActionMap shared_actions;
 
@@ -41,12 +43,17 @@ protected:
 public:
        ~DynamicObjectLoader() { delete object; delete obj_loader; }
 
-       T *get_object() { T *o = object; object = 0; return o; }
 private:
-       virtual void init_actions();
+       void init_actions() override;
+
+public:
+       T *get_object() { T *o = object; object = 0; return o; }
+       T *store_object(Collection &, const std::string &);
 
-       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;
 
@@ -63,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);
 }
@@ -76,6 +81,18 @@ void DynamicObjectLoader<T, C>::init_actions()
        add("type", &DynamicObjectLoader::type);
 }
 
+template<typename T, typename C>
+T *DynamicObjectLoader<T, C>::store_object(Collection &c, const std::string &name)
+{
+       if(!store_func)
+               throw std::logic_error("no store function");
+
+       T *o = object;
+       store_func(c, name, object);
+       object = 0;
+       return o;
+}
+
 template<typename T, typename C>
 void DynamicObjectLoader<T, C>::type(const Symbol &t)
 {
@@ -110,6 +127,7 @@ void DynamicObjectLoader<T, C>::CreateObject<U>::operator()(const std::string &,
        ldr.object = obj;
        ldr.obj_loader = ldr.create_object_loader<U>(*obj);
        ldr.add_auxiliary_loader(*ldr.obj_loader);
+       ldr.store_func = [](Collection &c, const std::string &n, T *o){ c.add(n, static_cast<U *>(o)); };
 }
 
 } // namespace DataFile