flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 07:35:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix linux clang errors and warnings

Browse Source 
refs #596
This commit is contained in:
Roland Winklmeier
2016-02-11 16:44:18 +01:00
parent 2da4a3e47e
commit 7953d550ea
28 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -158,8 +158,8 @@ namespace BlackSimPlugin
m_xplaneData.strobeLightsOn, m_xplaneData.landingLightsOn, m_xplaneData.taxiLightsOn,
m_xplaneData.beaconLightsOn, m_xplaneData.navLightsOn, false
},
{ m_xplaneData.gearReployRatio > 0 }, { static_cast<int>(m_xplaneData.flapsReployRatio * 100) },
{ m_xplaneData.speedBrakeRatio > 0.5 }, engines, { m_xplaneData.onGroundAll }
m_xplaneData.gearReployRatio > 0, static_cast<int>(m_xplaneData.flapsReployRatio * 100) ,
m_xplaneData.speedBrakeRatio > 0.5, engines, m_xplaneData.onGroundAll
};
updateOwnParts(parts);
}

2
src/plugins/simulator/xplane/simulatorxplane.h
View File

@@ -89,7 +89,7 @@ namespace BlackSimPlugin
virtual void reloadInstalledModels() override;
//! \copydoc BlackCore::ISimulator::getAirportsInRange
virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const;
virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const override;
//! \copydoc BlackCore::ISimulator::setTimeSynchronization
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;

20
src/plugins/weatherdata/gfs/weatherdatagfs.cpp
View File

@@ -29,13 +29,13 @@ namespace BlackWxPlugin
{
const CWeatherDataGfs::Grib2ParameterTable CWeatherDataGfs::m_grib2ParameterTable
{
{ {0, 0}, { TMP, "Temperature", "K" } },
{ {1, 1}, { RH, "Relative Humidity", "%" } },
{ {2, 2}, { UGRD, "U-Component of Wind", "m s-1" } },
{ {2, 3}, { VGRD, "V-Component of Wind", "m s-1" } },
{ {3, 0}, { PRES, "Pressure", "Pa" } },
{ {3, 1}, { PRMSL, "Pressure Reduced to MSL", "Pa" } },
{ {6, 1}, { TCDC, "Total Cloud Cover", "%" } },
{ { {0, 0} }, { TMP, "Temperature", "K" } },
{ { {1, 1} }, { RH, "Relative Humidity", "%" } },
{ { {2, 2} }, { UGRD, "U-Component of Wind", "m s-1" } },
{ { {2, 3} }, { VGRD, "V-Component of Wind", "m s-1" } },
{ { {3, 0} }, { PRES, "Pressure", "Pa" } },
{ { {3, 1} }, { PRMSL, "Pressure Reduced to MSL", "Pa" } },
{ { {6, 1} }, { TCDC, "Total Cloud Cover", "%" } },
};
double millibarToLevel(double millibar)
@@ -137,7 +137,7 @@ namespace BlackWxPlugin
"VGRD",
};
static const std::array<int, 4> cycles = { 0, 6, 12, 18 };
static const std::array<int, 4> cycles = { { 0, 6, 12, 18 } };
const QDateTime now = QDateTime::currentDateTimeUtc();
// GFS data is published after 4 yours.
@@ -443,7 +443,7 @@ namespace BlackWxPlugin
g2int parameterNumber = gfld->ipdtmpl[1];
g2int valueFirstFixedSurface = gfld->ipdtmpl[11];
std::array<g2int, 2> key { parameterCategory, parameterNumber };
std::array<g2int, 2> key { { parameterCategory, parameterNumber } };
// Make sure the key exists
if (!m_grib2ParameterTable.contains(key))
{
@@ -488,7 +488,7 @@ namespace BlackWxPlugin
g2int parameterNumber = gfld->ipdtmpl[1];
g2int typeFirstFixedSurface = gfld->ipdtmpl[9];
std::array<g2int, 2> key { parameterCategory, parameterNumber };
std::array<g2int, 2> key { { parameterCategory, parameterNumber } };
// Make sure the key exists
if (!m_grib2ParameterTable.contains(key))
{