Android and mingw compilation fixes

Change-Id: If51261a4806bb27e8ed1715a7b3d0070aa30e2bb
Change-Id: If51261a4806bb27e8ed1715a7b3d0070aa30e2bb
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>

8 files changed, 123 insertions, 62 deletions

diff --git a/src/datavis3d/data/qitemmodelbardataproxy.cpp b/src/datavis3d/data/qitemmodelbardataproxy.cpp
index 4b3ed020..17e4d0cc 100644
--- a/src/datavis3d/data/qitemmodelbardataproxy.cpp
+++ b/src/datavis3d/data/qitemmodelbardataproxy.cpp
@@ -70,7 +70,8 @@ QItemModelBarDataProxyPrivate::QItemModelBarDataProxyPrivate(QItemModelBarDataPr
       resolvePending(0)
 {
     m_resolveTimer.setSingleShot(true);
-    QObject::connect(&m_resolveTimer, &QTimer::timeout, this, &QItemModelBarDataProxyPrivate::handlePendingResolve);
+    QObject::connect(&m_resolveTimer, &QTimer::timeout,
+                     this, &QItemModelBarDataProxyPrivate::handlePendingResolve);
 }
 
 QItemModelBarDataProxyPrivate::~QItemModelBarDataProxyPrivate()
@@ -85,15 +86,24 @@ void QItemModelBarDataProxyPrivate::setItemModel(QAbstractItemModel *itemModel)
     m_itemModel = itemModel;
 
     if (!m_itemModel.isNull()) {
-        QObject::connect(m_itemModel, &QAbstractItemModel::columnsInserted, this, &QItemModelBarDataProxyPrivate::handleColumnsInserted);
-        QObject::connect(m_itemModel, &QAbstractItemModel::columnsMoved, this, &QItemModelBarDataProxyPrivate::handleColumnsMoved);
-        QObject::connect(m_itemModel, &QAbstractItemModel::columnsRemoved, this, &QItemModelBarDataProxyPrivate::handleColumnsRemoved);
-        QObject::connect(m_itemModel, &QAbstractItemModel::dataChanged, this, &QItemModelBarDataProxyPrivate::handleDataChanged);
-        QObject::connect(m_itemModel, &QAbstractItemModel::layoutChanged, this, &QItemModelBarDataProxyPrivate::handleLayoutChanged);
-        QObject::connect(m_itemModel, &QAbstractItemModel::modelReset, this, &QItemModelBarDataProxyPrivate::handleModelReset);
-        QObject::connect(m_itemModel, &QAbstractItemModel::rowsInserted, this, &QItemModelBarDataProxyPrivate::handleRowsInserted);
-        QObject::connect(m_itemModel, &QAbstractItemModel::rowsMoved, this, &QItemModelBarDataProxyPrivate::handleRowsMoved);
-        QObject::connect(m_itemModel, &QAbstractItemModel::rowsRemoved, this, &QItemModelBarDataProxyPrivate::handleRowsRemoved);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::columnsInserted,
+                         this, &QItemModelBarDataProxyPrivate::handleColumnsInserted);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::columnsMoved,
+                         this, &QItemModelBarDataProxyPrivate::handleColumnsMoved);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::columnsRemoved,
+                         this, &QItemModelBarDataProxyPrivate::handleColumnsRemoved);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::dataChanged,
+                         this, &QItemModelBarDataProxyPrivate::handleDataChanged);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::layoutChanged,
+                         this, &QItemModelBarDataProxyPrivate::handleLayoutChanged);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::modelReset,
+                         this, &QItemModelBarDataProxyPrivate::handleModelReset);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::rowsInserted,
+                         this, &QItemModelBarDataProxyPrivate::handleRowsInserted);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::rowsMoved,
+                         this, &QItemModelBarDataProxyPrivate::handleRowsMoved);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::rowsRemoved,
+                         this, &QItemModelBarDataProxyPrivate::handleRowsRemoved);
     }
     if (!m_resolveTimer.isActive())
         m_resolveTimer.start(0);
