[PATCH 1/2] Profile2: fix some initializer list order warnings

Lubomir I. Ivanov neolit123 at gmail.com
Mon Mar 10 04:43:43 PDT 2014


From: "Lubomir I. Ivanov" <neolit123 at gmail.com>

Such can be disabled with -Wno-reorder and are clearly
more of a nuisance, but C++98 12.6.2.5 says the order should be
the same as in the class declaration.

On theory this would only speed the compile times a tiny amount.

Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
---
one thing we can do is encapsulate the default values into a
structure for better readability and to avoid the ordering issue.

given tomaz is working on these parts, please ignore if there
are *any* conflicts at all or refactoring is in progress.
---
 qt-ui/profile/divecartesianaxis.cpp | 2 +-
 qt-ui/profile/profilewidget2.cpp    | 2 +-
 qt-ui/profile/ruleritem.cpp         | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qt-ui/profile/divecartesianaxis.cpp b/qt-ui/profile/divecartesianaxis.cpp
index 585fe80..f5ba988 100644
--- a/qt-ui/profile/divecartesianaxis.cpp
+++ b/qt-ui/profile/divecartesianaxis.cpp
@@ -64,9 +64,9 @@ DiveCartesianAxis::DiveCartesianAxis() : QObject(),
 	max(0),
 	interval(1),
 	tick_size(0),
-	labelScale(1.0),
 	textVisibility(true),
 	lineVisibility(true),
+	labelScale(1.0),
 	line_size(1)
 {
 	setPen(gridPen());
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index 990e248..88f9378 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -61,6 +61,7 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent),
 	zoomLevel(0),
 	background(new DivePixmapItem()),
 	toolTipItem(new ToolTipItem()),
+	isPlotZoomed(prefs.zoomed_plot),
 	profileYAxis(new DepthAxis()),
 	gasYAxis(new PartialGasPressureAxis()),
 	temperatureAxis(new TemperatureAxis()),
@@ -78,7 +79,6 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent),
 	po2GasItem(new PartialPressureGasItem()),
 	heartBeatAxis(new DiveCartesianAxis()),
 	heartBeatItem(new DiveHeartrateItem()),
-	isPlotZoomed(prefs.zoomed_plot),
 	rulerItem(new RulerItem2())
 {
 	memset(&plotInfo, 0, sizeof(plotInfo));
diff --git a/qt-ui/profile/ruleritem.cpp b/qt-ui/profile/ruleritem.cpp
index 99a0443..66fb67a 100644
--- a/qt-ui/profile/ruleritem.cpp
+++ b/qt-ui/profile/ruleritem.cpp
@@ -64,10 +64,10 @@ QVariant RulerNodeItem2::itemChange(GraphicsItemChange change, const QVariant &v
 	return QGraphicsEllipseItem::itemChange(change, value);
 }
 
-RulerItem2::RulerItem2() : timeAxis(NULL),
-	depthAxis(NULL),
-	source(new RulerNodeItem2()),
+RulerItem2::RulerItem2() : source(new RulerNodeItem2()),
 	dest(new RulerNodeItem2()),
+	timeAxis(NULL),
+	depthAxis(NULL),
 	textItem(new QGraphicsSimpleTextItem(this))
 {
 	memset(&pInfo, 0, sizeof(pInfo));
-- 
1.7.11.msysgit.0



More information about the subsurface mailing list