Clean up

Task-number: QTRD-3149
Change-Id: I6d9808afc8f007fee84ddbb6f7c3366fb94cc8d2
Change-Id: I6d9808afc8f007fee84ddbb6f7c3366fb94cc8d2
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

5 files changed, 37 insertions, 25 deletions

diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index f2ad2435..9670a7db 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -87,7 +87,8 @@ bool DeclarativeBars::isMultiSeriesUniform() const
 void DeclarativeBars::setBarThickness(float thicknessRatio)
 {
     if (thicknessRatio != barThickness()) {
-        m_barsController->setBarSpecs(GLfloat(thicknessRatio), barSpacing(), isBarSpacingRelative());
+        m_barsController->setBarSpecs(GLfloat(thicknessRatio), barSpacing(),
+                                      isBarSpacingRelative());
         emit barThicknessChanged(thicknessRatio);
     }
 }
diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml2/declarativerendernode.cpp
index d42ceb03..e9bb65fd 100644
--- a/src/datavisualizationqml2/declarativerendernode.cpp
+++ b/src/datavisualizationqml2/declarativerendernode.cpp
@@ -24,15 +24,15 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 DeclarativeRenderNode::DeclarativeRenderNode(AbstractDeclarative *declarative)
     : QSGGeometryNode(),
-    m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4),
-    m_texture(0),
-    m_declarative(declarative),
-    m_controller(0),
-    m_fbo(0),
-    m_multisampledFBO(0),
-    m_window(0),
-    m_samples(0),
-    m_dirtyFBO(false)
+      m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4),
+      m_texture(0),
+      m_declarative(declarative),
+      m_controller(0),
+      m_fbo(0),
+      m_multisampledFBO(0),
+      m_window(0),
+      m_samples(0),
+      m_dirtyFBO(false)
 {
     setMaterial(&m_material);
     setOpaqueMaterial(&m_materialO);
@@ -90,8 +90,10 @@ void DeclarativeRenderNode::updateFBO()
 
     QSGGeometry::updateTexturedRectGeometry(&m_geometry,
                                             QRectF(0, 0,
-                                                   m_size.width() / m_controller->scene()->devicePixelRatio(),
-                                                   m_size.height() / m_controller->scene()->devicePixelRatio()),
+                                                   m_size.width()
+                                                   / m_controller->scene()->devicePixelRatio(),
+                                                   m_size.height()
+                                                   / m_controller->scene()->devicePixelRatio()),
                                             QRectF(0, 1, 1, -1));
 
     delete m_texture;
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index 50ec9384..96af6df6 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -77,13 +77,14 @@ QScatter3DSeries *DeclarativeScatter::selectedSeries() const
 QQmlListProperty<QScatter3DSeries> DeclarativeScatter::seriesList()
 {
     return QQmlListProperty<QScatter3DSeries>(this, this,
-                                          &DeclarativeScatter::appendSeriesFunc,
-                                          &DeclarativeScatter::countSeriesFunc,
-                                          &DeclarativeScatter::atSeriesFunc,
-                                          &DeclarativeScatter::clearSeriesFunc);
+                                              &DeclarativeScatter::appendSeriesFunc,
+                                              &DeclarativeScatter::countSeriesFunc,
+                                              &DeclarativeScatter::atSeriesFunc,
+                                              &DeclarativeScatter::clearSeriesFunc);
 }
 
-void DeclarativeScatter::appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *list, QScatter3DSeries *series)
+void DeclarativeScatter::appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *list,
+                                          QScatter3DSeries *series)
 {
     reinterpret_cast<DeclarativeScatter *>(list->data)->addSeries(series);
 }
diff --git a/src/datavisualizationqml2/enumtostringmap.cpp b/src/datavisualizationqml2/enumtostringmap.cpp
index 99399482..b4b04fc2 100644
--- a/src/datavisualizationqml2/enumtostringmap.cpp
+++ b/src/datavisualizationqml2/enumtostringmap.cpp
@@ -368,7 +368,8 @@ EnumToStringMap::EnumToStringMap() :
     m_map[GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE] = "FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE";
     m_map[GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME] = "FRAMEBUFFER_ATTACHMENT_OBJECT_NAME";
     m_map[GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL] = "FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL";
-    m_map[GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE] = "FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE";
+    m_map[GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE] =
+            "FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE";
 
     m_map[GL_COLOR_ATTACHMENT0] = "COLOR_ATTACHMENT0";
     m_map[GL_DEPTH_ATTACHMENT] = "DEPTH_ATTACHMENT";
@@ -376,7 +377,8 @@ EnumToStringMap::EnumToStringMap() :
 
     m_map[GL_FRAMEBUFFER_COMPLETE] = "FRAMEBUFFER_COMPLETE";
     m_map[GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT] = "FRAMEBUFFER_INCOMPLETE_ATTACHMENT";
-    m_map[GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT] = "FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT";
+    m_map[GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT] =
+            "FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT";
     m_map[GL_FRAMEBUFFER_UNSUPPORTED] = "FRAMEBUFFER_UNSUPPORTED";
 
     m_map[GL_FRAMEBUFFER_BINDING] = "FRAMEBUFFER_BINDING";
diff --git a/src/datavisualizationqml2/glstatestore.cpp b/src/datavisualizationqml2/glstatestore.cpp
index 35897cf5..973d5054 100644
--- a/src/datavisualizationqml2/glstatestore.cpp
+++ b/src/datavisualizationqml2/glstatestore.cpp
@@ -112,11 +112,14 @@ void GLStateStore::storeGLState()
     glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &m_boundElementArrayBuffer);
 
     for (int i = 0; i < m_maxVertexAttribs;i++) {
-        glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &m_vertexAttribArrayEnabledStates[i]);
-        glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, &m_vertexAttribArrayBoundBuffers[i]);
+        glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_ENABLED,
+                            &m_vertexAttribArrayEnabledStates[i]);
+        glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING,
+                            &m_vertexAttribArrayBoundBuffers[i]);
         glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_SIZE, &m_vertexAttribArraySizes[i]);
         glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_TYPE, &m_vertexAttribArrayTypes[i]);
-        glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, &m_vertexAttribArrayNormalized[i]);
+        glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,
+                            &m_vertexAttribArrayNormalized[i]);
         glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_STRIDE, &m_vertexAttribArrayStrides[i]);
     }
 }
@@ -201,11 +204,14 @@ void GLStateStore::printCurrentState(bool in)
         glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &arrayBufferBinding);
 
         for (int i = 0; i < m_maxVertexAttribs;i++) {
-            glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &vertexAttribArrayEnabledStates[i]);
-            glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, &vertexAttribArrayBoundBuffers[i]);
+            glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_ENABLED,
+                                &vertexAttribArrayEnabledStates[i]);
+            glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING,
+                                &vertexAttribArrayBoundBuffers[i]);
             glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_SIZE, &vertexAttribArraySizes[i]);
             glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_TYPE, &vertexAttribArrayTypes[i]);
-            glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, &vertexAttribArrayNormalized[i]);
+            glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED,
+                                &vertexAttribArrayNormalized[i]);
             glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_STRIDE, &vertexAttribArrayStrides[i]);
         }