From 06e962f263a86c4b66e1c6195b3d2615695fea1e Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Wed, 21 Feb 2018 11:52:59 +0100
Subject: init variables where they are declared when possible (clang-tidy)

clang-tidy -p compile_commands.json $file -checks='-*,modernize-use-default-member-init,readability-redundant-member-init'
 -config='{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: "1"}]}' -header-filter='qtdeclarative' -fix

Change-Id: I705f3235ff129ba68b0d8dad54a083e29fcead5f
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
---
 examples/quick/quickwidgets/quickwidget/fbitem.cpp | 6 +++---
 examples/quick/scenegraph/graph/linenode.cpp       | 8 ++++----
 examples/quick/scenegraph/graph/noisynode.cpp      | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'examples/quick')

diff --git a/examples/quick/quickwidgets/quickwidget/fbitem.cpp b/examples/quick/quickwidgets/quickwidget/fbitem.cpp
index 7a5de991ce..6c71b6184e 100644
--- a/examples/quick/quickwidgets/quickwidget/fbitem.cpp
+++ b/examples/quick/quickwidgets/quickwidget/fbitem.cpp
@@ -58,7 +58,7 @@
 class FbRenderer : public QQuickFramebufferObject::Renderer
 {
 public:
-    FbRenderer() : c(0), dir(1) { }
+    FbRenderer() { }
 
     // The lifetime of the FBO and this class depends on how QQuickWidget
     // manages the scenegraph and context when it comes to showing and hiding
@@ -85,8 +85,8 @@ public:
     }
 
 private:
-    float c;
-    int dir;
+    float c = 0;
+    int dir = 1;
 };
 #endif
 
diff --git a/examples/quick/scenegraph/graph/linenode.cpp b/examples/quick/scenegraph/graph/linenode.cpp
index 306909161e..b9ce1afc38 100644
--- a/examples/quick/scenegraph/graph/linenode.cpp
+++ b/examples/quick/scenegraph/graph/linenode.cpp
@@ -66,7 +66,7 @@ class LineShader : public QSGSimpleMaterialShader<LineMaterial>
     QSG_DECLARE_SIMPLE_SHADER(LineShader, LineMaterial)
 
 public:
-    LineShader() : id_color(-1), id_spread(-1), id_size(-1) {
+    LineShader() {
         setShaderSourceFile(QOpenGLShader::Vertex, ":/scenegraph/graph/shaders/line.vsh");
         setShaderSourceFile(QOpenGLShader::Fragment, ":/scenegraph/graph/shaders/line.fsh");
     }
@@ -86,9 +86,9 @@ public:
     }
 
 private:
-    int id_color;
-    int id_spread;
-    int id_size;
+    int id_color = -1;
+    int id_spread = -1;
+    int id_size = -1;
 };
 
 struct LineVertex {
diff --git a/examples/quick/scenegraph/graph/noisynode.cpp b/examples/quick/scenegraph/graph/noisynode.cpp
index 6e79bb247f..d1eaa1ec26 100644
--- a/examples/quick/scenegraph/graph/noisynode.cpp
+++ b/examples/quick/scenegraph/graph/noisynode.cpp
@@ -72,7 +72,7 @@ class NoisyShader : public QSGSimpleMaterialShader<NoisyMaterial>
     QSG_DECLARE_SIMPLE_SHADER(NoisyShader, NoisyMaterial)
 
 public:
-    NoisyShader() : id_color(-1), id_texture(-1), id_textureSize(-1) {
+    NoisyShader() {
         setShaderSourceFile(QOpenGLShader::Vertex, ":/scenegraph/graph/shaders/noisy.vsh");
         setShaderSourceFile(QOpenGLShader::Fragment, ":/scenegraph/graph/shaders/noisy.fsh");
     }
@@ -103,9 +103,9 @@ public:
     }
 
 private:
-    int id_color;
-    int id_texture;
-    int id_textureSize;
+    int id_color = -1;
+    int id_texture = -1;
+    int id_textureSize = -1;
 };
 
 NoisyNode::NoisyNode(QQuickWindow *window)
-- 
cgit v1.2.3