@@ -101,19 +111,24 @@ void QItemModelBarDataProxyPrivate::setItemModel(QAbstractItemModel *itemModel)
 
 void QItemModelBarDataProxyPrivate::setMapping(QItemModelBarDataMapping *mapping)
 {
-    if (!m_mapping.isNull())
-        QObject::disconnect(m_mapping.data(), &QItemModelBarDataMapping::mappingChanged, this, &QItemModelBarDataProxyPrivate::handleMappingChanged);
+    if (!m_mapping.isNull()) {
+        QObject::disconnect(m_mapping.data(), &QItemModelBarDataMapping::mappingChanged,
+                            this, &QItemModelBarDataProxyPrivate::handleMappingChanged);
+    }
 
     m_mapping = mapping;
 
-    if (!m_mapping.isNull())
-        QObject::connect(m_mapping.data(), &QItemModelBarDataMapping::mappingChanged, this, &QItemModelBarDataProxyPrivate::handleMappingChanged);
+    if (!m_mapping.isNull()) {
+        QObject::connect(m_mapping.data(), &QItemModelBarDataMapping::mappingChanged,
+                         this, &QItemModelBarDataProxyPrivate::handleMappingChanged);
+    }
 
     if (!m_resolveTimer.isActive())
         m_resolveTimer.start(0);
 }
 
-void QItemModelBarDataProxyPrivate::handleColumnsInserted(const QModelIndex &parent, int start, int end)
+void QItemModelBarDataProxyPrivate::handleColumnsInserted(const QModelIndex &parent,
+                                                          int start, int end)
 {
     Q_UNUSED(parent)
     Q_UNUSED(start)
@@ -124,7 +139,11 @@ void QItemModelBarDataProxyPrivate::handleColumnsInserted(const QModelIndex &par
         m_resolveTimer.start(0); // TODO Resolving entire model is inefficient
 }
 
-void QItemModelBarDataProxyPrivate::handleColumnsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)
+void QItemModelBarDataProxyPrivate::handleColumnsMoved(const QModelIndex &sourceParent,
+                                                       int sourceStart,
+                                                       int sourceEnd,
+                                                       const QModelIndex &destinationParent,
+                                                       int destinationColumn)
 {
     Q_UNUSED(sourceParent)
     Q_UNUSED(sourceStart)
@@ -137,7 +156,8 @@ void QItemModelBarDataProxyPrivate::handleColumnsMoved(const QModelIndex &source
         m_resolveTimer.start(0); // TODO Resolving entire model is inefficient
 }
 
-void QItemModelBarDataProxyPrivate::handleColumnsRemoved(const QModelIndex &parent, int start, int end)
+void QItemModelBarDataProxyPrivate::handleColumnsRemoved(const QModelIndex &parent,
+                                                         int start, int end)
 {
     Q_UNUSED(parent)
     Q_UNUSED(start)
@@ -148,7 +168,9 @@ void QItemModelBarDataProxyPrivate::handleColumnsRemoved(const QModelIndex &pare
         m_resolveTimer.start(0); // TODO Resolving entire model is inefficient
 }
 
-void QItemModelBarDataProxyPrivate::handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
+void QItemModelBarDataProxyPrivate::handleDataChanged(const QModelIndex &topLeft,
+                                                      const QModelIndex &bottomRight,
+                                                      const QVector<int> &roles)
 {
     Q_UNUSED(topLeft)
     Q_UNUSED(bottomRight)
@@ -159,7 +181,8 @@ void QItemModelBarDataProxyPrivate::handleDataChanged(const QModelIndex &topLeft
         m_resolveTimer.start(0); // TODO Resolving entire model is inefficient
 }
 
-void QItemModelBarDataProxyPrivate::handleLayoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint)
+void QItemModelBarDataProxyPrivate::handleLayoutChanged(const QList<QPersistentModelIndex> &parents,
+                                                        QAbstractItemModel::LayoutChangeHint hint)
 {
     Q_UNUSED(parents)
     Q_UNUSED(hint)
@@ -187,7 +210,11 @@ void QItemModelBarDataProxyPrivate::handleRowsInserted(const QModelIndex &parent
         m_resolveTimer.start(0); // TODO Resolving entire model is inefficient
 }
 
-void QItemModelBarDataProxyPrivate::handleRowsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)
+void QItemModelBarDataProxyPrivate::handleRowsMoved(const QModelIndex &sourceParent,
+                                                    int sourceStart,
+                                                    int sourceEnd,
+                                                    const QModelIndex &destinationParent,
+                                                    int destinationRow)
 {
     Q_UNUSED(sourceParent)
     Q_UNUSED(sourceStart)
@@ -277,7 +304,8 @@ void QItemModelBarDataProxyPrivate::resolveModel()
             newProxyArray->append(newProxyRow);
         }
     }
-    qDebug() << __FUNCTION__ << "RowCount:" << newProxyArray->size() << "Column count:" << (newProxyArray->size() ? newProxyArray->at(0)->size() : 0);
+    qDebug() << __FUNCTION__ << "RowCount:" << newProxyArray->size() << "Column count:"
+             << (newProxyArray->size() ? newProxyArray->at(0)->size() : 0);
 
     qptr()->resetArray(newProxyArray);
 }
