diff --git a/src/directrenderer.cpp b/src/directrenderer.cpp index b98fbf6eca67c1f0d721aae5589fe2a91bb1b113..9cb598d9835242c2a9161b222c4640b65131004d 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 1c3e273802515c38fbd1b907c2a8bb0547a08477..7880a869eef44579247b757c5f5c76138b3f4354 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 1159cf78f04c1a4645dd2e0aaa2dace28b0e4902..117cf1486a5fbd6d53d8621f81b202306058f501 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 3aa93321310f15079f269e32e833f83e2b05ede2..15dc0d2d5a417b4ea7739b03be306d3f93e8b6e7 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;