QOpenGLWindow example: use std::unique_ptr instead of QScopedPointer

QScopedPointer is scheduled for deprecation, and can't decide whether
it wants to be a scoped, or a unique pointer.

The use of a unique_ptr members requires that the destructor be
out-of-line, since the payload classes are only forward-declared in
the header file.

Change-Id: Id0dcdde52cb3adc30d3051d2eed1d24c76154921
Reviewed-by: Edward Welbourne <[email protected]>

1 files changed, 7 insertions, 4 deletions

diff --git a/examples/opengl/qopenglwindow/background_renderer.cpp b/examples/opengl/qopenglwindow/background_renderer.cpp
index 9da1b9bf99a..acbbe748411 100644
--- a/examples/opengl/qopenglwindow/background_renderer.cpp
+++ b/examples/opengl/qopenglwindow/background_renderer.cpp
@@ -91,6 +91,9 @@ FragmentToy::FragmentToy(const QString &fragmentSource, QObject *parent)
     }
 }
 
+FragmentToy::~FragmentToy()
+    = default;
+
 void FragmentToy::draw(const QSize &windowSize)
 {
     if (!m_program)
@@ -120,7 +123,7 @@ void FragmentToy::draw(const QSize &windowSize)
         if (!m_vertex_shader->compileSourceCode(vertex_shader)) {
             qWarning() << "Failed to compile the vertex shader:" << m_vertex_shader->log();
         }
-        if (!m_program->addShader(m_vertex_shader.data())) {
+        if (!m_program->addShader(m_vertex_shader.get())) {
             qWarning() << "Failed to add vertex shader to program:" << m_program->log();
         }
     }
@@ -153,7 +156,7 @@ void FragmentToy::draw(const QSize &windowSize)
         }
 
         if (m_fragment_shader) {
-            if (!m_program->addShader(m_fragment_shader.data())) {
+            if (!m_program->addShader(m_fragment_shader.get())) {
                 qWarning() << "Failed to add fragment shader to program:" << m_program->log();
             }
         }
@@ -197,14 +200,14 @@ void FragmentToy::fileChanged(const QString &path)
             m_fragment_file_last_modified = fragment_source.lastModified();
             m_recompile_shaders = true;
             if (m_program) {
-                m_program->removeShader(m_fragment_shader.data());
+                m_program->removeShader(m_fragment_shader.get());
                 m_fragment_shader.reset(nullptr);
             }
         }
     } else {
         m_recompile_shaders = true;
         if (m_program) {
-            m_program->removeShader(m_fragment_shader.data());
+            m_program->removeShader(m_fragment_shader.get());
             m_fragment_shader.reset(nullptr);
         }
     }