diff --git a/src/datavis3d/data/qitemmodelmapdataproxy.cpp b/src/datavis3d/data/qitemmodelmapdataproxy.cpp
index b41384e9..f9ebd6c7 100644
--- a/src/datavis3d/data/qitemmodelmapdataproxy.cpp
+++ b/src/datavis3d/data/qitemmodelmapdataproxy.cpp
@@ -70,7 +70,8 @@ QItemModelMapDataProxyPrivate::QItemModelMapDataProxyPrivate(QItemModelMapDataPr
       resolvePending(0)
 {
     m_resolveTimer.setSingleShot(true);
-    QObject::connect(&m_resolveTimer, &QTimer::timeout, this, &QItemModelMapDataProxyPrivate::handlePendingResolve);
+    QObject::connect(&m_resolveTimer, &QTimer::timeout,
+                     this, &QItemModelMapDataProxyPrivate::handlePendingResolve);
 }
 
 QItemModelMapDataProxyPrivate::~QItemModelMapDataProxyPrivate()
@@ -85,15 +86,24 @@ void QItemModelMapDataProxyPrivate::setItemModel(QAbstractItemModel *itemModel)
     m_itemModel = itemModel;
 
     if (!m_itemModel.isNull()) {
-        QObject::connect(m_itemModel, &QAbstractItemModel::columnsInserted, this, &QItemModelMapDataProxyPrivate::handleColumnsInserted);
-        QObject::connect(m_itemModel, &QAbstractItemModel::columnsMoved, this, &QItemModelMapDataProxyPrivate::handleColumnsMoved);
-        QObject::connect(m_itemModel, &QAbstractItemModel::columnsRemoved, this, &QItemModelMapDataProxyPrivate::handleColumnsRemoved);
-        QObject::connect(m_itemModel, &QAbstractItemModel::dataChanged, this, &QItemModelMapDataProxyPrivate::handleDataChanged);
-        QObject::connect(m_itemModel, &QAbstractItemModel::layoutChanged, this, &QItemModelMapDataProxyPrivate::handleLayoutChanged);
-        QObject::connect(m_itemModel, &QAbstractItemModel::modelReset, this, &QItemModelMapDataProxyPrivate::handleModelReset);
-        QObject::connect(m_itemModel, &QAbstractItemModel::rowsInserted, this, &QItemModelMapDataProxyPrivate::handleRowsInserted);
-        QObject::connect(m_itemModel, &QAbstractItemModel::rowsMoved, this, &QItemModelMapDataProxyPrivate::handleRowsMoved);
-        QObject::connect(m_itemModel, &QAbstractItemModel::rowsRemoved, this, &QItemModelMapDataProxyPrivate::handleRowsRemoved);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::columnsInserted,
+                         this, &QItemModelMapDataProxyPrivate::handleColumnsInserted);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::columnsMoved,
+                         this, &QItemModelMapDataProxyPrivate::handleColumnsMoved);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::columnsRemoved,
+                         this, &QItemModelMapDataProxyPrivate::handleColumnsRemoved);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::dataChanged,
+                         this, &QItemModelMapDataProxyPrivate::handleDataChanged);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::layoutChanged,
+                         this, &QItemModelMapDataProxyPrivate::handleLayoutChanged);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::modelReset,
+                         this, &QItemModelMapDataProxyPrivate::handleModelReset);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::rowsInserted,
+                         this, &QItemModelMapDataProxyPrivate::handleRowsInserted);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::rowsMoved,
+                         this, &QItemModelMapDataProxyPrivate::handleRowsMoved);
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::rowsRemoved,
+                         this, &QItemModelMapDataProxyPrivate::handleRowsRemoved);
     }
     if (!m_resolveTimer.isActive())
         m_resolveTimer.start(0);
