summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2014-11-08 14:11:06 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-11-08 11:17:11 -0800
commit0b0e5d834fbf91ecbf7b8bd59b4db7e69d77b42d (patch)
tree27a923aaec9fc23f9881ceb0f67bbd96e99ba0fa
parent082e59ea724f3b44fef0d2a4f21766e981b35194 (diff)
downloadsubsurface-0b0e5d834fbf91ecbf7b8bd59b4db7e69d77b42d.tar.gz
Reorder initializers to be more c++-strict
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@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/maintab.cpp4
-rw-r--r--qt-ui/models.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index ab712aeca..2962efc6f 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 5732e7043..5309e2860 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"));