Commit 82c7afbb authored by Bryant's avatar Bryant

Fixed most -Wreorder warnings from GCC.

parent d779e7f1
...@@ -40,11 +40,11 @@ This file is part of the QGROUNDCONTROL project ...@@ -40,11 +40,11 @@ This file is part of the QGROUNDCONTROL project
#include "MainWindow.h" #include "MainWindow.h"
QGCFlightGearLink::QGCFlightGearLink(UASInterface* mav, QString startupArguments, QString remoteHost, QHostAddress host, quint16 port) : QGCFlightGearLink::QGCFlightGearLink(UASInterface* mav, QString startupArguments, QString remoteHost, QHostAddress host, quint16 port) :
socket(NULL),
process(NULL), process(NULL),
terraSync(NULL), terraSync(NULL),
socket(NULL), flightGearVersion(0),
startupArguments(startupArguments), startupArguments(startupArguments)
flightGearVersion(0)
{ {
this->host = host; this->host = host;
this->port = port+mav->getUASID(); this->port = port+mav->getUASID();
......
...@@ -49,6 +49,8 @@ DebugConsole::DebugConsole(QWidget *parent) : ...@@ -49,6 +49,8 @@ DebugConsole::DebugConsole(QWidget *parent) :
autoHold(true), autoHold(true),
bytesToIgnore(0), bytesToIgnore(0),
lastByte(-1), lastByte(-1),
escReceived(false),
escIndex(0),
sentBytes(), sentBytes(),
holdBuffer(), holdBuffer(),
lineBuffer(""), lineBuffer(""),
...@@ -61,8 +63,6 @@ DebugConsole::DebugConsole(QWidget *parent) : ...@@ -61,8 +63,6 @@ DebugConsole::DebugConsole(QWidget *parent) :
lowpassDataRate(0.0f), lowpassDataRate(0.0f),
dataRateThreshold(400), dataRateThreshold(400),
commandIndex(0), commandIndex(0),
escReceived(false),
escIndex(0),
m_ui(new Ui::DebugConsole) m_ui(new Ui::DebugConsole)
{ {
// Setup basic user interface // Setup basic user interface
......
...@@ -201,9 +201,7 @@ void HDDisplay::triggerUpdate() ...@@ -201,9 +201,7 @@ void HDDisplay::triggerUpdate()
void HDDisplay::paintEvent(QPaintEvent * event) void HDDisplay::paintEvent(QPaintEvent * event)
{ {
Q_UNUSED(event); Q_UNUSED(event);
quint64 interval = 0;
//qDebug() << "INTERVAL:" << MG::TIME::getGroundTimeNow() - interval << __FILE__ << __LINE__; //qDebug() << "INTERVAL:" << MG::TIME::getGroundTimeNow() - interval << __FILE__ << __LINE__;
interval = QGC::groundTimeMilliseconds();
renderOverlay(); renderOverlay();
} }
......
...@@ -118,12 +118,6 @@ HSIDisplay::HSIDisplay(QWidget *parent) : ...@@ -118,12 +118,6 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
visionFixKnown(false), visionFixKnown(false),
gpsFixKnown(false), gpsFixKnown(false),
iruFixKnown(false), iruFixKnown(false),
setPointKnown(false),
positionSetPointKnown(false),
userSetPointSet(false),
userXYSetPointSet(false),
userZSetPointSet(false),
userYawSetPointSet(false),
gyroKnown(false), gyroKnown(false),
gyroON(false), gyroON(false),
gyroOK(false), gyroOK(false),
...@@ -150,7 +144,13 @@ HSIDisplay::HSIDisplay(QWidget *parent) : ...@@ -150,7 +144,13 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
viconOK(false), viconOK(false),
actuatorsKnown(false), actuatorsKnown(false),
actuatorsON(false), actuatorsON(false),
actuatorsOK(false) actuatorsOK(false),
setPointKnown(false),
positionSetPointKnown(false),
userSetPointSet(false),
userXYSetPointSet(false),
userZSetPointSet(false),
userYawSetPointSet(false)
{ {
refreshTimer->setInterval(updateInterval); refreshTimer->setInterval(updateInterval);
......
...@@ -19,8 +19,6 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) : ...@@ -19,8 +19,6 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) :
QWidget(parent), QWidget(parent),
mav(NULL), mav(NULL),
chanCount(0), chanCount(0),
changed(true),
rc_mode(RC_MODE_2),
rcRoll(0.0f), rcRoll(0.0f),
rcPitch(0.0f), rcPitch(0.0f),
rcYaw(0.0f), rcYaw(0.0f),
...@@ -29,6 +27,8 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) : ...@@ -29,6 +27,8 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) :
rcAux1(0.0f), rcAux1(0.0f),
rcAux2(0.0f), rcAux2(0.0f),
rcAux3(0.0f), rcAux3(0.0f),
changed(true),
rc_mode(RC_MODE_2),
calibrationEnabled(false), calibrationEnabled(false),
ui(new Ui::QGCVehicleConfig) ui(new Ui::QGCVehicleConfig)
{ {
......
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