Commit f83b07b2 authored by Don Gagne's avatar Don Gagne

Fix constructor ordering warnings

parent bb5ad4c1
...@@ -155,6 +155,7 @@ UAS::UAS(MAVLinkProtocol* protocol, QThread* thread, int id) : UASInterface(), ...@@ -155,6 +155,7 @@ UAS::UAS(MAVLinkProtocol* protocol, QThread* thread, int id) : UASInterface(),
paramsOnceRequested(false), paramsOnceRequested(false),
paramMgr(this), paramMgr(this),
simulation(0), simulation(0),
_thread(thread),
// The protected members. // The protected members.
connectionLost(false), connectionLost(false),
...@@ -164,8 +165,7 @@ UAS::UAS(MAVLinkProtocol* protocol, QThread* thread, int id) : UASInterface(), ...@@ -164,8 +165,7 @@ UAS::UAS(MAVLinkProtocol* protocol, QThread* thread, int id) : UASInterface(),
hilEnabled(false), hilEnabled(false),
sensorHil(false), sensorHil(false),
lastSendTimeGPS(0), lastSendTimeGPS(0),
lastSendTimeSensors(0), lastSendTimeSensors(0)
_thread(thread)
{ {
moveToThread(thread); moveToThread(thread);
......
...@@ -110,6 +110,9 @@ const QString PrimaryFlightDisplay::compassWindNames[] = { ...@@ -110,6 +110,9 @@ const QString PrimaryFlightDisplay::compassWindNames[] = {
PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *parent) : PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *parent) :
QWidget(parent), QWidget(parent),
_valuesChanged(false),
_valuesLastPainted(QGC::groundTimeMilliseconds()),
uas(NULL), uas(NULL),
roll(0), roll(0),
...@@ -141,9 +144,7 @@ PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *paren ...@@ -141,9 +144,7 @@ PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *paren
instrumentOpagueBackground(QColor::fromHsvF(0, 0, 0.3, 1.0)), instrumentOpagueBackground(QColor::fromHsvF(0, 0, 0.3, 1.0)),
font("Bitstream Vera Sans"), font("Bitstream Vera Sans"),
refreshTimer(new QTimer(this)), refreshTimer(new QTimer(this))
_valuesChanged(false),
_valuesLastPainted(QGC::groundTimeMilliseconds())
{ {
Q_UNUSED(width); Q_UNUSED(width);
Q_UNUSED(height); Q_UNUSED(height);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment