flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 11:05:33 +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

2
src/blackcore/contextnetworkimpl.h
View File

@@ -64,7 +64,7 @@ namespace BlackCore
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::isRemoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const;
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSupportingParts
//! \ingroup remoteaircraftprovider

4
src/blackcore/contextownaircraftempty.h
View File

@@ -106,7 +106,7 @@ namespace BlackCore
}
//! \copydoc IContextOwnAircraft::setAudioVoiceRoomOverrideUrls
virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url)
virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url) override
{
Q_UNUSED(voiceRoom1Url);
Q_UNUSED(voiceRoom2Url);
@@ -114,7 +114,7 @@ namespace BlackCore
}
//! \copydoc IContextOwnAircraft::enableAutomaticVoiceRoomResolution
virtual void enableAutomaticVoiceRoomResolution(bool enable)
virtual void enableAutomaticVoiceRoomResolution(bool enable) override
{
Q_UNUSED(enable);
logEmptyContextWarning(Q_FUNC_INFO);

4
src/blackcore/contextownaircraftimpl.h
View File

@@ -47,11 +47,11 @@ namespace BlackCore
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftParts
//! \ingroup ownaircraftprovider
virtual BlackMisc::Aviation::CAircraftParts getOwnAircraftParts() const;
virtual BlackMisc::Aviation::CAircraftParts getOwnAircraftParts() const override;
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftModel
//! \ingroup ownaircraftprovider
virtual BlackMisc::Simulation::CAircraftModel getOwnAircraftModel() const;
virtual BlackMisc::Simulation::CAircraftModel getOwnAircraftModel() const override;
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getDistanceToOwnAircraft
//! \ingroup ownaircraftprovider

4
src/blackcore/contextownaircraftproxy.h
View File

@@ -60,10 +60,10 @@ namespace BlackCore
virtual void setAudioOutputVolume(int outputVolume) override;
//! \copydoc IContextOwnAircraft::setAudioVoiceRoomOverrideUrls
virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url);
virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url) override;
//! \copydoc IContextOwnAircraft::enableAutomaticVoiceRoomResolution
virtual void enableAutomaticVoiceRoomResolution(bool enable);
virtual void enableAutomaticVoiceRoomResolution(bool enable) override;
//! \copydoc IContextOwnAircraft::parseCommandLine
virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override;

2
src/blackcore/contextsimulatorempty.h
View File

@@ -137,7 +137,7 @@ namespace BlackCore
}
//! \copydoc IContextSimulator::setMaxRenderedDistance
virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance)
virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance) override
{
Q_UNUSED(distance);
logEmptyContextWarning(Q_FUNC_INFO);

2
src/blackcore/contextsimulatorproxy.h
View File

@@ -90,7 +90,7 @@ namespace BlackCore
virtual void setMaxRenderedAircraft(int number) override;
//! \copydoc IContextSimulator::setMaxRenderedDistance
virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance);
virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance) override;
//! \copydoc IContextSimulator::setMaxRenderedDistance
virtual void deleteAllRenderingRestrictions() override;

4
src/blackcore/inputmanager.cpp
View File

