Clean up

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

8 files changed, 72 insertions, 44 deletions

diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index e7f5f5f8..df63ea42 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -582,7 +582,8 @@ void Abstract3DController::handleThemeSingleHighlightColorChanged(const QColor &
     markSeriesVisualsDirty();
 }
 
-void Abstract3DController::handleThemeSingleHighlightGradientChanged(const QLinearGradient &gradient)
+void Abstract3DController::handleThemeSingleHighlightGradientChanged(
+        const QLinearGradient &gradient)
 {
     // Set value for series that have not explicitly set this value
     foreach (QAbstract3DSeries *series, m_seriesList) {
@@ -1361,7 +1362,8 @@ void Abstract3DController::setAxisHelper(QAbstract3DAxis::AxisOrientation orient
     }
 }
 
-QAbstract3DAxis *Abstract3DController::createDefaultAxis(QAbstract3DAxis::AxisOrientation orientation)
+QAbstract3DAxis *Abstract3DController::createDefaultAxis(
+        QAbstract3DAxis::AxisOrientation orientation)
 {
     Q_UNUSED(orientation)
 
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 0d7aa3c3..18719483 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -309,8 +309,9 @@ void Abstract3DRenderer::calculateZoomLevel()
     GLfloat div;
     GLfloat zoomAdjustment;
     div = qMin(m_primarySubViewport.width(), m_primarySubViewport.height());
-    zoomAdjustment = 2.0f * defaultRatio * ((m_primarySubViewport.width() / div)
-                                            / (m_primarySubViewport.height() / div)) / m_graphAspectRatio;
+    zoomAdjustment = 2.0f * defaultRatio
+            * ((m_primarySubViewport.width() / div)
+               / (m_primarySubViewport.height() / div)) / m_graphAspectRatio;
     m_autoScaleAdjustment = qMin(zoomAdjustment, 1.0f); // clamp to 1.0f
 }
 
@@ -794,7 +795,8 @@ void Abstract3DRenderer::generateBaseColorTexture(const QColor &color, GLuint *t
     *texture = m_textureHelper->createUniformTexture(color);
 }
 
-void Abstract3DRenderer::fixGradientAndGenerateTexture(QLinearGradient *gradient, GLuint *gradientTexture)
+void Abstract3DRenderer::fixGradientAndGenerateTexture(QLinearGradient *gradient,
+                                                       GLuint *gradientTexture)
 {
     // Readjust start/stop to match gradient texture size
     gradient->setStart(qreal(gradientTextureWidth), qreal(gradientTextureHeight));
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 76e6793e..3a240c24 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -584,7 +584,8 @@ void Bars3DController::adjustAxisRanges()
         int seriesCount = m_seriesList.size();
         if (adjustZ || adjustX) {
             for (int series = 0; series < seriesCount; series++) {
-                const QBar3DSeries *barSeries = static_cast<QBar3DSeries *>(m_seriesList.at(series));
+                const QBar3DSeries *barSeries =
+                        static_cast<QBar3DSeries *>(m_seriesList.at(series));
                 if (barSeries->isVisible()) {
                     const QBarDataProxy *proxy = barSeries->dataProxy();
 
@@ -620,14 +621,16 @@ void Bars3DController::adjustAxisRanges()
         // Now that we know the row and column ranges, figure out the value axis range
         if (adjustY) {
             for (int series = 0; series < seriesCount; series++) {
-                const QBar3DSeries *barSeries = static_cast<QBar3DSeries *>(m_seriesList.at(series));
+                const QBar3DSeries *barSeries =
+                        static_cast<QBar3DSeries *>(m_seriesList.at(series));
                 if (barSeries->isVisible()) {
                     const QBarDataProxy *proxy = barSeries->dataProxy();
                     if (adjustY && proxy) {
-                        QPair<GLfloat, GLfloat> limits = proxy->dptrc()->limitValues(categoryAxisZ->min(),
-                                                                                     categoryAxisZ->max(),
-                                                                                     categoryAxisX->min(),
-                                                                                     categoryAxisX->max());
+                        QPair<GLfloat, GLfloat> limits =
+                                proxy->dptrc()->limitValues(categoryAxisZ->min(),
+                                                            categoryAxisZ->max(),
+                                                            categoryAxisX->min(),
+                                                            categoryAxisX->max());
                         if (!series) {
                             // First series initializes the values
                             minValue = limits.first;
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 30be2eae..3805e760 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -549,7 +549,8 @@ void Bars3DRenderer::drawSlicedScene()
                                             itModelMatrix.inverted().transposed());
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
                 lineShader->setUniformValue(lineShader->color(),
-                                            Utils::vectorFromColor(m_cachedTheme->labelTextColor()));
+                                            Utils::vectorFromColor(
+                                                m_cachedTheme->labelTextColor()));
 
                 // Draw the object
 #if !(defined QT_OPENGL_ES_2)
@@ -810,10 +811,13 @@ void Bars3DRenderer::drawSlicedScene()
                             m_drawer->generateLabelItem(item.sliceLabelItem(), item.sliceLabel());
                             m_updateLabels = false;
                         }
-                        Qt::AlignmentFlag alignment = (item.height() > 0) ? Qt::AlignLeft : Qt::AlignRight;
-                        Drawer::LabelPosition labelPos = (item.height() < 0) ? Drawer::LabelBelow : Drawer::LabelOver;
+                        Qt::AlignmentFlag alignment =
+                                (item.height() > 0) ? Qt::AlignLeft : Qt::AlignRight;
+                        Drawer::LabelPosition labelPos =
+                                (item.height() < 0) ? Drawer::LabelBelow : Drawer::LabelOver;
                         m_dummyBarRenderItem.setTranslation(QVector3D(item.translation().x(),
-                                                                      barPosYAdjustment - zeroPosAdjustment
+                                                                      barPosYAdjustment
+                                                                      - zeroPosAdjustment
                                                                       + item.height(),
                                                                       item.translation().z()));
 
@@ -837,7 +841,8 @@ void Bars3DRenderer::drawSlicedScene()
             m_updateLabels = false;
         }
         Qt::AlignmentFlag alignment = (selectedItem->height() > 0) ? Qt::AlignLeft : Qt::AlignRight;
-        Drawer::LabelPosition labelPos = (selectedItem->height() < 0) ? Drawer::LabelBelow : Drawer::LabelOver;
+        Drawer::LabelPosition labelPos =
+                (selectedItem->height() < 0) ? Drawer::LabelBelow : Drawer::LabelOver;
         m_dummyBarRenderItem.setTranslation(QVector3D(selectedItem->translation().x(),
                                                       barPosYAdjustment - zeroPosAdjustment
                                                       + selectedItem->height(),
@@ -854,22 +859,24 @@ void Bars3DRenderer::drawSlicedScene()
     if (rowMode) {
         if (m_sliceTitleItem) {
             m_drawer->drawLabel(*dummyItem, sliceSelectionLabel, viewMatrix, projectionMatrix,
-                                positionComp, identityQuaternion, 0, m_cachedSelectionMode, m_labelShader,
-                                m_labelObj, activeCamera, false, false, Drawer::LabelTop,
-                                Qt::AlignCenter, true);
+                                positionComp, identityQuaternion, 0, m_cachedSelectionMode,
+                                m_labelShader, m_labelObj, activeCamera, false, false,
+                                Drawer::LabelTop, Qt::AlignCenter, true);
         }
         m_drawer->drawLabel(*dummyItem, m_axisCacheX.titleItem(), viewMatrix, projectionMatrix,
-                            positionComp, identityQuaternion, 0, m_cachedSelectionMode, m_labelShader,
-                            m_labelObj, activeCamera, false, false, Drawer::LabelBottom,
-                            Qt::AlignCenter, true);
+                            positionComp, identityQuaternion, 0, m_cachedSelectionMode,
+                            m_labelShader, m_labelObj, activeCamera, false, false,
+                            Drawer::LabelBottom, Qt::AlignCenter, true);
     } else {
         m_drawer->drawLabel(*dummyItem, m_axisCacheZ.titleItem(), viewMatrix, projectionMatrix,
-                            positionComp, identityQuaternion, 0, m_cachedSelectionMode, m_labelShader,
+                            positionComp, identityQuaternion, 0, m_cachedSelectionMode,
+                            m_labelShader,
                             m_labelObj, activeCamera, false, false, Drawer::LabelBottom,
                             Qt::AlignCenter, true);
         if (m_sliceTitleItem) {
             m_drawer->drawLabel(*dummyItem, sliceSelectionLabel, viewMatrix, projectionMatrix,
-                                positionComp, identityQuaternion, 0, m_cachedSelectionMode, m_labelShader,
+                                positionComp, identityQuaternion, 0, m_cachedSelectionMode,
+                                m_labelShader,
                                 m_labelObj, activeCamera, false, false, Drawer::LabelTop,
                                 Qt::AlignCenter, true);
         }
@@ -1256,7 +1263,8 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
     QVector4D baseColor;
     QVector4D barColor;
     QVector3D modelScaler(m_scaleX * m_seriesScaleX, 0.0f, m_scaleZ * m_seriesScaleZ);
-    bool somethingSelected = (m_visualSelectedBarPos != Bars3DController::invalidSelectionPosition());
+    bool somethingSelected =
+            (m_visualSelectedBarPos != Bars3DController::invalidSelectionPosition());
     foreach (SeriesRenderCache *baseCache, m_renderCacheList) {
         if (baseCache->isVisible()) {
             BarSeriesRenderCache *cache = static_cast<BarSeriesRenderCache *>(baseCache);
@@ -1404,8 +1412,9 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                             if (m_cachedIsSlicingActivated) {
                                 QVector3D translation = modelMatrix.column(3).toVector3D();
                                 if (m_visibleSeriesCount > 1) {
-                                    translation.setZ((m_columnDepth - ((row + seriesPos)
-                                                                       * (m_cachedBarSpacing.height())))
+                                    translation.setZ((m_columnDepth
+                                                      - ((row + seriesPos)
+                                                         * (m_cachedBarSpacing.height())))
                                                      / m_scaleFactor);
                                 }
                                 item.setTranslation(translation);
@@ -1447,13 +1456,15 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                         if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                             // Set shadow shader bindings
                             QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
-                            barShader->setUniformValue(barShader->shadowQ(), m_shadowQualityToShader);
+                            barShader->setUniformValue(barShader->shadowQ(),
+                                                       m_shadowQualityToShader);
                             barShader->setUniformValue(barShader->depth(), depthMVPMatrix);
                             barShader->setUniformValue(barShader->lightS(), shadowLightStrength);
                             barShader->setUniformValue(barShader->lightColor(), lightColor);
 
                             // Draw the object
-                            m_drawer->drawObject(barShader, barObj, gradientTexture, m_depthTexture);
+                            m_drawer->drawObject(barShader, barObj, gradientTexture,
+                                                 m_depthTexture);
                         } else
 #else
                         Q_UNUSED(shadowLightStrength);
diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp
index 8aa8a2e0..831fc994 100644
--- a/src/datavisualization/engine/q3dcamera.cpp
+++ b/src/datavisualization/engine/q3dcamera.cpp
@@ -205,10 +205,12 @@ float Q3DCamera::xRotation() const {
 
 void Q3DCamera::setXRotation(float rotation)
 {
-    if (d_ptr->m_wrapXRotation)
+    if (d_ptr->m_wrapXRotation) {
         rotation = Utils::wrapValue(rotation, d_ptr->m_minXRotation, d_ptr->m_maxXRotation);
-    else
-        rotation = qBound(float(d_ptr->m_minXRotation), float(rotation), float(d_ptr->m_maxXRotation));
+    } else {
+        rotation = qBound(float(d_ptr->m_minXRotation), float(rotation),
+                          float(d_ptr->m_maxXRotation));
+    }
 
     if (d_ptr->m_xRotation != rotation) {
         d_ptr->setXRotation(rotation);
@@ -232,10 +234,12 @@ float Q3DCamera::yRotation() const {
 
 void Q3DCamera::setYRotation(float rotation)
 {
-    if (d_ptr->m_wrapYRotation)
+    if (d_ptr->m_wrapYRotation) {
         rotation = Utils::wrapValue(rotation, d_ptr->m_minYRotation, d_ptr->m_maxYRotation);
-    else
-        rotation = qBound(float(d_ptr->m_minYRotation), float(rotation), float(d_ptr->m_maxYRotation));
+    } else {
+        rotation = qBound(float(d_ptr->m_minYRotation), float(rotation),
+                          float(d_ptr->m_maxYRotation));
+    }
 
     if (d_ptr->m_yRotation != rotation) {
         d_ptr->setYRotation(rotation);
diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index 480307fe..5c31382e 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -187,7 +187,8 @@ QAbstract3DGraph::QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFor
 
 #if !defined(QT_OPENGL_ES_2)
     // If we have real OpenGL, GLSL version must be 1.2 or over. Quit if not.
-    QStringList splitversionstr = QString::fromLatin1((const char *)shaderVersion).split(QChar::fromLatin1(' '));
+    QStringList splitversionstr =
+            QString::fromLatin1((const char *)shaderVersion).split(QChar::fromLatin1(' '));
     if (splitversionstr[0].toFloat() < 1.2)
         qFatal("GLSL version must be 1.20 or higher. Try installing latest display drivers.");
 #else
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index e6c25260..c03bafd8 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -200,7 +200,8 @@ void Surface3DController::setSelectionMode(QAbstract3DGraph::SelectionFlags mode
     }
 }
 
-void Surface3DController::setSelectedPoint(const QPoint &position, QSurface3DSeries *series, bool enterSlice)
+void Surface3DController::setSelectedPoint(const QPoint &position, QSurface3DSeries *series,
+                                           bool enterSlice)
 {
     // If the selection targets non-existent point, clear selection instead.
     QPoint pos = position;
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index f65ec634..e193cf67 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -944,9 +944,9 @@ void Surface3DRenderer::drawSlicedScene()
             // Draw the label here
             m_dummyRenderItem.setTranslation(labelTrans);
             m_drawer->drawLabel(m_dummyRenderItem, axisLabelItem, viewMatrix, projectionMatrix,
-                                positionComp, identityQuaternion, 0, m_cachedSelectionMode, m_labelShader,
-                                m_labelObj, activeCamera, true, true, Drawer::LabelMid,
-                                Qt::AlignLeft, true);
+                                positionComp, identityQuaternion, 0, m_cachedSelectionMode,
+                                m_labelShader, m_labelObj, activeCamera, true, true,
+                                Drawer::LabelMid, Qt::AlignLeft, true);
         }
         labelNbr++;
     }
@@ -1480,7 +1480,8 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
                 QMatrix4x4 MVPMatrix;
                 QMatrix4x4 itModelMatrix;
 
-                modelMatrix.translate(0.0f, yFloorLinePosition, m_axisCacheZ.gridLinePosition(line));
+                modelMatrix.translate(0.0f, yFloorLinePosition,
+                                      m_axisCacheZ.gridLinePosition(line));
 
                 modelMatrix.scale(gridLineScaleX);
                 itModelMatrix.scale(gridLineScaleX);
@@ -1574,7 +1575,8 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
                 QMatrix4x4 MVPMatrix;
                 QMatrix4x4 itModelMatrix;
 
-                modelMatrix.translate(m_axisCacheX.gridLinePosition(line), yFloorLinePosition, 0.0f);
+                modelMatrix.translate(m_axisCacheX.gridLinePosition(line), yFloorLinePosition,
+                                      0.0f);
 
                 modelMatrix.scale(gridLineScaleZ);
                 itModelMatrix.scale(gridLineScaleZ);
@@ -2072,8 +2074,10 @@ void Surface3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa
         GLfloat labelMarginZTrans = labelMargin;
         QVector3D backLabelRotation(0.0f, -90.0f, 0.0f);
         QVector3D sideLabelRotation(0.0f, 0.0f, 0.0f);
-        Qt::AlignmentFlag backAlignment = (m_xFlipped != m_zFlipped) ? Qt::AlignLeft : Qt::AlignRight;
-        Qt::AlignmentFlag sideAlignment = (m_xFlipped == m_zFlipped) ? Qt::AlignLeft : Qt::AlignRight;
+        Qt::AlignmentFlag backAlignment =
+                (m_xFlipped != m_zFlipped) ? Qt::AlignLeft : Qt::AlignRight;
+        Qt::AlignmentFlag sideAlignment =
+                (m_xFlipped == m_zFlipped) ? Qt::AlignLeft : Qt::AlignRight;
         if (!m_xFlipped) {
             labelXTrans = -labelXTrans;
             labelMarginXTrans = -labelMargin;