From c9cdc4649d80687afa21895b1744e9835602cb1d Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 12 Jan 2014 19:05:15 -0800 Subject: [PATCH] -Wreorder fixes --- qgroundcontrol.pro | 1 - src/comm/XbeeLink.cpp | 10 ++++++++-- src/uas/UAS.cc | 27 +++++++++++++++------------ src/ui/HUD.cc | 6 +++--- src/ui/MainWindow.cc | 2 +- src/ui/QGCBaseParamWidget.cc | 2 +- src/ui/QGCSettingsWidget.cc | 4 ++-- src/ui/main/QGCViewModeSelection.cc | 4 ++-- src/ui/map/QGCMapToolBar.cc | 6 +++--- 9 files changed, 35 insertions(+), 27 deletions(-) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 4d5182a14..9b5d50f0a 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -129,7 +129,6 @@ MacBuild | LinuxBuild { QMAKE_CXXFLAGS_WARN_ON += \ -Wall \ -Wno-unused-parameter \ - -Wno-reorder \ -Wno-unused-variable \ -Wno-narrowing \ -Wno-unused-function diff --git a/src/comm/XbeeLink.cpp b/src/comm/XbeeLink.cpp index 760625d99..767da686d 100644 --- a/src/comm/XbeeLink.cpp +++ b/src/comm/XbeeLink.cpp @@ -7,8 +7,14 @@ #include "XbeeLink.h" XbeeLink::XbeeLink(QString portName, int baudRate) : - m_xbeeCon(NULL), m_portName(NULL), m_portNameLength(0), m_baudRate(baudRate), m_connected(false), m_id(-1), - m_addrHigh(0), m_addrLow(0) + m_xbeeCon(NULL), + m_id(-1), + m_portName(NULL), + m_portNameLength(0), + m_baudRate(baudRate), + m_connected(false), + m_addrHigh(0), + m_addrLow(0) { /* setup the xbee */ diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index dcc1768f1..d9ce1c45d 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -115,23 +115,19 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(), altitudeAMSL(0.0), altitudeRelative(0.0), - airSpeed(std::numeric_limits::quiet_NaN()), - groundSpeed(std::numeric_limits::quiet_NaN()), + globalEstimatorActive(false), + + latitude_gps(0.0), + longitude_gps(0.0), + altitude_gps(0.0), speedX(0.0), speedY(0.0), speedZ(0.0), - globalEstimatorActive(false), - latitude_gps(0.0), - longitude_gps(0.0), - altitude_gps(0.0), nedPosGlobalOffset(0,0,0), nedAttGlobalOffset(0,0,0), - waypointManager(this), - paramMgr(this), - #if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES) receivedOverlayTimestamp(0.0), receivedObstacleListTimestamp(0.0), @@ -140,6 +136,10 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(), receivedRGBDImageTimestamp(0.0), #endif + airSpeed(std::numeric_limits::quiet_NaN()), + groundSpeed(std::numeric_limits::quiet_NaN()), + waypointManager(this), + attitudeKnown(false), attitudeStamped(false), lastAttitude(0), @@ -148,7 +148,12 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(), pitch(0.0), yaw(0.0), + blockHomePositionChanges(false), + receivedMode(false), + + paramsOnceRequested(false), + paramMgr(this), simulation(0), // The protected members. @@ -159,9 +164,7 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(), hilEnabled(false), sensorHil(false), lastSendTimeGPS(0), - lastSendTimeSensors(0), - blockHomePositionChanges(false), - receivedMode(false) + lastSendTimeSensors(0) { for (unsigned int i = 0; i<255;++i) { diff --git a/src/ui/HUD.cc b/src/ui/HUD.cc index 13c134eef..1690b7efb 100644 --- a/src/ui/HUD.cc +++ b/src/ui/HUD.cc @@ -57,6 +57,7 @@ This file is part of the QGROUNDCONTROL project */ HUD::HUD(int width, int height, QWidget* parent) : QLabel(parent), + image(NULL), uas(NULL), yawInt(0.0f), mode(tr("UNKNOWN MODE")), @@ -111,11 +112,10 @@ HUD::HUD(int width, int height, QWidget* parent) nextOfflineImage(""), HUDInstrumentsEnabled(false), videoEnabled(true), + imageLoggingEnabled(false), xImageFactor(1.0), yImageFactor(1.0), - imageLoggingEnabled(false), - imageRequested(false), - image(NULL) + imageRequested(false) { Q_UNUSED(width); Q_UNUSED(height); diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 653648401..11bf444a2 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -121,13 +121,13 @@ MainWindow::MainWindow(QWidget *parent): currentStyle(QGC_MAINWINDOW_STYLE_DARK), aboutToCloseFlag(false), changingViewsFlag(false), + mavlink(new MAVLinkProtocol()), centerStackActionGroup(new QActionGroup(this)), darkStyleFileName(defaultDarkStyle), lightStyleFileName(defaultLightStyle), autoReconnect(false), simulationLink(NULL), lowPowerMode(false), - mavlink(new MAVLinkProtocol()), customMode(CUSTOM_MODE_NONE), menuActionHelper(new MenuActionHelper()) { diff --git a/src/ui/QGCBaseParamWidget.cc b/src/ui/QGCBaseParamWidget.cc index 29067803b..7028d7182 100644 --- a/src/ui/QGCBaseParamWidget.cc +++ b/src/ui/QGCBaseParamWidget.cc @@ -11,8 +11,8 @@ QGCBaseParamWidget::QGCBaseParamWidget(QWidget *parent) : QWidget(parent), - mav(NULL), paramMgr(NULL), + mav(NULL), updatingParamNameLock("") { } diff --git a/src/ui/QGCSettingsWidget.cc b/src/ui/QGCSettingsWidget.cc index 1f92c064c..0e1d56b7e 100644 --- a/src/ui/QGCSettingsWidget.cc +++ b/src/ui/QGCSettingsWidget.cc @@ -13,8 +13,8 @@ QGCSettingsWidget::QGCSettingsWidget(QWidget *parent, Qt::WindowFlags flags) : QDialog(parent, flags), - ui(new Ui::QGCSettingsWidget), - mainWindow((MainWindow*)parent) + mainWindow((MainWindow*)parent), + ui(new Ui::QGCSettingsWidget) { ui->setupUi(this); diff --git a/src/ui/main/QGCViewModeSelection.cc b/src/ui/main/QGCViewModeSelection.cc index 553788447..04159d11e 100644 --- a/src/ui/main/QGCViewModeSelection.cc +++ b/src/ui/main/QGCViewModeSelection.cc @@ -5,8 +5,8 @@ QGCViewModeSelection::QGCViewModeSelection(QWidget *parent) : QWidget(parent), - selected(false), - ui(new Ui::QGCViewModeSelection) + ui(new Ui::QGCViewModeSelection), + selected(false) { ui->setupUi(this); diff --git a/src/ui/map/QGCMapToolBar.cc b/src/ui/map/QGCMapToolBar.cc index c9596efaf..16616a745 100644 --- a/src/ui/map/QGCMapToolBar.cc +++ b/src/ui/map/QGCMapToolBar.cc @@ -7,12 +7,12 @@ QGCMapToolBar::QGCMapToolBar(QWidget *parent) : ui(new Ui::QGCMapToolBar), map(NULL), optionsMenu(this), - mapTypesMenu(this), trailPlotMenu(this), updateTimesMenu(this), - mapTypesGroup(new QActionGroup(this)), + mapTypesMenu(this), trailSettingsGroup(new QActionGroup(this)), - updateTimesGroup(new QActionGroup(this)) + updateTimesGroup(new QActionGroup(this)), + mapTypesGroup(new QActionGroup(this)) { ui->setupUi(this); } -- 2.22.0