@@ -15,8 +15,8 @@ namespace BlackCore
CInputManager::CInputManager(QObject *parent) :
QObject(parent),
m_keyboard(std::move(IKeyboard::create(this))),
m_joystick(std::move(IJoystick::create(this)))
m_keyboard(IKeyboard::create(this)),
m_joystick(IJoystick::create(this))
{
connect(m_keyboard.get(), &IKeyboard::keyCombinationChanged, this, &CInputManager::ps_processKeyCombinationChanged);
connect(m_joystick.get(), &IJoystick::buttonCombinationChanged, this, &CInputManager::ps_processButtonCombinationChanged);

2
src/blackcore/simulatorcommon.h
View File

@@ -88,7 +88,7 @@ namespace BlackCore
virtual const BlackMisc::Simulation::CSimulatorSetup &getSimulatorSetup() const override;
//! \copydoc ISimulator::unload
virtual void unload();
virtual void unload() override;
//! \copydoc IContextSimulator::deleteAllRenderingRestrictions
virtual void deleteAllRenderingRestrictions() override;

2
src/blackcore/voicevatlib.h
View File

@@ -80,7 +80,7 @@ namespace BlackCore
protected: // QObject overrides
//! Process voice lib
virtual void timerEvent(QTimerEvent *);
virtual void timerEvent(QTimerEvent *) override;
private:

2
src/blackgui/components/dbautostashingcomponent.cpp
View File

@@ -89,7 +89,7 @@ namespace BlackGui
void CDbAutoStashingComponent::ps_entitiesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
{
if (!readState != CEntityFlags::ReadFinished) { return; }
if (readState != CEntityFlags::ReadFinished) { return; }
Q_UNUSED(count);
Q_UNUSED(entity);
}

2
src/blackgui/dropsite.h
View File

@@ -36,7 +36,7 @@ namespace BlackGui
void setInfoText(const QString &dropSiteText);
//! Drop allowed
void allowDrop(bool allowed);
void allowDrop(bool allowed) override;
signals:
//! Dropped value object

2
src/blackgui/editors/distributorform.h
View File

@@ -63,7 +63,7 @@ namespace BlackGui
void clear();
//! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider);
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
public slots:
//! Set value

4
src/blackgui/filters/aircrafticaofilterbar.h
View File

@@ -45,7 +45,7 @@ namespace BlackGui
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
//! \copydoc Models::IModelFilterProvider::createModelFilter
std::unique_ptr<BlackGui::Models::IModelFilter<BlackMisc::Aviation::CAircraftIcaoCodeList> > createModelFilter() const;
std::unique_ptr<BlackGui::Models::IModelFilter<BlackMisc::Aviation::CAircraftIcaoCodeList> > createModelFilter() const override;
//! Filter by ICAO object as default values
void filter(const BlackMisc::Aviation::CAircraftIcaoCode &icao);
@@ -56,7 +56,7 @@ namespace BlackGui
protected:
//! \copydoc CFilterWidget::clearForm
void clearForm();
void clearForm() override;
private:
QScopedPointer<Ui::CAircraftIcaoFilterBar> ui;

2
src/blackgui/views/checkboxdelegate.h
View File

@@ -46,7 +46,7 @@ namespace BlackGui
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
//! \copydoc QItemDelegate::updateEditorGeometry
virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const;
virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private:
QString m_iconCheckedUrl;

2
src/blackgui/views/viewbase.h
View File

@@ -117,7 +117,7 @@ namespace BlackGui
virtual bool isDropAllowed() const override;
//! \copydoc Components::CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget);
virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget) override;
//! Resize mode
ResizeMode getResizeMode() const { return m_resizeMode; }

2
src/blackmisc/aviation/airlineicaocodelist.cpp
View File

@@ -95,7 +95,7 @@ namespace BlackMisc
}
else
{
codes == this->findByIataCode(icaoPattern.getIataCode());
codes = this->findByIataCode(icaoPattern.getIataCode());
}
if (codes.size() == 1) { return codes.front(); }

4
src/blackmisc/aviation/navsystem.h
View File

@@ -43,13 +43,13 @@ namespace BlackMisc
{ }
//! Set active frequency
void setFrequencyActiveMHz(double frequencyMHz)
void setFrequencyActiveMHz(double frequencyMHz) override
{
this->CModulator::setFrequencyActiveMHz(frequencyMHz);
}
//! Set standby frequency
void setFrequencyStandbyMHz(double frequencyMHz)
void setFrequencyStandbyMHz(double frequencyMHz) override
{
this->CModulator::setFrequencyStandbyMHz(frequencyMHz);
}

2
src/blackmisc/geo/coordinategeodetic.cpp
View File

@@ -188,7 +188,7 @@ namespace BlackMisc
std::array<double, 3> CCoordinateGeodetic::normalVectorDouble() const
{
return { this->m_x, this->m_y, this->m_z };
return { { this->m_x, this->m_y, this->m_z } };
}
void CCoordinateGeodetic::setLatitude(const CLatitude &latitude)

4
src/blackmisc/geo/coordinategeodetic.h
View File

