From d4104b7b629f28c11d53151eacbba47a44c6a47d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Mon, 8 Apr 2019 15:53:39 -0400
Subject: [PATCH] renderers: replace QScopedPointer by std::unique_ptr
Change-Id: Ib0cd0c1444a185c578e83b85673a6a1d04060e98
---
src/directrenderer.cpp | 2 +-
src/directrenderer.h | 3 +--
src/shmrenderer.cpp | 3 ++-
src/shmrenderer.h | 3 +--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/directrenderer.cpp b/src/directrenderer.cpp
index b98fbf6e..9cb598d9 100644
--- a/src/directrenderer.cpp
+++ b/src/directrenderer.cpp
@@ -69,7 +69,7 @@ q_ptr(parent)
///Constructor
Video::DirectRenderer::DirectRenderer(const QByteArray& id, const QSize& res) :
Renderer(id, res),
-d_ptr(new DirectRendererPrivate(this))
+d_ptr(std::make_unique<DirectRendererPrivate>(this))
{
setObjectName("Video::DirectRenderer:"+id);
}
diff --git a/src/directrenderer.h b/src/directrenderer.h
index 1c3e2738..7880a869 100644
--- a/src/directrenderer.h
+++ b/src/directrenderer.h
@@ -60,8 +60,7 @@ public Q_SLOTS:
virtual void stopRendering () override;
private:
- QScopedPointer<DirectRendererPrivate> d_ptr;
- Q_DECLARE_PRIVATE(DirectRenderer)
+ std::unique_ptr<DirectRendererPrivate> d_ptr;
};
}
diff --git a/src/shmrenderer.cpp b/src/shmrenderer.cpp
index 1159cf78..117cf148 100644
--- a/src/shmrenderer.cpp
+++ b/src/shmrenderer.cpp
@@ -79,6 +79,7 @@ class ShmRendererPrivate final : public QObject
public:
ShmRendererPrivate(ShmRenderer* parent);
+
//Types
using TimePoint = std::chrono::time_point<std::chrono::system_clock>;
@@ -128,7 +129,7 @@ ShmRendererPrivate::ShmRendererPrivate(ShmRenderer* parent)
/// Constructor
ShmRenderer::ShmRenderer(const QByteArray& id, const QString& shmPath, const QSize& res)
: Renderer(id, res)
- , d_ptr(new ShmRendererPrivate(this))
+ , d_ptr(std::make_unique<ShmRendererPrivate>(this))
{
d_ptr->m_ShmPath = shmPath;
setObjectName("Video::Renderer:"+id);
diff --git a/src/shmrenderer.h b/src/shmrenderer.h
index 3aa93321..15dc0d2d 100644
--- a/src/shmrenderer.h
+++ b/src/shmrenderer.h
@@ -63,8 +63,7 @@ public:
void setShmPath(const QString& path);
private:
- QScopedPointer<ShmRendererPrivate> d_ptr;
- Q_DECLARE_PRIVATE(ShmRenderer)
+ std::unique_ptr<ShmRendererPrivate> d_ptr;
public Q_SLOTS:
void startRendering() override;
--
GitLab