Use the override specifier to mark overridden virtual functions

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

diff --git a/source/builtinsource.h b/source/builtinsource.h
index 244191c3e6a728b8dab42d2a97b2264635113007..827850892383c6229c86de13ad068f4c2c6744ac 100644 (file)
--- a/source/builtinsource.h
+++ b/source/builtinsource.h
@@ -11,25 +11,23 @@ class BuiltinSource: public CollectionSource
 private:
        struct Object
        {
-               const char *data;
-               unsigned size;
+               const char *data = nullptr;
+               unsigned size = 0;
 
-               Object();
+               Object() = default;
                Object(const char *, unsigned);
        };
 
-       typedef std::map<std::string, Object> ObjectMap;
-
-       ObjectMap objects;
+       std::map<std::string, Object> objects;
 
 public:
        void add_object(const std::string &, const char *, unsigned);
        void add_object(const std::string &, const char *);
 
-       virtual bool is_loadable(const CollectionItemTypeBase &, const std::string &) const;
-       virtual NameList get_names(const CollectionItemTypeBase &) const;
-       virtual void load(Collection &, const CollectionItemTypeBase &, const std::string &) const;
-       virtual IO::Seekable *open(const std::string &) const;
+       bool is_loadable(const CollectionItemTypeBase &, const std::string &) const override;
+       NameList get_names(const CollectionItemTypeBase &) const override;
+       void load(Collection &, const CollectionItemTypeBase &, const std::string &) const override;
+       IO::Seekable *open(const std::string &) const override;
 };
 
 } // namespace DataFile