@@ -169,10 +169,10 @@ namespace BlackMisc
virtual const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override { return this->m_geodeticHeight; }
//! \copydoc ICoordinateGeodetic::normalVector
virtual QVector3D normalVector() const;
virtual QVector3D normalVector() const override;
//! \copydoc ICoordinateGeodetic::normalVectorDouble
virtual std::array<double, 3> normalVectorDouble() const;
virtual std::array<double, 3> normalVectorDouble() const override;
//! \copydoc BlackMisc::Mixin::Index::propertyByIndex
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;

2
src/blackmisc/pq/measurementunit.h
View File

@@ -315,7 +315,7 @@ namespace BlackMisc
{
if (this->isNull()) return false;
if (value == 0) return true;
return abs(value) <= this->m_epsilon;
return std::abs(value) <= this->m_epsilon;
}
//! Is unit null?

2
src/blackmisc/simulation/ownaircraftproviderdummy.h
View File

@@ -43,7 +43,7 @@ namespace BlackMisc
virtual BlackMisc::Aviation::CAircraftParts getOwnAircraftParts() const override;
//! \copydoc IOwnAircraftProvider::getOwnAircraftModel
virtual BlackMisc::Simulation::CAircraftModel getOwnAircraftModel() const;
virtual BlackMisc::Simulation::CAircraftModel getOwnAircraftModel() const override;
//! \copydoc IOwnAircraftProvider::getDistanceToOwnAircraft
virtual BlackMisc::PhysicalQuantities::CLength getDistanceToOwnAircraft(const BlackMisc::Geo::ICoordinateGeodetic &position) const override;

2
src/blackmisc/statusexception.cpp
View File

@@ -15,7 +15,7 @@ namespace BlackMisc
m_payload(payload)
{}
CStatusException::CStatusException(const CStatusException &other) : std::exception(other)
CStatusException::CStatusException(const CStatusException &other) : std::exception(other), m_payload(other.m_payload)
{
QReadLocker lock(&other.m_lock);
this->m_temp = other.m_temp;

4
src/blackmisc/valuecache.h
View File

@@ -193,7 +193,7 @@ namespace BlackMisc
void valuesSaveRequested(const BlackMisc::CValueCachePacket &values);
private:
struct Element; // remove forward declaration when elementsStartingWith uses C++14 auto deduced return type
struct Element; // remove forward declaration (and uncomment the one below) when elementsStartingWith uses C++14 auto deduced return type
protected:
//! Returns a range referring to all elements which start with the given prefix.
@@ -235,7 +235,7 @@ namespace BlackMisc
private:
friend class Private::CValuePage;
struct Element;
// struct Element; // to be uncommented when the forward declaration above elementsStartingWith is removed
using ElementPtr = QSharedPointer<Element>; // QMap doesn't support move-only types
QMap<QString, ElementPtr> m_elements;

6
src/blackmisc/weather/metardecoder.cpp
View File

@@ -105,7 +105,7 @@ namespace BlackMisc
protected:
QString getRegExp() const override { return QStringLiteral("^(?<airport>\\w{4}) "); }
bool validateAndSet(const QRegularExpressionMatch &match, CMetar &metar) const
bool validateAndSet(const QRegularExpressionMatch &match, CMetar &metar) const override
{
QString airportAsString = match.captured("airport");
Q_ASSERT(!airportAsString.isEmpty());
@@ -475,7 +475,7 @@ namespace BlackMisc
return hash;
}
virtual bool isRepeatable() const { return true; }
virtual bool isRepeatable() const override { return true; }
// w'w' represents present weather, coded in accordance with WMO Code Table 4678.
// As many groups as necessary are included, with each group containing from 2 to 9 characters.
@@ -550,7 +550,7 @@ namespace BlackMisc
return hash;
}
virtual bool isRepeatable() const { return true; }
virtual bool isRepeatable() const override { return true; }
QString getRegExp() const override
{

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))
{

2
src/swiftlauncher/swiftlauncher.h
View File

@@ -56,7 +56,7 @@ protected:
virtual void mousePressEvent(QMouseEvent *event) override;
//! \copydoc QDialog::mouseMoveEvent
void mouseMoveEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event) override;
private:
QScopedPointer<Ui::CSwiftLauncher> ui;