diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-02-14 12:07:00 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-03-02 14:49:49 +0000 |
commit | 3c59d3c008665c7075ad6fb3e7f89a295518036d (patch) | |
tree | 9b150ac0548dbc4729c6587934bc7287038ae9b0 /src/multimedia/video | |
parent | 2e84ea2c3b13d51bb03c0d386daaea23e9e40226 (diff) |
Modernize code base
Use clang-modernize to modernize the code base
* Use = default where applicable
* Use nullptr
Change-Id: I88b307e76b7f7dde090354ff4b292cea76f5c60c
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/video')
-rw-r--r-- | src/multimedia/video/qabstractvideofilter.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/video/qabstractvideosurface.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/video/qimagevideobuffer.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/video/qmemoryvideobuffer.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/video/qvideosurfaceformat.cpp | 16 | ||||
-rw-r--r-- | src/multimedia/video/qvideosurfaces.cpp | 4 |
6 files changed, 8 insertions, 28 deletions
diff --git a/src/multimedia/video/qabstractvideofilter.cpp b/src/multimedia/video/qabstractvideofilter.cpp index de6cbad41..7bdee2177 100644 --- a/src/multimedia/video/qabstractvideofilter.cpp +++ b/src/multimedia/video/qabstractvideofilter.cpp @@ -256,9 +256,7 @@ public: /*! \internal */ -QVideoFilterRunnable::~QVideoFilterRunnable() -{ -} +QVideoFilterRunnable::~QVideoFilterRunnable() = default; /*! Constructs a new QAbstractVideoFilter instance with parent object \a parent. diff --git a/src/multimedia/video/qabstractvideosurface.cpp b/src/multimedia/video/qabstractvideosurface.cpp index 8e7d0620d..aa8dcbd0d 100644 --- a/src/multimedia/video/qabstractvideosurface.cpp +++ b/src/multimedia/video/qabstractvideosurface.cpp @@ -127,9 +127,7 @@ QAbstractVideoSurface::QAbstractVideoSurface(QObject *parent) /*! Destroys a video surface. */ -QAbstractVideoSurface::~QAbstractVideoSurface() -{ -} +QAbstractVideoSurface::~QAbstractVideoSurface() = default; /*! \fn QAbstractVideoSurface::supportedPixelFormats(QAbstractVideoBuffer::HandleType type) const diff --git a/src/multimedia/video/qimagevideobuffer.cpp b/src/multimedia/video/qimagevideobuffer.cpp index 2602d7d9e..272c31ff6 100644 --- a/src/multimedia/video/qimagevideobuffer.cpp +++ b/src/multimedia/video/qimagevideobuffer.cpp @@ -67,9 +67,7 @@ QImageVideoBuffer::QImageVideoBuffer(const QImage &image) d->image = image; } -QImageVideoBuffer::~QImageVideoBuffer() -{ -} +QImageVideoBuffer::~QImageVideoBuffer() = default; QAbstractVideoBuffer::MapMode QImageVideoBuffer::mapMode() const { diff --git a/src/multimedia/video/qmemoryvideobuffer.cpp b/src/multimedia/video/qmemoryvideobuffer.cpp index 164aa6ebc..5b04ff51c 100644 --- a/src/multimedia/video/qmemoryvideobuffer.cpp +++ b/src/multimedia/video/qmemoryvideobuffer.cpp @@ -76,9 +76,7 @@ QMemoryVideoBuffer::QMemoryVideoBuffer(const QByteArray &array, int bytesPerLine /*! Destroys a system memory allocated video buffer. */ -QMemoryVideoBuffer::~QMemoryVideoBuffer() -{ -} +QMemoryVideoBuffer::~QMemoryVideoBuffer() = default; /*! \reimp diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp index e5f69a03d..2fba59744 100644 --- a/src/multimedia/video/qvideosurfaceformat.cpp +++ b/src/multimedia/video/qvideosurfaceformat.cpp @@ -194,27 +194,17 @@ QVideoSurfaceFormat::QVideoSurfaceFormat( /*! Constructs a copy of \a other. */ -QVideoSurfaceFormat::QVideoSurfaceFormat(const QVideoSurfaceFormat &other) - : d(other.d) -{ -} +QVideoSurfaceFormat::QVideoSurfaceFormat(const QVideoSurfaceFormat &other) = default; /*! Assigns the values of \a other to this object. */ -QVideoSurfaceFormat &QVideoSurfaceFormat::operator =(const QVideoSurfaceFormat &other) -{ - d = other.d; - - return *this; -} +QVideoSurfaceFormat &QVideoSurfaceFormat::operator =(const QVideoSurfaceFormat &other) = default; /*! Destroys a video stream description. */ -QVideoSurfaceFormat::~QVideoSurfaceFormat() -{ -} +QVideoSurfaceFormat::~QVideoSurfaceFormat() = default; /*! Identifies if a video surface format has a valid pixel format and frame size. diff --git a/src/multimedia/video/qvideosurfaces.cpp b/src/multimedia/video/qvideosurfaces.cpp index 7ce1bd932..0583133be 100644 --- a/src/multimedia/video/qvideosurfaces.cpp +++ b/src/multimedia/video/qvideosurfaces.cpp @@ -55,9 +55,7 @@ QVideoSurfaces::QVideoSurfaces(const QList<QAbstractVideoSurface *> &s, QObject } } -QVideoSurfaces::~QVideoSurfaces() -{ -} +QVideoSurfaces::~QVideoSurfaces() = default; QList<QVideoFrame::PixelFormat> QVideoSurfaces::supportedPixelFormats(QAbstractVideoBuffer::HandleType type) const { |