Made jira tasks of TODOs, part 2

+ commented-out code and qDebugs removed

Task-number: QTRD-2398
Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86
Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

32 files changed, 116 insertions, 161 deletions

diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 2cda94e2..b7440c84 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -36,7 +36,8 @@
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
-Abstract3DController::Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent) :
+Abstract3DController::Abstract3DController(QRect initialViewport, Q3DScene *scene,
+                                           QObject *parent) :
     QObject(parent),
     m_themeManager(new ThemeManager(this)),
     m_selectionMode(QAbstract3DGraph::SelectionItem),
@@ -576,7 +577,8 @@ void Abstract3DController::addInputHandler(QAbstract3DInputHandler *inputHandler
     Q_ASSERT(inputHandler);
     Abstract3DController *owner = qobject_cast<Abstract3DController *>(inputHandler->parent());
     if (owner != this) {
-        Q_ASSERT_X(!owner, "addInputHandler", "Input handler already attached to another component.");
+        Q_ASSERT_X(!owner, "addInputHandler",
+                   "Input handler already attached to another component.");
         inputHandler->setParent(this);
     }
 
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 350da1fc..50ae097b 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -103,7 +103,8 @@ void Abstract3DRenderer::render(const GLuint defaultFboHandle)
     // Measure speed (as milliseconds per frame)
     m_numFrames++;
     if (m_lastFrameTime.elapsed() >= 1000) { // print only if last measurement was more than 1s ago
-        qDebug() << float(m_lastFrameTime.elapsed()) / float(m_numFrames) << "ms/frame (=" << float(m_numFrames) << "fps)";
+        qDebug() << float(m_lastFrameTime.elapsed()) / float(m_numFrames) << "ms/frame (="
+                 << float(m_numFrames) << "fps)";
         m_numFrames = 0;
         m_lastFrameTime.restart();
     }
@@ -152,7 +153,8 @@ void Abstract3DRenderer::updateInputPosition(const QPoint &position)
     m_inputPosition = position;
 }
 
-void Abstract3DRenderer::initGradientShaders(const QString &vertexShader, const QString &fragmentShader)
+void Abstract3DRenderer::initGradientShaders(const QString &vertexShader,
+                                             const QString &fragmentShader)
 {
     // Do nothing by default
     Q_UNUSED(vertexShader)
@@ -192,7 +194,6 @@ void Abstract3DRenderer::updateScene(Q3DScene *scene)
     updateInputPosition(QPoint(logicalPixelPosition.x() * m_devicePixelRatio,
                                logicalPixelPosition.y() * m_devicePixelRatio));
 
-
     // Synchronize the renderer scene to controller scene
     scene->d_ptr->sync(*m_cachedScene->d_ptr);
 
@@ -285,39 +286,46 @@ void Abstract3DRenderer::handleResize()
 #endif
 }
 
-void Abstract3DRenderer::updateAxisType(QAbstract3DAxis::AxisOrientation orientation, QAbstract3DAxis::AxisType type)
+void Abstract3DRenderer::updateAxisType(QAbstract3DAxis::AxisOrientation orientation,
+                                        QAbstract3DAxis::AxisType type)
 {
     axisCacheForOrientation(orientation).setType(type);
 }
 
-void Abstract3DRenderer::updateAxisTitle(QAbstract3DAxis::AxisOrientation orientation, const QString &title)
+void Abstract3DRenderer::updateAxisTitle(QAbstract3DAxis::AxisOrientation orientation,
+                                         const QString &title)
 {
     axisCacheForOrientation(orientation).setTitle(title);
 }
 
-void Abstract3DRenderer::updateAxisLabels(QAbstract3DAxis::AxisOrientation orientation, const QStringList &labels)
+void Abstract3DRenderer::updateAxisLabels(QAbstract3DAxis::AxisOrientation orientation,
+                                          const QStringList &labels)
 {
     axisCacheForOrientation(orientation).setLabels(labels);
 }
 
-void Abstract3DRenderer::updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min, float max)
+void Abstract3DRenderer::updateAxisRange(QAbstract3DAxis::AxisOrientation orientation,
+                                         float min, float max)
 {
     AxisRenderCache &cache = axisCacheForOrientation(orientation);
     cache.setMin(min);
     cache.setMax(max);
 }
 
-void Abstract3DRenderer::updateAxisSegmentCount(QAbstract3DAxis::AxisOrientation orientation, int count)
+void Abstract3DRenderer::updateAxisSegmentCount(QAbstract3DAxis::AxisOrientation orientation,
+                                                int count)
 {
     axisCacheForOrientation(orientation).setSegmentCount(count);
 }
 
-void Abstract3DRenderer::updateAxisSubSegmentCount(QAbstract3DAxis::AxisOrientation orientation, int count)
+void Abstract3DRenderer::updateAxisSubSegmentCount(QAbstract3DAxis::AxisOrientation orientation,
+                                                   int count)
 {
     axisCacheForOrientation(orientation).setSubSegmentCount(count);
 }
 
