Cleanup QtOpenGL examples

Cleanup the OpenGL examples
 - use nullptr (clang-tidy)
 - use member-initialization
 - avoid redundant checks for != nullptr when deleting a pointer

Change-Id: I3e4702690ed79e71c3e952d51ceef83b907b45b7
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 23 insertions, 23 deletions

diff --git a/examples/opengl/qopenglwidget/glwidget.h b/examples/opengl/qopenglwidget/glwidget.h
index 0ad2581cb8..99288261c0 100644
--- a/examples/opengl/qopenglwidget/glwidget.h
+++ b/examples/opengl/qopenglwidget/glwidget.h
@@ -98,34 +98,34 @@ private:
     void extrude(qreal x1, qreal y1, qreal x2, qreal y2);
 
     MainWindow *m_mainWindow;
-    qreal m_fAngle;
-    qreal m_fScale;
-    bool m_showBubbles;
+    qreal m_fAngle = 0;
+    qreal m_fScale = 1;
+    bool m_showBubbles = true;
     QVector<QVector3D> m_vertices;
     QVector<QVector3D> m_normals;
-    bool m_qtLogo;
-    QList<Bubble *> m_bubbles;
-    int m_frames;
+    bool m_qtLogo = true;
+    QVector<Bubble *> m_bubbles;
+    int m_frames = 0;
     QElapsedTimer m_time;
-    QOpenGLShader *m_vshader1;
-    QOpenGLShader *m_fshader1;
-    QOpenGLShader *m_vshader2;
-    QOpenGLShader *m_fshader2;
-    QOpenGLShaderProgram *m_program1;
-    QOpenGLShaderProgram *m_program2;
-    QOpenGLTexture *m_texture;
+    QOpenGLShader *m_vshader1 = nullptr;
+    QOpenGLShader *m_fshader1 = nullptr;
+    QOpenGLShader *m_vshader2 = nullptr;
+    QOpenGLShader *m_fshader2 = nullptr;
+    QOpenGLShaderProgram *m_program1 = nullptr;
+    QOpenGLShaderProgram *m_program2 = nullptr;
+    QOpenGLTexture *m_texture = nullptr;
     QOpenGLBuffer m_vbo1;
     QOpenGLBuffer m_vbo2;
-    int m_vertexAttr1;
-    int m_normalAttr1;
-    int m_matrixUniform1;
-    int m_vertexAttr2;
-    int m_normalAttr2;
-    int m_texCoordAttr2;
-    int m_matrixUniform2;
-    int m_textureUniform2;
-    bool m_transparent;
-    QPushButton *m_btn;
+    int m_vertexAttr1 = 0;
+    int m_normalAttr1 = 0;
+    int m_matrixUniform1 = 0;
+    int m_vertexAttr2 = 0;
+    int m_normalAttr2 = 0;
+    int m_texCoordAttr2 = 0;
+    int m_matrixUniform2 = 0;
+    int m_textureUniform2 = 0;
+    bool m_transparent = false;
+    QPushButton *m_btn = nullptr;
     bool m_hasButton;
     QColor m_background;
 };