diff --git a/src/blackcore/contextnetworkimpl.h b/src/blackcore/contextnetworkimpl.h index ed1fdee59..a1a102e70 100644 --- a/src/blackcore/contextnetworkimpl.h +++ b/src/blackcore/contextnetworkimpl.h @@ -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 diff --git a/src/blackcore/contextownaircraftempty.h b/src/blackcore/contextownaircraftempty.h index 96294932d..582a0bba5 100644 --- a/src/blackcore/contextownaircraftempty.h +++ b/src/blackcore/contextownaircraftempty.h @@ -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); diff --git a/src/blackcore/contextownaircraftimpl.h b/src/blackcore/contextownaircraftimpl.h index c3b5003aa..e0c299195 100644 --- a/src/blackcore/contextownaircraftimpl.h +++ b/src/blackcore/contextownaircraftimpl.h @@ -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 diff --git a/src/blackcore/contextownaircraftproxy.h b/src/blackcore/contextownaircraftproxy.h index 33ae70232..cd6ce6f9e 100644 --- a/src/blackcore/contextownaircraftproxy.h +++ b/src/blackcore/contextownaircraftproxy.h @@ -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; diff --git a/src/blackcore/contextsimulatorempty.h b/src/blackcore/contextsimulatorempty.h index 4a2608094..093d9143a 100644 --- a/src/blackcore/contextsimulatorempty.h +++ b/src/blackcore/contextsimulatorempty.h @@ -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); diff --git a/src/blackcore/contextsimulatorproxy.h b/src/blackcore/contextsimulatorproxy.h index 39f43b27a..5cf6371bc 100644 --- a/src/blackcore/contextsimulatorproxy.h +++ b/src/blackcore/contextsimulatorproxy.h @@ -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; diff --git a/src/blackcore/inputmanager.cpp b/src/blackcore/inputmanager.cpp index 9e503e033..573457935 100644 --- a/src/blackcore/inputmanager.cpp +++ b/src/blackcore/inputmanager.cpp @@ -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); diff --git a/src/blackcore/simulatorcommon.h b/src/blackcore/simulatorcommon.h index 9115fa15e..f6c4a533f 100644 --- a/src/blackcore/simulatorcommon.h +++ b/src/blackcore/simulatorcommon.h @@ -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; diff --git a/src/blackcore/voicevatlib.h b/src/blackcore/voicevatlib.h index dccc8b59f..d399558d5 100644 --- a/src/blackcore/voicevatlib.h +++ b/src/blackcore/voicevatlib.h @@ -80,7 +80,7 @@ namespace BlackCore protected: // QObject overrides //! Process voice lib - virtual void timerEvent(QTimerEvent *); + virtual void timerEvent(QTimerEvent *) override; private: diff --git a/src/blackgui/components/dbautostashingcomponent.cpp b/src/blackgui/components/dbautostashingcomponent.cpp index 43fe1f7ab..5ebc0ce18 100644 --- a/src/blackgui/components/dbautostashingcomponent.cpp +++ b/src/blackgui/components/dbautostashingcomponent.cpp @@ -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); } diff --git a/src/blackgui/dropsite.h b/src/blackgui/dropsite.h index b18e27c07..5aadabc70 100644 --- a/src/blackgui/dropsite.h +++ b/src/blackgui/dropsite.h @@ -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 diff --git a/src/blackgui/editors/distributorform.h b/src/blackgui/editors/distributorform.h index 90c9115bd..8f6fe250e 100644 --- a/src/blackgui/editors/distributorform.h +++ b/src/blackgui/editors/distributorform.h @@ -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 diff --git a/src/blackgui/filters/aircrafticaofilterbar.h b/src/blackgui/filters/aircrafticaofilterbar.h index c984db435..e94ba92b4 100644 --- a/src/blackgui/filters/aircrafticaofilterbar.h +++ b/src/blackgui/filters/aircrafticaofilterbar.h @@ -45,7 +45,7 @@ namespace BlackGui virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override; //! \copydoc Models::IModelFilterProvider::createModelFilter - std::unique_ptr > createModelFilter() const; + std::unique_ptr > 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; diff --git a/src/blackgui/views/checkboxdelegate.h b/src/blackgui/views/checkboxdelegate.h index 965332d53..d0c516132 100644 --- a/src/blackgui/views/checkboxdelegate.h +++ b/src/blackgui/views/checkboxdelegate.h @@ -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; diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h index 6d5f33ebd..d7176e053 100644 --- a/src/blackgui/views/viewbase.h +++ b/src/blackgui/views/viewbase.h @@ -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; } diff --git a/src/blackmisc/aviation/airlineicaocodelist.cpp b/src/blackmisc/aviation/airlineicaocodelist.cpp index 29edaab65..ef03f5521 100644 --- a/src/blackmisc/aviation/airlineicaocodelist.cpp +++ b/src/blackmisc/aviation/airlineicaocodelist.cpp @@ -95,7 +95,7 @@ namespace BlackMisc } else { - codes == this->findByIataCode(icaoPattern.getIataCode()); + codes = this->findByIataCode(icaoPattern.getIataCode()); } if (codes.size() == 1) { return codes.front(); } diff --git a/src/blackmisc/aviation/navsystem.h b/src/blackmisc/aviation/navsystem.h index 2315a4c52..76ebff70a 100644 --- a/src/blackmisc/aviation/navsystem.h +++ b/src/blackmisc/aviation/navsystem.h @@ -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); } diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp index bb9309b60..cebea8884 100644 --- a/src/blackmisc/geo/coordinategeodetic.cpp +++ b/src/blackmisc/geo/coordinategeodetic.cpp @@ -188,7 +188,7 @@ namespace BlackMisc std::array 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) diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h index 5f7de854e..b5b3c74ba 100644 --- a/src/blackmisc/geo/coordinategeodetic.h +++ b/src/blackmisc/geo/coordinategeodetic.h @@ -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 normalVectorDouble() const; + virtual std::array normalVectorDouble() const override; //! \copydoc BlackMisc::Mixin::Index::propertyByIndex CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; diff --git a/src/blackmisc/pq/measurementunit.h b/src/blackmisc/pq/measurementunit.h index f82d02d90..e3c7e9e64 100644 --- a/src/blackmisc/pq/measurementunit.h +++ b/src/blackmisc/pq/measurementunit.h @@ -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? diff --git a/src/blackmisc/simulation/ownaircraftproviderdummy.h b/src/blackmisc/simulation/ownaircraftproviderdummy.h index 4eafaa666..649ccd61e 100644 --- a/src/blackmisc/simulation/ownaircraftproviderdummy.h +++ b/src/blackmisc/simulation/ownaircraftproviderdummy.h @@ -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; diff --git a/src/blackmisc/statusexception.cpp b/src/blackmisc/statusexception.cpp index a1c052245..a7c22d1f6 100644 --- a/src/blackmisc/statusexception.cpp +++ b/src/blackmisc/statusexception.cpp @@ -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; diff --git a/src/blackmisc/valuecache.h b/src/blackmisc/valuecache.h index 8f3936b41..afae38bd6 100644 --- a/src/blackmisc/valuecache.h +++ b/src/blackmisc/valuecache.h @@ -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; // QMap doesn't support move-only types QMap m_elements; diff --git a/src/blackmisc/weather/metardecoder.cpp b/src/blackmisc/weather/metardecoder.cpp index 45adc3608..33c820878 100644 --- a/src/blackmisc/weather/metardecoder.cpp +++ b/src/blackmisc/weather/metardecoder.cpp @@ -105,7 +105,7 @@ namespace BlackMisc protected: QString getRegExp() const override { return QStringLiteral("^(?\\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 { diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 58924e1ba..fc196ca43 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -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(m_xplaneData.flapsReployRatio * 100) }, - { m_xplaneData.speedBrakeRatio > 0.5 }, engines, { m_xplaneData.onGroundAll } + m_xplaneData.gearReployRatio > 0, static_cast(m_xplaneData.flapsReployRatio * 100) , + m_xplaneData.speedBrakeRatio > 0.5, engines, m_xplaneData.onGroundAll }; updateOwnParts(parts); } diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index ffc764c2b..5c3c03654 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -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; diff --git a/src/plugins/weatherdata/gfs/weatherdatagfs.cpp b/src/plugins/weatherdata/gfs/weatherdatagfs.cpp index 5fcddcb9e..ed1627d1a 100644 --- a/src/plugins/weatherdata/gfs/weatherdatagfs.cpp +++ b/src/plugins/weatherdata/gfs/weatherdatagfs.cpp @@ -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 cycles = { 0, 6, 12, 18 }; + static const std::array 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 key { parameterCategory, parameterNumber }; + std::array 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 key { parameterCategory, parameterNumber }; + std::array key { { parameterCategory, parameterNumber } }; // Make sure the key exists if (!m_grib2ParameterTable.contains(key)) { diff --git a/src/swiftlauncher/swiftlauncher.h b/src/swiftlauncher/swiftlauncher.h index 989dcee33..a677a6c6b 100644 --- a/src/swiftlauncher/swiftlauncher.h +++ b/src/swiftlauncher/swiftlauncher.h @@ -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;