From 0325b267ee540c4b3ea2103bdfe54e43029556bc Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Mon, 10 Mar 2014 13:43:43 +0200 Subject: Profile2: fix some initializer list order warnings 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 Signed-off-by: Dirk Hohndel --- 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(-) (limited to 'qt-ui') diff --git a/qt-ui/profile/divecartesianaxis.cpp b/qt-ui/profile/divecartesianaxis.cpp index 585fe8076..f5ba988e8 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 990e2489f..88f93785b 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 99a04438f..66fb67a0b 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)); -- cgit v1.2.3-70-g09d2