Move the definition of Input's operator bool to the header

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

diff --git a/source/builtinsource.h b/source/builtinsource.h
index ec5396334d65282fb2065a069b72e946a52683c0..5224286e600e370567f472997d19802ad1e8e86c 100644 (file)
--- a/source/builtinsource.h
+++ b/source/builtinsource.h
@@ -2,32 +2,33 @@
 #define MSP_DATAFILE_BUILTINSOURCE_H_
 
 #include "collectionsource.h"
+#include "mspdatafile_api.h"
 
 namespace Msp {
 namespace DataFile {
 
-class BuiltinSource: public CollectionSource
+class MSPDATAFILE_API BuiltinSource: public CollectionSource
 {
 private:
        struct Object
        {
-               const char *data;
-               unsigned size;
+               const char *data = nullptr;
+               std::size_t size = 0;
 
-               Object();
-               Object(const char *, unsigned);
+               Object() = default;
+               Object(const char *, std::size_t);
        };
 
        std::map<std::string, Object> objects;
 
 public:
-       void add_object(const std::string &, const char *, unsigned);
+       void add_object(const std::string &, const char *, std::size_t);
        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