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>

15 files changed, 24 insertions, 22 deletions

diff --git a/src/datavisualization/data/labelitem_p.h b/src/datavisualization/data/labelitem_p.h
index 9359e8c1..9ed8f3ff 100644
--- a/src/datavisualization/data/labelitem_p.h
+++ b/src/datavisualization/data/labelitem_p.h
@@ -48,7 +48,7 @@ public:
     void clear();
 
 private:
-    Q_DISABLE_COPY(LabelItem);
+    Q_DISABLE_COPY(LabelItem)
 
     QSize m_size;
     GLuint m_textureId;
diff --git a/src/datavisualization/data/qabstract3dseries_p.h b/src/datavisualization/data/qabstract3dseries_p.h
index 67d5dee3..f1bc1f95 100644
--- a/src/datavisualization/data/qabstract3dseries_p.h
+++ b/src/datavisualization/data/qabstract3dseries_p.h
@@ -144,4 +144,4 @@ public:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // QAbstract3DSeries_P_H
+#endif
diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp
index 8798d53b..0dc247ec 100644
--- a/src/datavisualization/data/qabstractdataproxy.cpp
+++ b/src/datavisualization/data/qabstractdataproxy.cpp
@@ -95,7 +95,8 @@ QAbstractDataProxy::DataType QAbstractDataProxy::type() const
 
 // QAbstractDataProxyPrivate
 
-QAbstractDataProxyPrivate::QAbstractDataProxyPrivate(QAbstractDataProxy *q, QAbstractDataProxy::DataType type)
+QAbstractDataProxyPrivate::QAbstractDataProxyPrivate(QAbstractDataProxy *q,
+                                                     QAbstractDataProxy::DataType type)
     : QObject(0),
       q_ptr(q),
       m_type(type),
diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h
index 520f407d..ae21e1dc 100644
--- a/src/datavisualization/data/qabstractdataproxy.h
+++ b/src/datavisualization/data/qabstractdataproxy.h
@@ -61,4 +61,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // QABSTRACTDATAPROXY_H
+#endif
diff --git a/src/datavisualization/data/qabstractdataproxy_p.h b/src/datavisualization/data/qabstractdataproxy_p.h
index 2e073f7d..2e90696a 100644
--- a/src/datavisualization/data/qabstractdataproxy_p.h
+++ b/src/datavisualization/data/qabstractdataproxy_p.h
@@ -58,4 +58,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // QABSTRACTDATAPROXY_P_H
+#endif
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index 7843e5dc..d4fbdb2d 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -109,4 +109,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // QBARDATAPROXY_H
+#endif
diff --git a/src/datavisualization/data/qbardataproxy_p.h b/src/datavisualization/data/qbardataproxy_p.h
index 6576230b..cc19cbbd 100644
--- a/src/datavisualization/data/qbardataproxy_p.h
+++ b/src/datavisualization/data/qbardataproxy_p.h
@@ -74,4 +74,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // QBARDATAPROXY_P_H
+#endif
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
index feb6cded..d71f65a4 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
@@ -296,9 +296,7 @@ const QHeightMapSurfaceDataProxyPrivate *QHeightMapSurfaceDataProxy::dptrc() con
     return static_cast<const QHeightMapSurfaceDataProxyPrivate *>(d_ptr.data());
 }
 
-//
 //  QHeightMapSurfaceDataProxyPrivate
-//
 
 QHeightMapSurfaceDataProxyPrivate::QHeightMapSurfaceDataProxyPrivate(QHeightMapSurfaceDataProxy *q)
     : QSurfaceDataProxyPrivate(q),
@@ -321,7 +319,8 @@ QHeightMapSurfaceDataProxy *QHeightMapSurfaceDataProxyPrivate::qptr()
     return static_cast<QHeightMapSurfaceDataProxy *>(q_ptr);
 }
 