-void Abstract3DRenderer::updateAxisLabelFormat(QAbstract3DAxis::AxisOrientation orientation, const QString &format)
+void Abstract3DRenderer::updateAxisLabelFormat(QAbstract3DAxis::AxisOrientation orientation,
+                                               const QString &format)
 {
     axisCacheForOrientation(orientation).setLabelFormat(format);
 }
@@ -354,7 +362,7 @@ void Abstract3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesLi
     }
     foreach (QAbstract3DSeries *current, seriesList) {
         if (current->isVisible()) {
-             // Item selection label may need update
+            // Item selection label may need update
             if (current->d_ptr->m_changeTracker.nameChanged
                     || current->d_ptr->m_changeTracker.itemLabelFormatChanged) {
                 m_selectionLabelDirty = true;
@@ -364,7 +372,8 @@ void Abstract3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesLi
     }
 }
 
-AxisRenderCache &Abstract3DRenderer::axisCacheForOrientation(QAbstract3DAxis::AxisOrientation orientation)
+AxisRenderCache &Abstract3DRenderer::axisCacheForOrientation(
+        QAbstract3DAxis::AxisOrientation orientation)
 {
     switch (orientation) {
     case QAbstract3DAxis::AxisOrientationX:
@@ -417,7 +426,8 @@ void Abstract3DRenderer::lowerShadowQuality()
     updateShadowQuality(newQuality);
 }
 
-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/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h
index f9dd56d8..87c31dae 100644
--- a/src/datavisualization/engine/abstract3drenderer_p.h
+++ b/src/datavisualization/engine/abstract3drenderer_p.h
@@ -29,9 +29,12 @@
 #ifndef ABSTRACT3DRENDERER_P_H
 #define ABSTRACT3DRENDERER_P_H
 
+//#define DISPLAY_RENDER_SPEED
+
 #include <QtGui/QOpenGLFunctions>
-#include <QtGui/QFont>
+#ifdef DISPLAY_RENDER_SPEED
 #include <QTime>
+#endif
 
 #include "datavisualizationglobal_p.h"
 #include "abstract3dcontroller_p.h"
@@ -39,8 +42,6 @@
 #include "qabstractdataproxy.h"
 #include "seriesrendercache_p.h"
 
-//#define DISPLAY_RENDER_SPEED
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class TextureHelper;
@@ -154,4 +155,4 @@ protected:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // ABSTRACT3DRENDERER_P_H
+#endif
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index b0627377..95fb36b9 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -406,7 +406,8 @@ bool Bars3DController::isBarSpecRelative()
 void Bars3DController::setSelectionMode(QAbstract3DGraph::SelectionFlags mode)
 {
     if (mode.testFlag(QAbstract3DGraph::SelectionSlice)
-            && (mode.testFlag(QAbstract3DGraph::SelectionRow) == mode.testFlag(QAbstract3DGraph::SelectionColumn))) {
+            && (mode.testFlag(QAbstract3DGraph::SelectionRow)
+                == mode.testFlag(QAbstract3DGraph::SelectionColumn))) {
         qWarning("Must specify one of either row or column selection mode in conjunction with slicing mode.");
     } else {
         QAbstract3DGraph::SelectionFlags oldMode = selectionMode();
diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h
index 54520b32..191007b7 100644
--- a/src/datavisualization/engine/bars3dcontroller_p.h
+++ b/src/datavisualization/engine/bars3dcontroller_p.h
@@ -32,8 +32,6 @@
 #include "datavisualizationglobal_p.h"
 #include "abstract3dcontroller_p.h"
 
-//#define DISPLAY_RENDER_SPEED
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Bars3DRenderer;
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 7470f0cf..ada9f660 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -876,19 +876,6 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
         // Disable drawing to depth framebuffer (= enable drawing to screen)
         glBindFramebuffer(GL_FRAMEBUFFER, defaultFboHandle);
 
-#if 0 // Use this if you want to see what is being drawn to the framebuffer
-        // You'll also have to comment out GL_COMPARE_R_TO_TEXTURE -line in texturehelper (if using it)
-        m_labelShader->bind();
-        glCullFace(GL_BACK);
-        glEnable(GL_TEXTURE_2D);
-        QMatrix4x4 modelMatrix;
-        QMatrix4x4 viewmatrix;
-        viewmatrix.lookAt(QVector3D(0.0f, 0.0f, 2.5f), zeroVector, upVector);
-        QMatrix4x4 MVPMatrix = projectionViewMatrix * modelMatrix;
-        m_labelShader->setUniformValue(m_labelShader->MVP(), MVPMatrix);
-        m_drawer->drawObject(m_labelShader, m_labelObj, m_depthTexture);
-        glDisable(GL_TEXTURE_2D);
-#endif
         // Reset culling to normal
         glCullFace(GL_BACK);
 
@@ -945,15 +932,9 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
 
                     MVPMatrix = projectionViewMatrix * modelMatrix;
 
-                    //#if !defined(QT_OPENGL_ES_2)
-                    //                QVector3D barColor = QVector3D(GLfloat(row) / 32767.0f,
-                    //                                               GLfloat(bar) / 32767.0f,
-                    //                                               0.0f);
-                    //#else
                     QVector3D barColor = QVector3D(GLfloat(row) / 255.0f,
                                                    GLfloat(bar) / 255.0f,
                                                    GLfloat(series) / 255.0f);
-                    //#endif
 
                     m_selectionShader->setUniformValue(m_selectionShader->MVP(), MVPMatrix);
                     m_selectionShader->setUniformValue(m_selectionShader->color(), barColor);
@@ -1158,7 +1139,8 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                         lightStrength = m_cachedTheme->highlightLightStrength();
                         shadowLightStrength = adjustedHighlightStrength;
                         // Insert position data into render item. We have no ownership, don't delete the previous one
-                        if (!m_cachedIsSlicingActivated && m_visualSelectedBarSeriesIndex == series) {
+                        if (!m_cachedIsSlicingActivated
+                                && m_visualSelectedBarSeriesIndex == series) {
                             selectedBar = &item;
                             selectedBar->setPosition(QPoint(row, bar));
                             item.setTranslation(modelMatrix.column(3).toVector3D());
@@ -1419,7 +1401,8 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
 #endif
         {
             // Set shadowless shader bindings
-            lineShader->setUniformValue(lineShader->lightS(), m_cachedTheme->lightStrength() / 2.5f);
+            lineShader->setUniformValue(lineShader->lightS(),
+                                        m_cachedTheme->lightStrength() / 2.5f);
         }
 
         GLfloat yFloorLinePosition = 0.0f;
@@ -1648,7 +1631,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
     for (int row = 0; row != m_cachedRowCount; row++) {
         if (m_axisCacheZ.labelItems().size() > row) {
             // Go through all rows and get position of max+1 or min-1 column, depending on x flip
-            // We need only positions for them, labels have already been generated at QDataSetPrivate. Just add LabelItems
+            // We need only positions for them, labels have already been generated
             rowPos = (row + 0.5f) * m_cachedBarSpacing.height();
             if (m_xFlipped)
                 colPos = -colPosValue;
@@ -1685,7 +1668,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
     for (int column = 0; column != m_cachedColumnCount; column++) {
         if (m_axisCacheX.labelItems().size() > column) {
             // Go through all columns and get position of max+1 or min-1 row, depending on z flip
-            // We need only positions for them, labels have already been generated at QDataSetPrivate. Just add LabelItems
+            // We need only positions for them, labels have already been generated
             colPos = (column + 0.5f) * m_cachedBarSpacing.width();
             if (m_zFlipped)
                 rowPos = -rowPosValue;
diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h
index a300aa80..353ead44 100644
--- a/src/datavisualization/engine/bars3drenderer_p.h
+++ b/src/datavisualization/engine/bars3drenderer_p.h
@@ -128,7 +128,8 @@ public slots:
     void resetClickedStatus();
 
     // Overloaded from abstract renderer
-    virtual void updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min, float max);
+    virtual void updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min,
+                                 float max);
 
 private:
     virtual void initShaders(const QString &vertexShader, const QString &fragmentShader);
diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp
index 2fb8d81f..4cb614a7 100644
--- a/src/datavisualization/engine/drawer.cpp
+++ b/src/datavisualization/engine/drawer.cpp
@@ -294,12 +294,12 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte
     }
     case Qt::AlignHCenter: {
         xAlignment = (-(GLfloat)textureSize.width() * scaleFactor) * cosRotZ
-                      - ((GLfloat)textureSize.height() * scaleFactor) * sinRotZ;
+                - ((GLfloat)textureSize.height() * scaleFactor) * sinRotZ;
         break;
     }
     case Qt::AlignVCenter: {
         yAlignment = ((GLfloat)textureSize.width() * scaleFactor) * cosRotZ
-                      + ((GLfloat)textureSize.height() * scaleFactor) * sinRotZ;
+                + ((GLfloat)textureSize.height() * scaleFactor) * sinRotZ;
         break;
     }
     default: {
diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index a5b1dc3e..3cc4de0d 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -191,7 +191,8 @@ QList<QBar3DSeries *> Q3DBars::seriesList()
 void Q3DBars::setBarThickness(float thicknessRatio)
 {
     if (thicknessRatio != barThickness()) {
-        dptr()->m_shared->setBarSpecs(GLfloat(thicknessRatio), barSpacing(), isBarSpacingRelative());
+        dptr()->m_shared->setBarSpecs(GLfloat(thicknessRatio), barSpacing(),
+                                      isBarSpacingRelative());
         emit barThicknessChanged(thicknessRatio);
     }
 }
diff --git a/src/datavisualization/engine/q3dbox.cpp b/src/datavisualization/engine/q3dbox.cpp
index e9fd3fd8..3be7dc7b 100644
--- a/src/datavisualization/engine/q3dbox.cpp
+++ b/src/datavisualization/engine/q3dbox.cpp
@@ -480,6 +480,6 @@ QDataStream &operator>>(QDataStream &stream, Q3DBox &box)
     return stream;
 }
 
-#endif // QT_NO_DATASTREAM
+#endif
 
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/q3dbox.h b/src/datavisualization/engine/q3dbox.h
index e18466f3..4fd4b8f3 100644
--- a/src/datavisualization/engine/q3dbox.h
+++ b/src/datavisualization/engine/q3dbox.h
@@ -19,6 +19,7 @@
 #ifndef Q3DBOX_H
 #define Q3DBOX_H
 
+#include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtGui/QMatrix4x4>
 #include <QtGui/QVector3D>
 
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index 4c4d2851..eb65b52d 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -134,7 +134,6 @@ signals:
     void wrapYRotationChanged(bool isEnabled);
 
 private:
-    // To be exposed in the future
     void setMinXRotation(float rotation);
     void setMinYRotation(float rotation);
     void setMaxXRotation(float rotation);
@@ -159,4 +158,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // Q3DCAMERA_H
+#endif
diff --git a/src/datavisualization/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h
index 555d5cd9..5b67af66 100644
--- a/src/datavisualization/engine/q3dcamera_p.h
+++ b/src/datavisualization/engine/q3dcamera_p.h
@@ -84,4 +84,4 @@ public:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // Q3DCAMERA_P_H
+#endif
diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h
index f37c0983..31c9d6a5 100644
--- a/src/datavisualization/engine/q3dlight.h
+++ b/src/datavisualization/engine/q3dlight.h
@@ -45,4 +45,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // Q3DLIGHT_H
+#endif
diff --git a/src/datavisualization/engine/q3dlight_p.h b/src/datavisualization/engine/q3dlight_p.h
index c68956ad..b6c1937a 100644
--- a/src/datavisualization/engine/q3dlight_p.h
+++ b/src/datavisualization/engine/q3dlight_p.h
@@ -51,7 +51,7 @@ public:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // Q3DLIGHT_P_H
+#endif
 
 
 
diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h
index da83709a..5ad45640 100644
--- a/src/datavisualization/engine/q3dobject.h
+++ b/src/datavisualization/engine/q3dobject.h
@@ -62,4 +62,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // Q3DOBJECT_H
+#endif
diff --git a/src/datavisualization/engine/q3dobject_p.h b/src/datavisualization/engine/q3dobject_p.h
index 90de8604..37229a14 100644
--- a/src/datavisualization/engine/q3dobject_p.h
+++ b/src/datavisualization/engine/q3dobject_p.h
@@ -50,4 +50,4 @@ public:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // Q3DOBJECT_P_H
+#endif
diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp
index d2cf9c58..19672484 100644
--- a/src/datavisualization/engine/q3dscene.cpp
+++ b/src/datavisualization/engine/q3dscene.cpp
@@ -208,8 +208,10 @@ bool Q3DScene::isPointInPrimarySubView(const QPoint &point)
     int x = point.x();
     int y = point.y();
     int areaMinX = d_ptr->m_primarySubViewport.x();
-    int areaMaxX = d_ptr->m_viewport.x() + d_ptr->m_primarySubViewport.x() + d_ptr->m_primarySubViewport.width();
-    int areaMaxY = d_ptr->m_viewport.y() + d_ptr->m_primarySubViewport.y() + d_ptr->m_primarySubViewport.height();
+    int areaMaxX = d_ptr->m_viewport.x() + d_ptr->m_primarySubViewport.x()
+            + d_ptr->m_primarySubViewport.width();
+    int areaMaxY = d_ptr->m_viewport.y() + d_ptr->m_primarySubViewport.y()
+            + d_ptr->m_primarySubViewport.height();
     int areaMinY = d_ptr->m_viewport.y() + d_ptr->m_primarySubViewport.y();
 
     return ( x > areaMinX && x < areaMaxX && y > areaMinY && y < areaMaxY );
@@ -226,8 +228,10 @@ bool Q3DScene::isPointInSecondarySubView(const QPoint &point)
     int x = point.x();
     int y = point.y();
     int areaMinX = d_ptr->m_secondarySubViewport.x();
-    int areaMaxX = d_ptr->m_viewport.x() + d_ptr->m_secondarySubViewport.x() + d_ptr->m_secondarySubViewport.width();
-    int areaMaxY = d_ptr->m_viewport.y() + d_ptr->m_secondarySubViewport.y() + d_ptr->m_secondarySubViewport.height();
+    int areaMaxX = d_ptr->m_viewport.x() + d_ptr->m_secondarySubViewport.x()
+            + d_ptr->m_secondarySubViewport.width();
+    int areaMaxY = d_ptr->m_viewport.y() + d_ptr->m_secondarySubViewport.y()
+            + d_ptr->m_secondarySubViewport.height();
     int areaMinY = d_ptr->m_viewport.y() + d_ptr->m_secondarySubViewport.y();
 
     return ( x > areaMinX && x < areaMaxX && y > areaMinY && y < areaMaxY );
@@ -607,7 +611,8 @@ void Q3DScenePrivate::updateGLViewport()
 {
     // Update GL viewport
     m_glViewport.setX(m_viewport.x() * m_devicePixelRatio);
-    m_glViewport.setY((m_windowSize.height() - (m_viewport.y() + m_viewport.height())) * m_devicePixelRatio);
+    m_glViewport.setY((m_windowSize.height() - (m_viewport.y() + m_viewport.height()))
+                      * m_devicePixelRatio);
     m_glViewport.setWidth(m_viewport.width() * m_devicePixelRatio);
     m_glViewport.setHeight(m_viewport.height() * m_devicePixelRatio);
 
@@ -622,12 +627,17 @@ void Q3DScenePrivate::updateGLViewport()
 void Q3DScenePrivate::updateGLSubViewports()
 {
     m_glPrimarySubViewport.setX((m_primarySubViewport.x() + m_viewport.x()) * m_devicePixelRatio);
-    m_glPrimarySubViewport.setY((m_windowSize.height() - (m_primarySubViewport.y() + m_viewport.y() + m_primarySubViewport.height())) * m_devicePixelRatio);
+    m_glPrimarySubViewport.setY((m_windowSize.height() - (m_primarySubViewport.y() + m_viewport.y()
+                                                          + m_primarySubViewport.height()))
+                                * m_devicePixelRatio);
     m_glPrimarySubViewport.setWidth(m_primarySubViewport.width() * m_devicePixelRatio);
     m_glPrimarySubViewport.setHeight(m_primarySubViewport.height() * m_devicePixelRatio);
 
     m_glSecondarySubViewport.setX(m_secondarySubViewport.x() * m_devicePixelRatio);
-    m_glSecondarySubViewport.setY((m_windowSize.height() - (m_secondarySubViewport.y() + m_viewport.y() + m_secondarySubViewport.height())) * m_devicePixelRatio);
+    m_glSecondarySubViewport.setY((m_windowSize.height() - (m_secondarySubViewport.y()
+                                                            + m_viewport.y()
+                                                            + m_secondarySubViewport.height()))
+                                  * m_devicePixelRatio);
     m_glSecondarySubViewport.setWidth(m_secondarySubViewport.width() * m_devicePixelRatio);
     m_glSecondarySubViewport.setHeight(m_secondarySubViewport.height() * m_devicePixelRatio);
 }
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index 8f9ee7b3..c181e18a 100644
--- a/src/datavisualization/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -110,4 +110,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // Q3DSCENE_H
+#endif
diff --git a/src/datavisualization/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h
index 3ba1c2df..2201049a 100644
--- a/src/datavisualization/engine/q3dscene_p.h
+++ b/src/datavisualization/engine/q3dscene_p.h
@@ -112,4 +112,4 @@ public:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // Q3DSCENE_P_H
+#endif
diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp
index a9b9e3d3..8ff46791 100644
--- a/src/datavisualization/engine/q3dsurface.cpp
+++ b/src/datavisualization/engine/q3dsurface.cpp
@@ -262,7 +262,7 @@ QList<QValue3DAxis *> Q3DSurface::axes() const
     return retList;
 }
 
-/////////////////// PRIVATE ///////////////////////////////////
+// Q3DSurfacePrivate
 
 Q3DSurfacePrivate::Q3DSurfacePrivate(Q3DSurface *q)
     : QAbstract3DGraphPrivate(q)
diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h
index e8158f65..772b0441 100644
--- a/src/datavisualization/engine/q3dsurface.h
+++ b/src/datavisualization/engine/q3dsurface.h
@@ -68,4 +68,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // Q3DSURFACE_H
+#endif
diff --git a/src/datavisualization/engine/q3dsurface_p.h b/src/datavisualization/engine/q3dsurface_p.h
index acaf76d3..5275020b 100644
--- a/src/datavisualization/engine/q3dsurface_p.h
+++ b/src/datavisualization/engine/q3dsurface_p.h
@@ -56,4 +56,4 @@ public:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // Q3DSURFACE_P_H
+#endif
diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h
index 2e9ade44..f484f830 100644
--- a/src/datavisualization/engine/scatter3dcontroller_p.h
+++ b/src/datavisualization/engine/scatter3dcontroller_p.h
@@ -32,8 +32,6 @@
 #include "datavisualizationglobal_p.h"
 #include "abstract3dcontroller_p.h"
 
-//#define DISPLAY_RENDER_SPEED
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Scatter3DRenderer;
@@ -105,7 +103,8 @@ public:
     virtual void removeSeries(QAbstract3DSeries *series);
     virtual QList<QScatter3DSeries *> scatterSeriesList();
 
-    virtual void handleAxisAutoAdjustRangeChangedInOrientation(QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust);
+    virtual void handleAxisAutoAdjustRangeChangedInOrientation(
+            QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust);
     virtual void handleAxisRangeChangedBySender(QObject *sender);
     virtual void handleSeriesVisibilityChangedBySender(QObject *sender);
     virtual void handlePendingClick();
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 073644db..0edaee60 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -227,7 +227,7 @@ void Scatter3DRenderer::updateScene(Q3DScene *scene)
     scene->activeCamera()->setMinYRotation(-90.0f);
 
     if (m_hasHeightAdjustmentChanged) {
-        // Set initial m_cachedScene->activeCamera() position. Also update if height adjustment has changed.
+        // Set initial camera position. Also update if height adjustment has changed.
         scene->activeCamera()->setBaseOrientation(cameraDistanceVector, zeroVector, upVector);
         m_hasHeightAdjustmentChanged = false;
     }
@@ -437,19 +437,6 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                    m_primarySubViewport.y(),
                    m_primarySubViewport.width(),
                    m_primarySubViewport.height());
-
-#if 0 // Use this if you want to see what is being drawn to the framebuffer
-        // You'll also have to comment out GL_COMPARE_R_TO_TEXTURE -line in texturehelper (if using it)
-        m_labelShader->bind();
-        glEnable(GL_TEXTURE_2D);
-        QMatrix4x4 modelMatrix;
-        QMatrix4x4 viewmatrix;
-        viewmatrix.lookAt(QVector3D(0.0f, 0.0f, 2.5f), zeroVector, upVector);
-        QMatrix4x4 MVPMatrix = projectionViewMatrix * modelMatrix;
-        m_labelShader->setUniformValue(m_labelShader->MVP(), MVPMatrix);
-        m_drawer->drawObject(m_labelShader, m_labelObj, m_depthTexture);
-        glDisable(GL_TEXTURE_2D);
-#endif
     }
 
     ShaderHelper *pointSelectionShader = m_selectionShader;
@@ -571,19 +558,6 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                    m_primarySubViewport.y(),
                    m_primarySubViewport.width(),
                    m_primarySubViewport.height());
-
-#if 0 // Use this if you want to see what is being drawn to the framebuffer
-        m_labelShader->bind();
-        glDisable(GL_DEPTH_TEST);
-        glEnable(GL_TEXTURE_2D);
-        QMatrix4x4 modelMatrix;
-        QMatrix4x4 viewmatrix;
-        viewmatrix.lookAt(QVector3D(0.0f, 0.0f, 2.0f), zeroVector, upVector);
-        QMatrix4x4 MVPMatrix = projectionViewMatrix * modelMatrix;
-        m_labelShader->setUniformValue(m_labelShader->MVP(), MVPMatrix);
-        m_drawer->drawObject(m_labelShader, m_labelObj, m_selectionTexture);
-        glDisable(GL_TEXTURE_2D);
-#endif
     }
 
     // Draw dots
diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h
index d21f56a0..d2b52a56 100644
--- a/src/datavisualization/engine/scatter3drenderer_p.h
+++ b/src/datavisualization/engine/scatter3drenderer_p.h
@@ -142,13 +142,15 @@ private:
 
 public slots:
     // Overloaded from abstract renderer
-    virtual void updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min, float max);
+    virtual void updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min,
+                                 float max);
 
     void updateSelectedItem(int index, const QScatter3DSeries *series);
 
 private:
     QVector3D indexToSelectionColor(GLint index);
-    void selectionColorToSeriesAndIndex(const QVector3D &color, int &index, QAbstract3DSeries *&series);
+    void selectionColorToSeriesAndIndex(const QVector3D &color, int &index,
+                                        QAbstract3DSeries *&series);
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp
index 9cc13224..85fb2b71 100644
--- a/src/datavisualization/engine/selectionpointer.cpp
+++ b/src/datavisualization/engine/selectionpointer.cpp
@@ -22,16 +22,12 @@
 #include "objecthelper_p.h"
 #include "texturehelper_p.h"
 #include "q3dcamera.h"
-#include "q3dcamera_p.h"
 #include "drawer_p.h"
 #include "utils_p.h"
 #include "q3dlight.h"
 
-#include <QImage>
 #include <QMatrix4x4>
 
-#include <QDebug>
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 const GLfloat sliceUnits = 2.5;
diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h
index c6295fa5..12317943 100644
--- a/src/datavisualization/engine/selectionpointer_p.h
+++ b/src/datavisualization/engine/selectionpointer_p.h
@@ -26,30 +26,22 @@
 //
 // We mean it.
 
-#ifndef NOTIFICATIONLABEL_P_H
-#define NOTIFICATIONLABEL_P_H
+#ifndef SELECTIONPOINTER_P_H
+#define SELECTIONPOINTER_P_H
 
-#include <QtCore/QObject>
-#include <QtGui/QOpenGLFunctions>
-#include <QtGui/QFont>
-#include <QWindow>
 #include <QVector3D>
 
 #include "q3dscene.h"
 #include "datavisualizationglobal_p.h"
 #include "surface3dcontroller_p.h"
 
-class QOpenGLShaderProgram;
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class ShaderHelper;
 class ObjectHelper;
 class SurfaceObject;
 class TextureHelper;
-class Theme;
 class Drawer;
-class Q3DCamera;
 
 class SelectionPointer : public QObject, protected QOpenGLFunctions
 {
@@ -95,4 +87,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // NOTIFICATIONLABEL_P_H
+#endif
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index 979d615a..89357e41 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -89,7 +89,8 @@ void Surface3DController::synchDataToRenderer()
     }
 }
 
