Use nullptr in place of 0 or NULL

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

diff --git a/source/graphics/image.cpp b/source/graphics/image.cpp
index 2835d05e872936d0cc069fa806812ff3ab952661..813672bca52d8fdec846629e53845af9c3a6dd17 100644 (file)
--- a/source/graphics/image.cpp
+++ b/source/graphics/image.cpp
@@ -1,8 +1,8 @@
+#include "image.h"
 #include <msp/core/refptr.h>
 #include <msp/fs/utils.h>
 #include <msp/io/file.h>
 #include <msp/io/memory.h>
-#include "image.h"
 #include "imageloader.h"
 
 using namespace std;
@@ -10,20 +10,12 @@ using namespace std;
 namespace Msp {
 namespace Graphics {
 
-Image::Data::Data():
-       fmt(RGB),
-       width(0),
-       height(0),
-       owned_pixels(0),
-       pixels(0)
-{ }
-
 Image::Data::Data(const Data &other):
        fmt(other.fmt),
        width(other.width),
        height(other.height),
        stride(other.stride),
-       owned_pixels(other.pixels ? new char[stride*height] : 0),
+       owned_pixels(other.pixels ? new char[stride*height] : nullptr),
        pixels(owned_pixels)
 {
        if(pixels)
@@ -33,7 +25,7 @@ Image::Data::Data(const Data &other):
 Image::Data &Image::Data::operator=(const Data &other)
 {
        delete[] owned_pixels;
-       pixels = owned_pixels = 0;
+       pixels = owned_pixels = nullptr;
 
        fmt = other.fmt;
        width = other.width;