From 740fe5df0e9c152114e0a70c04dfad98e5be6f0f Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 16 Jan 2017 09:44:17 +0100 Subject: [PATCH] Use nullptr everywhere Differential Revision: https://phabricator.kde.org/D3987 --- src/imageformats/eps.cpp | 4 ++-- src/imageformats/exr.cpp | 4 ++-- src/imageformats/kra.cpp | 4 ++-- src/imageformats/ora.cpp | 4 ++-- src/imageformats/pcx.cpp | 4 ++-- src/imageformats/pic.cpp | 4 ++-- src/imageformats/psd.cpp | 4 ++-- src/imageformats/ras.cpp | 4 ++-- src/imageformats/rgb.cpp | 8 ++++---- src/imageformats/tga.cpp | 4 ++-- src/imageformats/xcf.cpp | 14 +++++++------- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/imageformats/eps.cpp b/src/imageformats/eps.cpp index 3064a4e..0c94a30 100644 --- a/src/imageformats/eps.cpp +++ b/src/imageformats/eps.cpp @@ -337,10 +337,10 @@ QImageIOPlugin::Capabilities EPSPlugin::capabilities(QIODevice *device, const QB return Capabilities(CanRead | CanWrite); } if (!format.isEmpty()) { - return 0; + return nullptr; } if (!device->isOpen()) { - return 0; + return nullptr; } Capabilities cap; diff --git a/src/imageformats/exr.cpp b/src/imageformats/exr.cpp index 622763e..62c5c53 100644 --- a/src/imageformats/exr.cpp +++ b/src/imageformats/exr.cpp @@ -218,10 +218,10 @@ QImageIOPlugin::Capabilities EXRPlugin::capabilities(QIODevice *device, const QB return Capabilities(CanRead); } if (!format.isEmpty()) { - return 0; + return nullptr; } if (!device->isOpen()) { - return 0; + return nullptr; } Capabilities cap; diff --git a/src/imageformats/kra.cpp b/src/imageformats/kra.cpp index 072f29a..0a47c70 100644 --- a/src/imageformats/kra.cpp +++ b/src/imageformats/kra.cpp @@ -66,10 +66,10 @@ QImageIOPlugin::Capabilities KraPlugin::capabilities(QIODevice *device, const QB return Capabilities(CanRead); } if (!format.isEmpty()) { - return 0; + return nullptr; } if (!device->isOpen()) { - return 0; + return nullptr; } Capabilities cap; diff --git a/src/imageformats/ora.cpp b/src/imageformats/ora.cpp index 0ce34b1..d2d059f 100644 --- a/src/imageformats/ora.cpp +++ b/src/imageformats/ora.cpp @@ -65,10 +65,10 @@ QImageIOPlugin::Capabilities OraPlugin::capabilities(QIODevice *device, const QB return Capabilities(CanRead); } if (!format.isEmpty()) { - return 0; + return nullptr; } if (!device->isOpen()) { - return 0; + return nullptr; } Capabilities cap; diff --git a/src/imageformats/pcx.cpp b/src/imageformats/pcx.cpp index a6fa396..341fcec 100644 --- a/src/imageformats/pcx.cpp +++ b/src/imageformats/pcx.cpp @@ -667,10 +667,10 @@ QImageIOPlugin::Capabilities PCXPlugin::capabilities(QIODevice *device, const QB return Capabilities(CanRead | CanWrite); } if (!format.isEmpty()) { - return 0; + return nullptr; } if (!device->isOpen()) { - return 0; + return nullptr; } Capabilities cap; diff --git a/src/imageformats/pic.cpp b/src/imageformats/pic.cpp index b413583..28c0666 100644 --- a/src/imageformats/pic.cpp +++ b/src/imageformats/pic.cpp @@ -449,10 +449,10 @@ QImageIOPlugin::Capabilities SoftimagePICPlugin::capabilities(QIODevice *device, return Capabilities(CanRead | CanWrite); } if (!format.isEmpty()) { - return 0; + return nullptr; } if (!device->isOpen()) { - return 0; + return nullptr; } Capabilities cap; diff --git a/src/imageformats/psd.cpp b/src/imageformats/psd.cpp index d5cbfc2..ff5faa7 100644 --- a/src/imageformats/psd.cpp +++ b/src/imageformats/psd.cpp @@ -300,10 +300,10 @@ QImageIOPlugin::Capabilities PSDPlugin::capabilities(QIODevice *device, const QB return Capabilities(CanRead); } if (!format.isEmpty()) { - return 0; + return nullptr; } if (!device->isOpen()) { - return 0; + return nullptr; } Capabilities cap; diff --git a/src/imageformats/ras.cpp b/src/imageformats/ras.cpp index 516b47e..e9ac548 100644 --- a/src/imageformats/ras.cpp +++ b/src/imageformats/ras.cpp @@ -282,10 +282,10 @@ QImageIOPlugin::Capabilities RASPlugin::capabilities(QIODevice *device, const QB return Capabilities(CanRead); } if (!format.isEmpty()) { - return 0; + return nullptr; } if (!device->isOpen()) { - return 0; + return nullptr; } Capabilities cap; diff --git a/src/imageformats/rgb.cpp b/src/imageformats/rgb.cpp index c115f0f..bbed011 100644 --- a/src/imageformats/rgb.cpp +++ b/src/imageformats/rgb.cpp @@ -111,8 +111,8 @@ private: }; SGIImage::SGIImage(QIODevice *io) : - _starttab(0), - _lengthtab(0) + _starttab(nullptr), + _lengthtab(nullptr) { _dev = io; _stream.setDevice(_dev); @@ -714,10 +714,10 @@ QImageIOPlugin::Capabilities RGBPlugin::capabilities(QIODevice *device, const QB return Capabilities(CanRead | CanWrite); } if (!format.isEmpty()) { - return 0; + return nullptr; } if (!device->isOpen()) { - return 0; + return nullptr; } Capabilities cap; diff --git a/src/imageformats/tga.cpp b/src/imageformats/tga.cpp index 2f15852..13ea277 100644 --- a/src/imageformats/tga.cpp +++ b/src/imageformats/tga.cpp @@ -414,10 +414,10 @@ QImageIOPlugin::Capabilities TGAPlugin::capabilities(QIODevice *device, const QB return Capabilities(CanRead | CanWrite); } if (!format.isEmpty()) { - return 0; + return nullptr; } if (!device->isOpen()) { - return 0; + return nullptr; } Capabilities cap; diff --git a/src/imageformats/xcf.cpp b/src/imageformats/xcf.cpp index 1800aad..d0eccc4 100644 --- a/src/imageformats/xcf.cpp +++ b/src/imageformats/xcf.cpp @@ -107,7 +107,7 @@ private: //! copied in different ways. void (*assignBytes)(Layer &layer, uint i, uint j); - Layer(void) : name(0) {} + Layer(void) : name(nullptr) {} ~Layer(void) { delete[] name; @@ -416,7 +416,7 @@ bool XCFImageFormat::loadImageProperties(QDataStream &xcf_io, XCFImage &xcf_imag property.readBytes(tag, size); quint32 flags; - char *data = 0; + char *data = nullptr; property >> flags >> data; if (tag && strncmp(tag, "gimp-comment", strlen("gimp-comment")) == 0) { @@ -474,7 +474,7 @@ bool XCFImageFormat::loadProperty(QDataStream &xcf_io, PropType &type, QByteArra xcf_io >> foo; type = PropType(foo); // TODO urks - char *data = 0; + char *data = nullptr; quint32 size; // The colormap property size is not the correct number of bytes: @@ -1442,7 +1442,7 @@ void XCFImageFormat::copyLayerToImage(XCFImage &xcf_image) { Layer &layer(xcf_image.layer); QImage &image(xcf_image.image); - PixelCopyOperation copy = 0; + PixelCopyOperation copy = nullptr; switch (layer.type) { case RGB_GIMAGE: @@ -1725,7 +1725,7 @@ void XCFImageFormat::mergeLayerIntoImage(XCFImage &xcf_image) Layer &layer(xcf_image.layer); QImage &image(xcf_image.image); - PixelMergeOperation merge = 0; + PixelMergeOperation merge = nullptr; if (!layer.opacity) { return; // don't bother doing anything @@ -2686,10 +2686,10 @@ QImageIOPlugin::Capabilities XCFPlugin::capabilities(QIODevice *device, const QB return Capabilities(CanRead); } if (!format.isEmpty()) { - return 0; + return nullptr; } if (!device->isOpen()) { - return 0; + return nullptr; } Capabilities cap;