Cosmetic changes

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

diff --git a/source/collection.h b/source/collection.h
index 4a2f736de49cdabc4df1c9da4ce4ee96cda4753e..c8470dd29a50acd6bcfcee5e51c561b729cbb705 100644 (file)
--- a/source/collection.h
+++ b/source/collection.h
@@ -89,10 +89,9 @@ private:
        std::vector<CollectionItemTypeBase *> types;
        ItemMap items;
        std::vector<const CollectionSource *> sources;
-       Collection *fallback;
+       Collection *fallback = nullptr;
 
 public:
-       Collection();
        virtual ~Collection();
 
        /** Adds an object into the collection.  The name must not pre-exist.  The
@@ -335,7 +334,7 @@ class CollectionItemTypeBase
 protected:
        struct ExtractorBase
        {
-               virtual ~ExtractorBase() { }
+               virtual ~ExtractorBase() = default;
        };
 
        template<typename T>
@@ -348,7 +347,7 @@ protected:
        std::vector<std::string> suffixes;
        std::vector<ExtractorBase *> extractors;
 
-       CollectionItemTypeBase() { }
+       CollectionItemTypeBase() = default;
 public:
        virtual ~CollectionItemTypeBase();
 
@@ -397,7 +396,7 @@ private:
        template<typename B>
        struct Extractor: CollectionItemTypeBase::Extractor<B>
        {
-               virtual B &extract(const Variant &var) const
+               B &extract(const Variant &var) const override
                { return *var.value<RefPtr<T> >(); }
        };
 
@@ -452,19 +451,19 @@ public:
                return *this;
        }
 
-       virtual bool is_same_type(const CollectionItemTypeBase &other) const
+       bool is_same_type(const CollectionItemTypeBase &other) const override
        { return dynamic_cast<const CollectionItemType<T> *>(&other); }
 
-       virtual bool check_item_type(const Variant &var) const
+       bool check_item_type(const Variant &var) const override
        { return var.check_type<RefPtr<T> >(); }
 
-       virtual void add_to_loader(Collection::Loader &) const
+       void add_to_loader(Collection::Loader &) const override
        { }
 
-       virtual bool can_create() const
+       bool can_create() const override
        { return static_cast<bool>(create_func); }
 
-       virtual void create_item(Collection &coll, const std::string &name) const
+       void create_item(Collection &coll, const std::string &name) const override
        {
                if(!create_func)
                        throw std::runtime_error("no creator");
@@ -473,12 +472,12 @@ public:
                        coll.add(name, obj);
        }
 
-       virtual void load_item(Collection &, Parser &, const std::string &) const
+       void load_item(Collection &, Parser &, const std::string &) const override
        {
                throw std::runtime_error("this type cannot be loaded");
        }
 
-       virtual void notify_item(const std::string &name, const Variant &var) const
+       void notify_item(const std::string &name, const Variant &var) const override
        {
                RefPtr<T> obj = var.value<RefPtr<T> >();
                for(const auto &n: notify_funcs)
@@ -491,10 +490,10 @@ template<typename T>
 class LoadableCollectionItemType: public CollectionItemType<T>
 {
 public:
-       virtual void add_to_loader(Collection::Loader &loader) const
+       void add_to_loader(Collection::Loader &loader) const override
        { loader.add(this->kwd, &Collection::Loader::item<T, T>); }
 
-       virtual void load_item(Collection &coll, Parser &parser, const std::string &name) const
+       void load_item(Collection &coll, Parser &parser, const std::string &name) const override
        {
                RefPtr<T> obj = new T;
                Collection::ItemLoader<T> ldr(*obj, coll);