Skip to content
Snippets Groups Projects
Commit d4104b7b authored by Sébastien Blin's avatar Sébastien Blin
Browse files

renderers: replace QScopedPointer by std::unique_ptr

Change-Id: Ib0cd0c1444a185c578e83b85673a6a1d04060e98
parent f9ca31c6
Branches
No related tags found
No related merge requests found
...@@ -69,7 +69,7 @@ q_ptr(parent) ...@@ -69,7 +69,7 @@ q_ptr(parent)
///Constructor ///Constructor
Video::DirectRenderer::DirectRenderer(const QByteArray& id, const QSize& res) : Video::DirectRenderer::DirectRenderer(const QByteArray& id, const QSize& res) :
Renderer(id, res), Renderer(id, res),
d_ptr(new DirectRendererPrivate(this)) d_ptr(std::make_unique<DirectRendererPrivate>(this))
{ {
setObjectName("Video::DirectRenderer:"+id); setObjectName("Video::DirectRenderer:"+id);
} }
......
...@@ -60,8 +60,7 @@ public Q_SLOTS: ...@@ -60,8 +60,7 @@ public Q_SLOTS:
virtual void stopRendering () override; virtual void stopRendering () override;
private: private:
QScopedPointer<DirectRendererPrivate> d_ptr; std::unique_ptr<DirectRendererPrivate> d_ptr;
Q_DECLARE_PRIVATE(DirectRenderer)
}; };
} }
......
...@@ -79,6 +79,7 @@ class ShmRendererPrivate final : public QObject ...@@ -79,6 +79,7 @@ class ShmRendererPrivate final : public QObject
public: public:
ShmRendererPrivate(ShmRenderer* parent); ShmRendererPrivate(ShmRenderer* parent);
//Types //Types
using TimePoint = std::chrono::time_point<std::chrono::system_clock>; using TimePoint = std::chrono::time_point<std::chrono::system_clock>;
...@@ -128,7 +129,7 @@ ShmRendererPrivate::ShmRendererPrivate(ShmRenderer* parent) ...@@ -128,7 +129,7 @@ ShmRendererPrivate::ShmRendererPrivate(ShmRenderer* parent)
/// Constructor /// Constructor
ShmRenderer::ShmRenderer(const QByteArray& id, const QString& shmPath, const QSize& res) ShmRenderer::ShmRenderer(const QByteArray& id, const QString& shmPath, const QSize& res)
: Renderer(id, res) : Renderer(id, res)
, d_ptr(new ShmRendererPrivate(this)) , d_ptr(std::make_unique<ShmRendererPrivate>(this))
{ {
d_ptr->m_ShmPath = shmPath; d_ptr->m_ShmPath = shmPath;
setObjectName("Video::Renderer:"+id); setObjectName("Video::Renderer:"+id);
......
...@@ -63,8 +63,7 @@ public: ...@@ -63,8 +63,7 @@ public:
void setShmPath(const QString& path); void setShmPath(const QString& path);
private: private:
QScopedPointer<ShmRendererPrivate> d_ptr; std::unique_ptr<ShmRendererPrivate> d_ptr;
Q_DECLARE_PRIVATE(ShmRenderer)
public Q_SLOTS: public Q_SLOTS:
void startRendering() override; void startRendering() override;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment