[PATCH 1/6] Reorder initializers to be more c++-strict

Anton Lundin glance at acc.umu.se
Sat Nov 8 05:11:06 PST 2014


c++ have some idea about in what order things should be initialized.
This makes us comply with that order.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 qt-ui/maintab.cpp | 4 ++--
 qt-ui/models.cpp  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index ab712ae..2962efc 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -35,8 +35,8 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
 	extraDataModel(new ExtraDataModel(this)),
 	editMode(NONE),
 	divePictureModel(DivePictureModel::instance()),
-	currentTrip(0),
-	copyPaste(false)
+	copyPaste(false),
+	currentTrip(0)
 {
 	ui.setupUi(this);
 	ui.dateEdit->setDisplayFormat(getDateFormat());
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index 5732e70..5309e28 100644
--- a/qt-ui/models.cpp
+++ b/qt-ui/models.cpp
@@ -72,8 +72,8 @@ const QPixmap &trashIcon()
 }
 
 CylindersModel::CylindersModel(QObject *parent) :
-	rows(0),
-	changed(false)
+	changed(false),
+	rows(0)
 {
 	//	enum {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH};
 	setHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("Work press.") << tr("Start press.") << tr("End press.") << trUtf8("O" UTF8_SUBSCRIPT_2 "%") << tr("He%")
@@ -414,8 +414,8 @@ void CylindersModel::remove(const QModelIndex &index)
 }
 
 WeightModel::WeightModel(QObject *parent) : CleanerTableModel(parent),
-	rows(0),
-	changed(false)
+	changed(false),
+	rows(0)
 {
 	//enum Column {REMOVE, TYPE, WEIGHT};
 	setHeaderDataStrings(QStringList() << tr("") << tr("Type") << tr("Weight"));
-- 
1.9.1



More information about the subsurface mailing list