@@ -101,19 +111,24 @@ void QItemModelMapDataProxyPrivate::setItemModel(QAbstractItemModel *itemModel)
 
 void QItemModelMapDataProxyPrivate::setMapping(QItemModelMapDataMapping *mapping)
 {
-    if (!m_mapping.isNull())
-        QObject::disconnect(m_mapping.data(), &QItemModelMapDataMapping::mappingChanged, this, &QItemModelMapDataProxyPrivate::handleMappingChanged);
+    if (!m_mapping.isNull()) {
+        QObject::disconnect(m_mapping.data(), &QItemModelMapDataMapping::mappingChanged,
+                            this, &QItemModelMapDataProxyPrivate::handleMappingChanged);
+    }
 
     m_mapping = mapping;
 
-    if (!m_mapping.isNull())
-        QObject::connect(m_mapping.data(), &QItemModelMapDataMapping::mappingChanged, this, &QItemModelMapDataProxyPrivate::handleMappingChanged);
+    if (!m_mapping.isNull()) {
+        QObject::connect(m_mapping.data(), &QItemModelMapDataMapping::mappingChanged,
+                         this, &QItemModelMapDataProxyPrivate::handleMappingChanged);
+    }
 
     if (!m_resolveTimer.isActive())
         m_resolveTimer.start(0);
 }
 
