Cosmetic changes

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

diff --git a/source/builtinsource.cpp b/source/builtinsource.cpp
index bdccd7741c5a7f250585c6058c47d7ee066c9aad..5645467bbb682075d9dc840fca094a797dfa29b0 100644 (file)
--- a/source/builtinsource.cpp
+++ b/source/builtinsource.cpp
@@ -8,7 +8,7 @@ using namespace std;
 namespace Msp {
 namespace DataFile {
 
-void BuiltinSource::add_object(const string &name, const char *content, unsigned size)
+void BuiltinSource::add_object(const string &name, const char *content, size_t size)
 {
        objects[name] = Object(content, size);
 }
@@ -26,15 +26,15 @@ bool BuiltinSource::is_loadable(const CollectionItemTypeBase &, const string &na
 CollectionSource::NameList BuiltinSource::get_names(const CollectionItemTypeBase &type) const
 {
        NameList names;
-       for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-               if(type.match_name(i->first))
-                       names.push_back(i->first);
+       for(const auto &kvp: objects)
+               if(type.match_name(kvp.first))
+                       names.push_back(kvp.first);
        return names;
 }
 
 void BuiltinSource::load(Collection &coll, const CollectionItemTypeBase &type, const string &name) const
 {
-       ObjectMap::const_iterator i = objects.find(name);
+       auto i = objects.find(name);
        if(i!=objects.end())
        {
                IO::Memory in(i->second.data, i->second.size);
@@ -45,20 +45,15 @@ void BuiltinSource::load(Collection &coll, const CollectionItemTypeBase &type, c
 
 IO::Seekable *BuiltinSource::open(const string &name) const
 {
-       ObjectMap::const_iterator i = objects.find(name);
+       auto i = objects.find(name);
        if(i!=objects.end())
                return new IO::Memory(i->second.data, i->second.size);
 
-       return 0;
+       return nullptr;
 }
 
 
-BuiltinSource::Object::Object():
-       data(0),
-       size(0)
-{ }
-
-BuiltinSource::Object::Object(const char *d, unsigned s):
+BuiltinSource::Object::Object(const char *d, size_t s):
        data(d),
        size(s)
 { }