diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2022-03-04 12:28:49 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2022-03-08 15:44:17 +0100 |
| commit | 034d8898f8166423db085da529787e56204c8e15 (patch) | |
| tree | f58e930c7880d1cd79cd39745ed366d27dcd9e55 /src/gui/image/qimage.cpp | |
| parent | 87725ee75981ec9ab25456c41acc74681c85ae2e (diff) | |
Fix deprecated uses of QScopedPointer
By changing it to unique_ptr.
Pick-to: 6.2 6.3
Change-Id: I91abb69445b537d4c95983ae735341882352b29d
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/image/qimage.cpp')
| -rw-r--r-- | src/gui/image/qimage.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 2468b52d84..d681c28d8d 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -77,6 +77,8 @@ #include <qtgui_tracepoints_p.h> +#include <memory> + QT_BEGIN_NAMESPACE // MSVC 19.28 does show spurious warning "C4723: potential divide by 0" for code that divides @@ -140,7 +142,7 @@ QImageData * QImageData::create(const QSize &size, QImage::Format format) if (!params.isValid()) return nullptr; - QScopedPointer<QImageData> d(new QImageData); + auto d = std::make_unique<QImageData>(); switch (format) { case QImage::Format_Mono: @@ -168,7 +170,7 @@ QImageData * QImageData::create(const QSize &size, QImage::Format format) return nullptr; d->ref.ref(); - return d.take(); + return d.release(); } QImageData::~QImageData() |