Browse Source

Fix constructor ordering warnings

QGC4.4
Don Gagne 11 years ago
parent
commit
f83b07b27b
  1. 4
      src/uas/UAS.cc
  2. 7
      src/ui/PrimaryFlightDisplay.cc

4
src/uas/UAS.cc

@ -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),
paramMgr(this),
simulation(0),
_thread(thread),
// The protected members.
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),
sensorHil(false),
lastSendTimeGPS(0),
lastSendTimeSensors(0),
_thread(thread)
lastSendTimeSensors(0)
{
moveToThread(thread);

7
src/ui/PrimaryFlightDisplay.cc

@ -110,6 +110,9 @@ const QString PrimaryFlightDisplay::compassWindNames[] = { @@ -110,6 +110,9 @@ const QString PrimaryFlightDisplay::compassWindNames[] = {
PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *parent) :
QWidget(parent),
_valuesChanged(false),
_valuesLastPainted(QGC::groundTimeMilliseconds()),
uas(NULL),
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)),
font("Bitstream Vera Sans"),
refreshTimer(new QTimer(this)),
_valuesChanged(false),
_valuesLastPainted(QGC::groundTimeMilliseconds())
refreshTimer(new QTimer(this))
{
Q_UNUSED(width);
Q_UNUSED(height);

Loading…
Cancel
Save