-void Surface3DController::handleAxisAutoAdjustRangeChangedInOrientation(QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust)
+void Surface3DController::handleAxisAutoAdjustRangeChangedInOrientation(
+        QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust)
 {
     Q_UNUSED(orientation)
     Q_UNUSED(autoAdjust)
diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index 85a32564..e98fd906 100644
--- a/src/datavisualization/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -32,7 +32,6 @@
 #include "abstract3dcontroller_p.h"
 #include "datavisualizationglobal_p.h"
 
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Surface3DRenderer;
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 2cf56103..286477df 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -232,7 +232,8 @@ void Surface3DRenderer::updateData()
             }
             for (int i = 0; i < sampleSpace.height(); i++) {
                 for (int j = 0; j < sampleSpace.width(); j++)
-                    (*(m_dataArray.at(i)))[j] = array->at(i + sampleSpace.y())->at(j + sampleSpace.x());
+                    (*(m_dataArray.at(i)))[j] = array->at(i + sampleSpace.y())->at(
+                            j + sampleSpace.x());
             }
 
             if (m_dataArray.size() > 0) {
@@ -273,7 +274,8 @@ void Surface3DRenderer::updateData()
     updateSelectedPoint(m_selectedPoint, m_selectedSeries);
 }
 
-void Surface3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesList, bool updateVisibility)
+void Surface3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesList,
+                                     bool updateVisibility)
 {
     Abstract3DRenderer::updateSeries(seriesList, updateVisibility);
 
@@ -295,7 +297,8 @@ void Surface3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesLis
         if (m_uniformGradientTextureColor != seriesColor)
             generateUniformGradient(seriesColor);
         if (m_selectionPointer) {
-            m_selectionPointer->setHighlightColor(Utils::vectorFromColor(series->singleHighlightColor()));
+            m_selectionPointer->setHighlightColor(
+                        Utils::vectorFromColor(series->singleHighlightColor()));
             // Make sure selection pointer object reference is still good
             m_selectionPointer->setPointerObject(m_visibleSeriesList.at(0).object());
         }
@@ -313,8 +316,8 @@ void Surface3DRenderer::updateRows(const QVector<int> &rows)
             array = dataProxy->array();
     }
 
