Streamline iterators and loop constructs

[libs/gui.git] / source / graphics / imageloader.cpp

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index d2d3ef9234a470c1c81b08a934939289f9ce41f1..9b8a42def04a6928162000a967bbefe2e71cb226 100644 (file)
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -32,6 +32,15 @@ ImageLoader::~ImageLoader()
        delete source;
 }
 
+bool ImageLoader::detect_signature(const std::string &sig)
+{
+       Registry &registry = get_registry();
+       for(const RegisterBase *r: registry.loaders)
+               if(r->detect(sig))
+                       return true;
+       return false;
+}
+
 ImageLoader *ImageLoader::open_file(const string &fn)
 {
        try
@@ -63,7 +72,7 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
        unsigned sig_len = io.read(&signature[0], signature.size());
 
        ImageLoader *loader = 0;
-       for(list<RegisterBase *>::const_iterator i=registry.loaders.begin(); (!loader && i!=registry.loaders.end()); ++i)
+       for(auto i=registry.loaders.begin(); (!loader && i!=registry.loaders.end()); ++i)
                if((*i)->detect(signature))
                        loader = (*i)->create(io);
 
@@ -138,8 +147,8 @@ ImageLoader::Registry::Registry():
 
 ImageLoader::Registry::~Registry()
 {
-       for(list<RegisterBase *>::iterator i=loaders.begin(); i!=loaders.end(); ++i)
-               delete *i;
+       for(auto l: loaders)
+               delete l;
 }
 
 } // namespace Graphics