Use nullptr instead of 0 for pointers

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

diff --git a/source/dynamicobjectloader.h b/source/dynamicobjectloader.h
index e29633d7b6724ab7bc39071a39938887e851dcf3..ee1827bbd067f10e32123bde3e484743e64d0495 100644 (file)
--- a/source/dynamicobjectloader.h
+++ b/source/dynamicobjectloader.h
@@ -31,8 +31,8 @@ protected:
        typedef Msp::TypeRegistry<CreateObject, DynamicObjectLoader &> TypeRegistry;
 
        Collection *coll;
-private:
        T *object;
+private:
        Loader *obj_loader;
        std::function<void(Collection &, const std::string &, T *)> store_func;
 
@@ -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;
 
@@ -70,8 +71,8 @@ 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)
+       object(nullptr),
+       obj_loader(nullptr)
 {
        set_actions(shared_actions);
 }