Use nullptr in place of 0 or NULL

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

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index d2d3ef9234a470c1c81b08a934939289f9ce41f1..a9383401a6f46c10a5f58fcfa0ef55369ff006b3 100644 (file)
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -1,9 +1,9 @@
+#include "imageloader.h"
 #include <msp/core/refptr.h>
 #include <msp/io/file.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "bmploader.h"
-#include "imageloader.h"
 #ifdef WITH_LIBPNG
 #include "png/pngloader.h"
 #endif
@@ -22,16 +22,20 @@ using namespace std;
 namespace Msp {
 namespace Graphics {
 
-ImageLoader::ImageLoader():
-       source(0),
-       state(INITIAL)
-{ }
-
 ImageLoader::~ImageLoader()
 {
        delete source;
 }
 
+bool ImageLoader::detect_signature(const 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
@@ -62,8 +66,8 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
        string signature(registry.loaders.back()->get_signature_size(), 0);
        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)
+       ImageLoader *loader = nullptr;
+       for(auto i=registry.loaders.begin(); (!loader && i!=registry.loaders.end()); ++i)
                if((*i)->detect(signature))
                        loader = (*i)->create(io);
 
@@ -132,14 +136,10 @@ bool ImageLoader::signature_size_compare(RegisterBase *r1, RegisterBase *r2)
 }
 
 
-ImageLoader::Registry::Registry():
-       changed(false)
-{ }
-
 ImageLoader::Registry::~Registry()
 {
-       for(list<RegisterBase *>::iterator i=loaders.begin(); i!=loaders.end(); ++i)
-               delete *i;
+       for(auto l: loaders)
+               delete l;
 }
 
 } // namespace Graphics