summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-03-30 20:38:27 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-03-30 13:58:10 -0700
commit45a3fff62c00b48e392b83cda8e5dd5fba9af8bb (patch)
treedd4cb84077c8f0eb61e042c5ff301c5fa589247c
parent38d70ba8545e9c97c60d7f5c587e8d80a0b27611 (diff)
downloadsubsurface-45a3fff62c00b48e392b83cda8e5dd5fba9af8bb.tar.gz
cleanup: fix initialization order in QMLProfile constructor
The compiler complains that members were initialized out-of-order. Even though this is not an issue here it is correct to emit a warning, since only then it is guaranteed that the objects are destructed in reverse-order with respect to construction. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r--mobile-widgets/qmlmanager.h1
-rw-r--r--profile-widget/qmlprofile.cpp4
2 files changed, 2 insertions, 3 deletions
diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h
index 79c4f23ad..0d2ef769e 100644
--- a/mobile-widgets/qmlmanager.h
+++ b/mobile-widgets/qmlmanager.h
@@ -264,7 +264,6 @@ private:
bool checkDepth(const DiveObjectHelper &myDive, struct dive *d, QString depth);
int openAndMaybeSync(const char *filename);
bool currentGitLocalOnly;
- Q_INVOKABLE DCDeviceData *m_device_data;
QString m_progressMessage;
bool m_btEnabled;
void updateAllGlobalLists();
diff --git a/profile-widget/qmlprofile.cpp b/profile-widget/qmlprofile.cpp
index ca0293c3c..80bedfad8 100644
--- a/profile-widget/qmlprofile.cpp
+++ b/profile-widget/qmlprofile.cpp
@@ -14,9 +14,9 @@ QMLProfile::QMLProfile(QQuickItem *parent) :
QQuickPaintedItem(parent),
m_devicePixelRatio(1.0),
m_margin(0),
- m_profileWidget(new ProfileWidget2),
m_xOffset(0.0),
- m_yOffset(0.0)
+ m_yOffset(0.0),
+ m_profileWidget(new ProfileWidget2)
{
setAntialiasing(true);
setFlags(QQuickItem::ItemClipsChildrenToShape | QQuickItem::ItemHasContents );