-    if (array && array->size() >= 2 && array->at(0)->size() >= 2 &&
-        m_sampleSpace.width() >= 2 && m_sampleSpace.height() >= 2) {
+    if (array && array->size() >= 2 && array->at(0)->size() >= 2
+            && m_sampleSpace.width() >= 2 && m_sampleSpace.height() >= 2) {
         bool updateBuffers = false;
         int sampleSpaceTop = m_sampleSpace.y() + m_sampleSpace.height();
         foreach (int row, rows) {
@@ -325,10 +328,12 @@ void Surface3DRenderer::updateRows(const QVector<int> &rows)
                         array->at(row)->at(j + m_sampleSpace.x());
 
                 if (m_cachedFlatShading) {
-                    m_surfaceObj->updateCoarseRow(m_dataArray, row - m_sampleSpace.y(), m_heightNormalizer,
+                    m_surfaceObj->updateCoarseRow(m_dataArray, row - m_sampleSpace.y(),
+                                                  m_heightNormalizer,
                                                   m_axisCacheY.min());
                 } else {
-                    m_surfaceObj->updateSmoothRow(m_dataArray, row - m_sampleSpace.y(), m_heightNormalizer,
+                    m_surfaceObj->updateSmoothRow(m_dataArray, row - m_sampleSpace.y(),
+                                                  m_heightNormalizer,
                                                   m_axisCacheY.min());
                 }
             }
@@ -351,23 +356,25 @@ void Surface3DRenderer::updateItem(const QVector<QPoint> &points)
             array = dataProxy->array();
     }
 
-    if (array && array->size() >= 2 && array->at(0)->size() >= 2 &&
-        m_sampleSpace.width() >= 2 && m_sampleSpace.height() >= 2) {
+    if (array && array->size() >= 2 && array->at(0)->size() >= 2
+            && m_sampleSpace.width() >= 2 && m_sampleSpace.height() >= 2) {
         int sampleSpaceTop = m_sampleSpace.y() + m_sampleSpace.height();
         int sampleSpaceRight = m_sampleSpace.x() + m_sampleSpace.width();
         bool updateBuffers = false;
         foreach (QPoint item, points) {
             if (item.y() <= sampleSpaceTop && item.y() >= m_sampleSpace.y() &&
-                item.x() <= sampleSpaceRight && item.x() >= m_sampleSpace.x()) {
+                    item.x() <= sampleSpaceRight && item.x() >= m_sampleSpace.x()) {
                 updateBuffers = true;
                 int x = item.x() - m_sampleSpace.x();
                 int y = item.y() - m_sampleSpace.y();
                 (*(m_dataArray.at(y)))[x] = array->at(item.y())->at(item.x());
 
                 if (m_cachedFlatShading) {
-                    m_surfaceObj->updateCoarseItem(m_dataArray, y, x, m_heightNormalizer, m_axisCacheY.min());
+                    m_surfaceObj->updateCoarseItem(m_dataArray, y, x, m_heightNormalizer,
+                                                   m_axisCacheY.min());
                 } else {
-                    m_surfaceObj->updateSmoothItem(m_dataArray, y, x, m_heightNormalizer, m_axisCacheY.min());
+                    m_surfaceObj->updateSmoothItem(m_dataArray, y, x, m_heightNormalizer,
+                                                   m_axisCacheY.min());
                 }
             }
         }
@@ -410,8 +417,10 @@ void Surface3DRenderer::updateSliceDataModel(const QPoint &point)
 
     // Make a duplicate, so that we get a little bit depth
     QSurfaceDataRow *duplicateRow = new QSurfaceDataRow(*sliceRow);
-    for (int i = 0; i < sliceRow->size(); i++)
-        (*sliceRow)[i].setPosition(QVector3D(sliceRow->at(i).x(), sliceRow->at(i).y() - stepDown, 1.0f));
+    for (int i = 0; i < sliceRow->size(); i++) {
+        (*sliceRow)[i].setPosition(QVector3D(sliceRow->at(i).x(), sliceRow->at(i).y() - stepDown,
+                                             1.0f));
+    }
 
     m_sliceDataArray << duplicateRow;
 
@@ -570,7 +579,8 @@ void Surface3DRenderer::drawSlicedScene()
     // Set up projection matrix
     QMatrix4x4 projectionMatrix;
 
-    GLfloat aspect = (GLfloat)m_secondarySubViewport.width() / (GLfloat)m_secondarySubViewport.height();
+    GLfloat aspect = (GLfloat)m_secondarySubViewport.width()
+            / (GLfloat)m_secondarySubViewport.height();
     projectionMatrix.ortho(-sliceUnits * aspect, sliceUnits * aspect,
                            -sliceUnits, sliceUnits, -1.0f, 4.0f);
 
@@ -666,7 +676,8 @@ void Surface3DRenderer::drawSlicedScene()
         lineShader->setUniformValue(lineShader->lightP(), lightPos);
         lineShader->setUniformValue(lineShader->view(), viewMatrix);
         lineShader->setUniformValue(lineShader->color(), lineColor);
-        lineShader->setUniformValue(lineShader->ambientS(), m_cachedTheme->ambientLightStrength() * 2.3f);
+        lineShader->setUniformValue(lineShader->ambientS(),
+                                    m_cachedTheme->ambientLightStrength() * 2.3f);
         lineShader->setUniformValue(lineShader->lightS(), 0.0f);
         lineShader->setUniformValue(lineShader->lightColor(), lightColor);
 
@@ -970,21 +981,6 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
         // Reset culling to normal
         glEnable(GL_CULL_FACE);
         glCullFace(GL_BACK);
-
-#if 0 // Use this if you want to see what is being drawn to the framebuffer
-        // You'll also have to comment out GL_COMPARE_R_TO_TEXTURE -line in texturehelper (if using it)
-        {
-            m_labelShader->bind();
-            glEnable(GL_TEXTURE_2D);
-            QMatrix4x4 modelMatrix;
-            QMatrix4x4 viewmatrix;
-            viewmatrix.lookAt(QVector3D(0.0f, 0.0f, 2.5f), zeroVector, upVector);
-            QMatrix4x4 MVPMatrix = projectionMatrix * viewmatrix * modelMatrix;
-            m_labelShader->setUniformValue(m_labelShader->MVP(), MVPMatrix);
-            m_drawer->drawObject(m_labelShader, m_labelObj, m_depthTexture);
-            glDisable(GL_TEXTURE_2D);
-        }
-#endif
     }
 #endif
     // Enable texturing
diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h
index 3da50d53..890b9aaf 100644
--- a/src/datavisualization/engine/surface3drenderer_p.h
+++ b/src/datavisualization/engine/surface3drenderer_p.h
@@ -29,28 +29,17 @@
 #ifndef SURFACE3DRENDERER_P_H
 #define SURFACE3DRENDERER_P_H
 
-#include <QtCore/QSize>
-#include <QtCore/QObject>
-#include <QtGui/QOpenGLFunctions>
-#include <QtGui/QFont>
-#include <QWindow>
-
 #include "datavisualizationglobal_p.h"
 #include "surface3dcontroller_p.h"
 #include "abstract3drenderer_p.h"
 #include "scatterrenderitem_p.h"
 #include "qsurfacedataproxy.h"
 
-class QOpenGLShaderProgram;
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class ShaderHelper;
 class ObjectHelper;
 class SurfaceObject;
-class TextureHelper;
-class Theme;
-class Drawer;
 class Q3DScene;
 class SelectionPointer;
 
@@ -188,4 +177,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // SURFACE3DRENDERER_P_H
+#endif