Browse Source

Fixed most -Wreorder warnings from GCC.

QGC4.4
Bryant 13 years ago
parent
commit
82c7afbb15
  1. 6
      src/comm/QGCFlightGearLink.cc
  2. 4
      src/ui/DebugConsole.cc
  3. 2
      src/ui/HDDisplay.cc
  4. 14
      src/ui/HSIDisplay.cc
  5. 4
      src/ui/QGCVehicleConfig.cc

6
src/comm/QGCFlightGearLink.cc

@ -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"
QGCFlightGearLink::QGCFlightGearLink(UASInterface* mav, QString startupArguments, QString remoteHost, QHostAddress host, quint16 port) :
socket(NULL),
process(NULL),
terraSync(NULL),
socket(NULL),
startupArguments(startupArguments),
flightGearVersion(0)
flightGearVersion(0),
startupArguments(startupArguments)
{
this->host = host;
this->port = port+mav->getUASID();

4
src/ui/DebugConsole.cc

@ -49,6 +49,8 @@ DebugConsole::DebugConsole(QWidget *parent) : @@ -49,6 +49,8 @@ DebugConsole::DebugConsole(QWidget *parent) :
autoHold(true),
bytesToIgnore(0),
lastByte(-1),
escReceived(false),
escIndex(0),
sentBytes(),
holdBuffer(),
lineBuffer(""),
@ -61,8 +63,6 @@ DebugConsole::DebugConsole(QWidget *parent) : @@ -61,8 +63,6 @@ DebugConsole::DebugConsole(QWidget *parent) :
lowpassDataRate(0.0f),
dataRateThreshold(400),
commandIndex(0),
escReceived(false),
escIndex(0),
m_ui(new Ui::DebugConsole)
{
// Setup basic user interface

2
src/ui/HDDisplay.cc

@ -201,9 +201,7 @@ void HDDisplay::triggerUpdate() @@ -201,9 +201,7 @@ void HDDisplay::triggerUpdate()
void HDDisplay::paintEvent(QPaintEvent * event)
{
Q_UNUSED(event);
quint64 interval = 0;
//qDebug() << "INTERVAL:" << MG::TIME::getGroundTimeNow() - interval << __FILE__ << __LINE__;
interval = QGC::groundTimeMilliseconds();
renderOverlay();
}

14
src/ui/HSIDisplay.cc

@ -118,12 +118,6 @@ HSIDisplay::HSIDisplay(QWidget *parent) : @@ -118,12 +118,6 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
visionFixKnown(false),
gpsFixKnown(false),
iruFixKnown(false),
setPointKnown(false),
positionSetPointKnown(false),
userSetPointSet(false),
userXYSetPointSet(false),
userZSetPointSet(false),
userYawSetPointSet(false),
gyroKnown(false),
gyroON(false),
gyroOK(false),
@ -150,7 +144,13 @@ HSIDisplay::HSIDisplay(QWidget *parent) : @@ -150,7 +144,13 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
viconOK(false),
actuatorsKnown(false),
actuatorsON(false),
actuatorsOK(false)
actuatorsOK(false),
setPointKnown(false),
positionSetPointKnown(false),
userSetPointSet(false),
userXYSetPointSet(false),
userZSetPointSet(false),
userYawSetPointSet(false)
{
refreshTimer->setInterval(updateInterval);

4
src/ui/QGCVehicleConfig.cc

@ -19,8 +19,6 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) : @@ -19,8 +19,6 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) :
QWidget(parent),
mav(NULL),
chanCount(0),
changed(true),
rc_mode(RC_MODE_2),
rcRoll(0.0f),
rcPitch(0.0f),
rcYaw(0.0f),
@ -29,6 +27,8 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) : @@ -29,6 +27,8 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) :
rcAux1(0.0f),
rcAux2(0.0f),
rcAux3(0.0f),
changed(true),
rc_mode(RC_MODE_2),
calibrationEnabled(false),
ui(new Ui::QGCVehicleConfig)
{

Loading…
Cancel
Save