-void QItemModelMapDataProxyPrivate::handleColumnsInserted(const QModelIndex &parent, int start, int end)
+void QItemModelMapDataProxyPrivate::handleColumnsInserted(const QModelIndex &parent,
+                                                          int start, int end)
 {
     Q_UNUSED(parent)
     Q_UNUSED(start)
@@ -124,7 +139,11 @@ void QItemModelMapDataProxyPrivate::handleColumnsInserted(const QModelIndex &par
         m_resolveTimer.start(0); // TODO Resolving entire model is inefficient
 }
 
-void QItemModelMapDataProxyPrivate::handleColumnsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)
+void QItemModelMapDataProxyPrivate::handleColumnsMoved(const QModelIndex &sourceParent,
+                                                       int sourceStart,
+                                                       int sourceEnd,
+                                                       const QModelIndex &destinationParent,
+                                                       int destinationColumn)
 {
     Q_UNUSED(sourceParent)
     Q_UNUSED(sourceStart)
@@ -137,7 +156,8 @@ void QItemModelMapDataProxyPrivate::handleColumnsMoved(const QModelIndex &source
         m_resolveTimer.start(0); // TODO Resolving entire model is inefficient
 }
 
-void QItemModelMapDataProxyPrivate::handleColumnsRemoved(const QModelIndex &parent, int start, int end)
+void QItemModelMapDataProxyPrivate::handleColumnsRemoved(const QModelIndex &parent,
+                                                         int start, int end)
 {
     Q_UNUSED(parent)
     Q_UNUSED(start)
@@ -148,7 +168,9 @@ void QItemModelMapDataProxyPrivate::handleColumnsRemoved(const QModelIndex &pare
         m_resolveTimer.start(0); // TODO Resolving entire model is inefficient
 }
 
-void QItemModelMapDataProxyPrivate::handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
+void QItemModelMapDataProxyPrivate::handleDataChanged(const QModelIndex &topLeft,
+                                                      const QModelIndex &bottomRight,
+                                                      const QVector<int> &roles)
 {
     Q_UNUSED(topLeft)
     Q_UNUSED(bottomRight)
@@ -159,7 +181,8 @@ void QItemModelMapDataProxyPrivate::handleDataChanged(const QModelIndex &topLeft
         m_resolveTimer.start(0); // TODO Resolving entire model is inefficient
 }
 
-void QItemModelMapDataProxyPrivate::handleLayoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint)
+void QItemModelMapDataProxyPrivate::handleLayoutChanged(const QList<QPersistentModelIndex> &parents,
+                                                        QAbstractItemModel::LayoutChangeHint hint)
 {
     Q_UNUSED(parents)
     Q_UNUSED(hint)
@@ -176,7 +199,8 @@ void QItemModelMapDataProxyPrivate::handleModelReset()
         m_resolveTimer.start(0); // TODO Resolving entire model is inefficient
 }
 
-void QItemModelMapDataProxyPrivate::handleRowsInserted(const QModelIndex &parent, int start, int end)
+void QItemModelMapDataProxyPrivate::handleRowsInserted(const QModelIndex &parent,
+                                                       int start, int end)
 {
     Q_UNUSED(parent)
     Q_UNUSED(start)
@@ -187,7 +211,11 @@ void QItemModelMapDataProxyPrivate::handleRowsInserted(const QModelIndex &parent
         m_resolveTimer.start(0); // TODO Resolving entire model is inefficient
 }
 
-void QItemModelMapDataProxyPrivate::handleRowsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)
+void QItemModelMapDataProxyPrivate::handleRowsMoved(const QModelIndex &sourceParent,
+                                                    int sourceStart,
+                                                    int sourceEnd,
+                                                    const QModelIndex &destinationParent,
+                                                    int destinationRow)
 {
     Q_UNUSED(sourceParent)
     Q_UNUSED(sourceStart)
diff --git a/src/datavis3d/data/qitemmodelscatterdataproxy.cpp b/src/datavis3d/data/qitemmodelscatterdataproxy.cpp
index c4f4f0a7..2bc67d39 100644
--- a/src/datavis3d/data/qitemmodelscatterdataproxy.cpp
+++ b/src/datavis3d/data/qitemmodelscatterdataproxy.cpp
@@ -86,23 +86,23 @@ void QItemModelScatterDataProxyPrivate::setItemModel(QAbstractItemModel *itemMod
     m_itemModel = itemModel;
 
     if (!m_itemModel.isNull()) {
-        QObject::connect(m_itemModel, &QAbstractItemModel::columnsInserted, this,
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::columnsInserted, this,
                          &QItemModelScatterDataProxyPrivate::handleColumnsInserted);
-        QObject::connect(m_itemModel, &QAbstractItemModel::columnsMoved, this,
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::columnsMoved, this,
                          &QItemModelScatterDataProxyPrivate::handleColumnsMoved);
-        QObject::connect(m_itemModel, &QAbstractItemModel::columnsRemoved, this,
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::columnsRemoved, this,
                          &QItemModelScatterDataProxyPrivate::handleColumnsRemoved);
-        QObject::connect(m_itemModel, &QAbstractItemModel::dataChanged, this,
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::dataChanged, this,
                          &QItemModelScatterDataProxyPrivate::handleDataChanged);
-        QObject::connect(m_itemModel, &QAbstractItemModel::layoutChanged, this,
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::layoutChanged, this,
                          &QItemModelScatterDataProxyPrivate::handleLayoutChanged);
-        QObject::connect(m_itemModel, &QAbstractItemModel::modelReset, this,
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::modelReset, this,
                          &QItemModelScatterDataProxyPrivate::handleModelReset);
-        QObject::connect(m_itemModel, &QAbstractItemModel::rowsInserted, this,
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::rowsInserted, this,
                          &QItemModelScatterDataProxyPrivate::handleRowsInserted);
-        QObject::connect(m_itemModel, &QAbstractItemModel::rowsMoved, this,
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::rowsMoved, this,
                          &QItemModelScatterDataProxyPrivate::handleRowsMoved);
-        QObject::connect(m_itemModel, &QAbstractItemModel::rowsRemoved, this,
+        QObject::connect(m_itemModel.data(), &QAbstractItemModel::rowsRemoved, this,
                          &QItemModelScatterDataProxyPrivate::handleRowsRemoved);
     }
     if (!m_resolveTimer.isActive())
diff --git a/src/datavis3d/engine/drawer.cpp b/src/datavis3d/engine/drawer.cpp
index 05268440..d2e3ddaf 100644
--- a/src/datavis3d/engine/drawer.cpp
+++ b/src/datavis3d/engine/drawer.cpp
@@ -186,8 +186,8 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte
     QSize textureSize = labelItem.size();
     QMatrix4x4 modelMatrix;
     QMatrix4x4 MVPMatrix;
-    GLfloat xPosition;
-    GLfloat yPosition;
+    GLfloat xPosition = 0.0f;
+    GLfloat yPosition = 0.0f;
     GLfloat zPosition = positionComp.z();
 
     switch (position) {
diff --git a/src/datavis3d/engine/q3dsurface.cpp b/src/datavis3d/engine/q3dsurface.cpp
index 28759c1b..e3a30720 100644
--- a/src/datavis3d/engine/q3dsurface.cpp
+++ b/src/datavis3d/engine/q3dsurface.cpp
@@ -43,9 +43,11 @@ void Q3DSurface::render()
 #if defined(Q_OS_ANDROID)
 void Q3DSurface::mouseDoubleClickEvent(QMouseEvent *event)
 {
+    Q_UNUSED(event)
 }
 void Q3DSurface::touchEvent(QTouchEvent *event)
 {
+    Q_UNUSED(event)
 }
 #endif
 
@@ -152,8 +154,9 @@ void Q3DSurface::showData() const
 /////////////////// PRIVATE ///////////////////////////////////
 
 Q3DSurfacePrivate::Q3DSurfacePrivate(Q3DSurface *q, QRect rect)
-    : q_ptr(q),
-      m_shared(new Surface3dController(rect))
+    : m_shared(new Surface3dController(rect)),
+      q_ptr(q)
+
 {
 }
 
diff --git a/src/datavis3d/engine/scatter3drenderer.cpp b/src/datavis3d/engine/scatter3drenderer.cpp
index 619cf06f..9f801857 100644
--- a/src/datavis3d/engine/scatter3drenderer.cpp
+++ b/src/datavis3d/engine/scatter3drenderer.cpp
@@ -83,8 +83,8 @@ Scatter3DRenderer::Scatter3DRenderer(Scatter3DController *controller)
       m_scaleFactor(0),
       m_selection(selectionSkipColor),
       m_areaSize(QSizeF(0.0, 0.0)),
-      m_hasHeightAdjustmentChanged(true),
-      m_dotSizeScale(1.0f)
+      m_dotSizeScale(1.0f),
+      m_hasHeightAdjustmentChanged(true)
 {
     //qDebug() << __FUNCTION__;
     m_dummyRenderItem.setRenderer(this);
diff --git a/src/datavis3d/engine/surface3dcontroller.cpp b/src/datavis3d/engine/surface3dcontroller.cpp
index 2915c993..0bb17c6d 100644
--- a/src/datavis3d/engine/surface3dcontroller.cpp
+++ b/src/datavis3d/engine/surface3dcontroller.cpp
@@ -29,12 +29,12 @@ QT_DATAVIS3D_BEGIN_NAMESPACE
 
 Surface3dController::Surface3dController(QRect rect)
     : Abstract3DController(rect),
-      m_mouseState(MouseNone),
-      m_mousePos(QPoint(0, 0)),
       m_renderer(0),
       m_isInitialized(false),
       m_smoothSurface(false),
-      m_surfaceGrid(true)
+      m_surfaceGrid(true),
+      m_mouseState(MouseNone),
+      m_mousePos(QPoint(0, 0))
 {
 }
 
@@ -120,9 +120,11 @@ bool Surface3dController::surfaceGrid()
 #if defined(Q_OS_ANDROID)
 void Surface3dController::mouseDoubleClickEvent(QMouseEvent *event)
 {
+    Q_UNUSED(event)
 }
 void touchEvent(QTouchEvent *event)
 {
+    Q_UNUSED(event)
 }
 #endif
 
diff --git a/src/datavis3d/engine/surface3drenderer.cpp b/src/datavis3d/engine/surface3drenderer.cpp
index 2e6a54b8..5337aa54 100644
--- a/src/datavis3d/engine/surface3drenderer.cpp
+++ b/src/datavis3d/engine/surface3drenderer.cpp
@@ -46,11 +46,11 @@ Surface3dRenderer::Surface3dRenderer(Surface3dController *controller)
       m_controller(controller),
       m_mousePressed(MouseNone),
       m_mousePos(QPoint(0, 0)),
+      m_labelTransparency(QDataVis::TransparencyFromTheme),
+      m_font(QFont(QStringLiteral("Arial"))),
       m_isGridEnabled(true),
       m_isBackgroundEnabled(true),
       m_shadowQuality(QDataVis::ShadowLow),
-      m_labelTransparency(QDataVis::TransparencyFromTheme),
-      m_font(QFont(QStringLiteral("Arial"))),
       m_hasNegativeValues(false),
       m_segmentYCount(0),
       m_segmentYStep(0.0f),