Use default member initializers for constant initial values

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

diff --git a/source/dynamicobjectloader.h b/source/dynamicobjectloader.h
index 9706c957e7403eba40960e016d79dec1171fb8ac..be4bf8af79a93b75b95df4ec8d928cf5fa410b03 100644 (file)
--- 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;
-       void (*store_func)(Collection &, const std::string &, T *);
+       Loader *obj_loader = nullptr;
+       void (*store_func)(Collection &, const std::string &, T *) = nullptr;
 
        static ActionMap shared_actions;
 
@@ -70,10 +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),
-       store_func(nullptr)
+       coll(c)
 {
        set_actions(shared_actions);
 }