From 5bbb207d01483b3b23986d2721d41f4e954c0203 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Sun, 18 Nov 2018 16:08:25 -0500 Subject: [PATCH] CP - Cleanup warnings --- src/Airmap/AirspaceWeather.qml | 2 +- src/FactSystem/Fact.cc | 16 +++++++-------- src/FactSystem/FactMetaData.h | 8 ++++---- .../FlightDisplayViewWidgets.qml | 2 +- src/MissionManager/CameraCalc.cc | 2 +- src/Settings/SettingsManager.cc | 20 +++++++++---------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Airmap/AirspaceWeather.qml b/src/Airmap/AirspaceWeather.qml index dbe91a573..265b21215 100644 --- a/src/Airmap/AirspaceWeather.qml +++ b/src/Airmap/AirspaceWeather.qml @@ -16,7 +16,7 @@ Item { height: _valid ? weatherRow.height : 0 width: _valid ? weatherRow.width : 0 property color contentColor: "#ffffff" - property var iconHeight: ScreenTools.defaultFontPixelHeight * 2 + property real iconHeight: ScreenTools.defaultFontPixelHeight * 2 property bool _valid: QGroundControl.airspaceManager.weatherInfo.valid property bool _celcius: QGroundControl.settingsManager.unitsSettings.temperatureUnits.rawValue === UnitsSettings.TemperatureUnitsCelsius property int _tempC: _valid ? QGroundControl.airspaceManager.weatherInfo.temperature : 0 diff --git a/src/FactSystem/Fact.cc b/src/FactSystem/Fact.cc index f45db3070..18ffe8682 100644 --- a/src/FactSystem/Fact.cc +++ b/src/FactSystem/Fact.cc @@ -23,10 +23,10 @@ Fact::Fact(QObject* parent) , _componentId (-1) , _rawValue (0) , _type (FactMetaData::valueTypeInt32) - , _metaData (NULL) + , _metaData (nullptr) , _sendValueChangedSignals (true) , _deferredValueChangeSignal(false) - , _valueSliderModel (NULL) + , _valueSliderModel (nullptr) { FactMetaData* metaData = new FactMetaData(_type, this); setMetaData(metaData); @@ -40,10 +40,10 @@ Fact::Fact(int componentId, QString name, FactMetaData::ValueType_t type, QObjec , _componentId (componentId) , _rawValue (0) , _type (type) - , _metaData (NULL) + , _metaData (nullptr) , _sendValueChangedSignals (true) , _deferredValueChangeSignal(false) - , _valueSliderModel (NULL) + , _valueSliderModel (nullptr) { FactMetaData* metaData = new FactMetaData(_type, this); setMetaData(metaData); @@ -57,10 +57,10 @@ Fact::Fact(const QString& settingsGroup, FactMetaData* metaData, QObject* parent , _componentId (0) , _rawValue (0) , _type (metaData->type()) - , _metaData (NULL) + , _metaData (nullptr) , _sendValueChangedSignals (true) , _deferredValueChangeSignal(false) - , _valueSliderModel (NULL) + , _valueSliderModel (nullptr) { qgcApp()->toolbox()->corePlugin()->adjustSettingMetaData(settingsGroup, *metaData); setMetaData(metaData, true /* setDefaultFromMetaData */); @@ -90,11 +90,11 @@ const Fact& Fact::operator=(const Fact& other) _type = other._type; _sendValueChangedSignals = other._sendValueChangedSignals; _deferredValueChangeSignal = other._deferredValueChangeSignal; - _valueSliderModel = NULL; + _valueSliderModel = nullptr; if (_metaData && other._metaData) { *_metaData = *other._metaData; } else { - _metaData = NULL; + _metaData = nullptr; } return *this; diff --git a/src/FactSystem/FactMetaData.h b/src/FactSystem/FactMetaData.h index e2415152b..8b02c9930 100644 --- a/src/FactSystem/FactMetaData.h +++ b/src/FactSystem/FactMetaData.h @@ -48,10 +48,10 @@ public: typedef QVariant (*Translator)(const QVariant& from); - FactMetaData(QObject* parent = NULL); - FactMetaData(ValueType_t type, QObject* parent = NULL); - FactMetaData(ValueType_t type, const QString name, QObject* parent = NULL); - FactMetaData(const FactMetaData& other, QObject* parent = NULL); + FactMetaData(QObject* parent = nullptr); + FactMetaData(ValueType_t type, QObject* parent = nullptr); + FactMetaData(ValueType_t type, const QString name, QObject* parent = nullptr); + FactMetaData(const FactMetaData& other, QObject* parent = nullptr); static QMap createMapFromJsonFile(const QString& jsonFilename, QObject* metaDataParent); static QMap createMapFromJsonArray(const QJsonArray jsonArray, QObject* metaDataParent); diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index b3b346393..6d8458d52 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -157,7 +157,7 @@ Item { id: instrumentsColumn spacing: ScreenTools.defaultFontPixelHeight * 0.25 anchors.top: parent.top - anchors.topMargin: QGroundControl.corePlugin.options.instrumentWidget.widgetTopMargin + (ScreenTools.defaultFontPixelHeight * 0.5) + anchors.topMargin: QGroundControl.corePlugin.options.instrumentWidget ? (QGroundControl.corePlugin.options.instrumentWidget.widgetTopMargin + (ScreenTools.defaultFontPixelHeight * 0.5)) : 0 anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5 anchors.right: parent.right //------------------------------------------------------- diff --git a/src/MissionManager/CameraCalc.cc b/src/MissionManager/CameraCalc.cc index cf028558c..54e07051a 100644 --- a/src/MissionManager/CameraCalc.cc +++ b/src/MissionManager/CameraCalc.cc @@ -254,8 +254,8 @@ bool CameraCalc::load(const QJsonObject& json, QString& errorString) { sideOverlapName, QJsonValue::Double, true }, }; if (!JsonHelper::validateKeys(v1Json, keyInfoList2, errorString)) { - return false; _disableRecalc = false; + return false; } _valueSetIsDistanceFact.setRawValue (v1Json[valueSetIsDistanceName].toBool()); diff --git a/src/Settings/SettingsManager.cc b/src/Settings/SettingsManager.cc index 190f5a5d1..a6393d47c 100644 --- a/src/Settings/SettingsManager.cc +++ b/src/Settings/SettingsManager.cc @@ -15,17 +15,17 @@ SettingsManager::SettingsManager(QGCApplication* app, QGCToolbox* toolbox) : QGCTool(app, toolbox) #if defined(QGC_AIRMAP_ENABLED) - , _airMapSettings (NULL) + , _airMapSettings (nullptr) #endif - , _appSettings (NULL) - , _unitsSettings (NULL) - , _autoConnectSettings (NULL) - , _videoSettings (NULL) - , _flightMapSettings (NULL) - , _rtkSettings (NULL) - , _flyViewSettings (NULL) - , _planViewSettings (NULL) - , _brandImageSettings (NULL) + , _appSettings (nullptr) + , _unitsSettings (nullptr) + , _autoConnectSettings (nullptr) + , _videoSettings (nullptr) + , _flightMapSettings (nullptr) + , _rtkSettings (nullptr) + , _flyViewSettings (nullptr) + , _planViewSettings (nullptr) + , _brandImageSettings (nullptr) { } -- 2.22.0