Browse Source

Clang 12 compile error fixes (#9118)

* Clang 12: Fix Autopilotplugin compile warning

* Clang 12: Fix Vehicle CompInfo compile errors
QGC4.4
Lorenz Meier 5 years ago committed by GitHub
parent
commit
8db8877c25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/AutoPilotPlugins/AutoPilotPlugin.cc
  2. 2
      src/Terrain/TerrainQuery.cc
  3. 2
      src/Vehicle/CompInfoParam.cc
  4. 2
      src/Vehicle/CompInfoVersion.cc

2
src/AutoPilotPlugins/AutoPilotPlugin.cc

@ -61,7 +61,7 @@ void AutoPilotPlugin::parametersReadyPreChecks(void) @@ -61,7 +61,7 @@ void AutoPilotPlugin::parametersReadyPreChecks(void)
_recalcSetupComplete();
// Connect signals in order to keep setupComplete up to date
for(const QVariant componentVariant: vehicleComponents()) {
for(QVariant componentVariant: vehicleComponents()) {
VehicleComponent* component = qobject_cast<VehicleComponent*>(qvariant_cast<QObject *>(componentVariant));
if (component) {
connect(component, &VehicleComponent::setupCompleteChanged, this, &AutoPilotPlugin::_recalcSetupComplete);

2
src/Terrain/TerrainQuery.cc

@ -241,7 +241,7 @@ void TerrainAirMapQuery::_parsePathData(const QJsonValue& pathJson) @@ -241,7 +241,7 @@ void TerrainAirMapQuery::_parsePathData(const QJsonValue& pathJson)
double lonStep = stepArray[1].toDouble();
QList<double> heights;
for (const QJsonValue& profileValue: profileArray) {
for (QJsonValue profileValue: profileArray) {
heights.append(profileValue.toDouble());
}

2
src/Vehicle/CompInfoParam.cc

@ -67,7 +67,7 @@ void CompInfoParam::setJson(const QString& metadataJsonFileName, const QString& @@ -67,7 +67,7 @@ void CompInfoParam::setJson(const QString& metadataJsonFileName, const QString&
}
QJsonArray rgParameters = jsonObj[_jsonParametersKey].toArray();
for (const QJsonValue& parameterValue: rgParameters) {
for (QJsonValue parameterValue: rgParameters) {
QMap<QString, QString> emptyDefineMap;
if (!parameterValue.isObject()) {

2
src/Vehicle/CompInfoVersion.cc

@ -59,7 +59,7 @@ void CompInfoVersion::setJson(const QString& metadataJsonFileName, const QString @@ -59,7 +59,7 @@ void CompInfoVersion::setJson(const QString& metadataJsonFileName, const QString
}
QJsonArray rgSupportedTypes = jsonObj[_jsonSupportedCompMetadataTypesKey].toArray();
for (const QJsonValue& typeValue: rgSupportedTypes) {
for (QJsonValue typeValue: rgSupportedTypes) {
_supportedTypes.append(static_cast<COMP_METADATA_TYPE>(typeValue.toInt()));
}
}

Loading…
Cancel
Save