-void QHeightMapSurfaceDataProxyPrivate::setValueRanges(float minX, float maxX, float minZ, float maxZ)
+void QHeightMapSurfaceDataProxyPrivate::setValueRanges(float minX, float maxX,
+                                                       float minZ, float maxZ)
 {
     bool minXChanged = false;
     bool maxXChanged = false;
@@ -509,10 +508,10 @@ void QHeightMapSurfaceDataProxyPrivate::handlePendingResolve()
             for (; j < lastCol; j++)
                 newRow[j].setPosition(QVector3D((float(j) * xMul) + m_minXValue,
                                                 float(bits[bitCount + (j * 4)]),
-                                                zVal));
+                                      zVal));
             newRow[j].setPosition(QVector3D(m_maxXValue,
                                             float(bits[bitCount + (j * 4)]),
-                                            zVal));
+                                  zVal));
         }
     } else {
         // Not grayscale, we'll need to calculate height from RGB
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
index 0753ae09..fd21414a 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
@@ -158,7 +158,8 @@ QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(QObject *parent)
  * Constructs QItemModelSurfaceDataProxy with \a itemModel and optional \a parent. Proxy doesn't take
  * ownership of the \a itemModel, as typically item models are owned by other controls.
  */
-QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(const QAbstractItemModel *itemModel, QObject *parent)
+QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(const QAbstractItemModel *itemModel,
+                                                       QObject *parent)
     : QSurfaceDataProxy(new QItemModelSurfaceDataProxyPrivate(this), parent)
 {
     dptr()->m_itemModelHandler->setItemModel(itemModel);
@@ -173,7 +174,8 @@ QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(const QAbstractItemModel
  * in rows and columns already, so it also sets useModelCategories property to true.
  */
 QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(const QAbstractItemModel *itemModel,
-                                                       const QString &valueRole, QObject *parent)
+                                                       const QString &valueRole,
+                                                       QObject *parent)
     : QSurfaceDataProxy(new QItemModelSurfaceDataProxyPrivate(this), parent)
 {
     dptr()->m_itemModelHandler->setItemModel(itemModel);
@@ -190,7 +192,8 @@ QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(const QAbstractItemModel
 QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(const QAbstractItemModel *itemModel,
                                                        const QString &rowRole,
                                                        const QString &columnRole,
-                                                       const QString &valueRole, QObject *parent)
+                                                       const QString &valueRole,
+                                                       QObject *parent)
     : QSurfaceDataProxy(new QItemModelSurfaceDataProxyPrivate(this), parent)
 {
     dptr()->m_itemModelHandler->setItemModel(itemModel);
diff --git a/src/datavisualization/data/qscatterdataproxy_p.h b/src/datavisualization/data/qscatterdataproxy_p.h
index c9f1d78e..2acf7ec5 100644
--- a/src/datavisualization/data/qscatterdataproxy_p.h
+++ b/src/datavisualization/data/qscatterdataproxy_p.h
@@ -63,4 +63,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // QBARDATAPROXY_P_H
+#endif
diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index bcb60f8c..ec28d491 100644
--- a/src/datavisualization/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -355,9 +355,7 @@ const QSurfaceDataProxyPrivate *QSurfaceDataProxy::dptrc() const
  * need to emit this signal yourself or the graph won't get updated.
  */
 
-//
 //  QSurfaceDataProxyPrivate
-//
 
 QSurfaceDataProxyPrivate::QSurfaceDataProxyPrivate(QSurfaceDataProxy *q)
     : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeSurface),
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index ffa20989..8c366dfa 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -91,4 +91,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // QSURFACEDATAPROXY_H
+#endif
diff --git a/src/datavisualization/data/qsurfacedataproxy_p.h b/src/datavisualization/data/qsurfacedataproxy_p.h
index d370ef69..42c633fb 100644
--- a/src/datavisualization/data/qsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qsurfacedataproxy_p.h
@@ -69,4 +69,4 @@ private:
 
 QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // QSURFACEDATAPROXY_P_H
+#endif
diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp
index 81ecf8b0..c9e5e867 100644
--- a/src/datavisualization/data/scatteritemmodelhandler.cpp
+++ b/src/datavisualization/data/scatteritemmodelhandler.cpp
@@ -92,7 +92,8 @@ void ScatterItemModelHandler::handleRowsRemoved(const QModelIndex &parent, int s
     }
 }
 
-void ScatterItemModelHandler::modelPosToScatterItem(int modelRow, int modelColumn, QScatterDataItem &item)
+void ScatterItemModelHandler::modelPosToScatterItem(int modelRow, int modelColumn,
+                                                    QScatterDataItem &item)
 {
     QModelIndex index = m_itemModel->index(modelRow, modelColumn);
     float xPos(0.0f);
diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp
index db6052d9..d3e0f893 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler.cpp
+++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp
@@ -131,7 +131,7 @@ void SurfaceItemModelHandler::resolveModel()
             for (int j = 0; j < columnList.size(); j++) {
                 newProxyRow[j].setPosition(QVector3D(columnList.at(j).toFloat(),
                                                      itemValueMap[rowKey][columnList.at(j)],
-                                                     rowList.at(i).toFloat()));
+                                           rowList.at(i).toFloat()));
             }
         }
     }