diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 15:32:47 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 15:38:00 +0100 |
| commit | 3c98af88f1051f6947cc6de1cfba57a1b1d6e0cd (patch) | |
| tree | ce12f4145c1c1dda4da29aa5d786926f06bace51 | |
| parent | 64841de96485d5dfd7c24c052626bff6a953bca3 (diff) | |
| download | qtsvg-3c98af88f1051f6947cc6de1cfba57a1b1d6e0cd.tar.gz | |
Avoid initializing QFlags with 0 or nullptr
It is being deprecated.
Change-Id: Ia8306d3874dc21d431fcb621e1f487f55b2bed8d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/plugins/imageformats/svg/main.cpp | 5 | ||||
| -rw-r--r-- | src/svg/qsvgwidget.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/imageformats/svg/main.cpp b/src/plugins/imageformats/svg/main.cpp index f9fcfc3..d3fe476 100644 --- a/src/plugins/imageformats/svg/main.cpp +++ b/src/plugins/imageformats/svg/main.cpp @@ -72,10 +72,9 @@ QImageIOPlugin::Capabilities QSvgPlugin::capabilities(QIODevice *device, const Q if (format == "svg") #endif return Capabilities(CanRead); - if (!format.isEmpty()) - return 0; - Capabilities cap; + if (!format.isEmpty()) + return cap; if (device->isReadable() && QSvgIOHandler::canRead(device)) cap |= CanRead; return cap; diff --git a/src/svg/qsvgwidget.cpp b/src/svg/qsvgwidget.cpp index 4b86306..acc8cca 100644 --- a/src/svg/qsvgwidget.cpp +++ b/src/svg/qsvgwidget.cpp @@ -90,7 +90,7 @@ public: Constructs a new SVG display widget with the given \a parent. */ QSvgWidget::QSvgWidget(QWidget *parent) - : QWidget(*new QSvgWidgetPrivate, parent, 0) + : QWidget(*new QSvgWidgetPrivate, parent, {}) { d_func()->renderer = new QSvgRenderer(this); QObject::connect(d_func()->renderer, SIGNAL(repaintNeeded()), @@ -102,7 +102,7 @@ QSvgWidget::QSvgWidget(QWidget *parent) of the specified \a file. */ QSvgWidget::QSvgWidget(const QString &file, QWidget *parent) - : QWidget(*new QSvgWidgetPrivate, parent, 0) + : QWidget(*new QSvgWidgetPrivate, parent, {}) { d_func()->renderer = new QSvgRenderer(file, this); QObject::connect(d_func()->renderer, SIGNAL(repaintNeeded()), |