From eb6b0ff289cb7f4b045107a13b51a09334e5ddfd Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Fri, 27 Aug 2021 16:21:41 +0100 Subject: [PATCH] Fix clang-tidy and clazy warnings --- samples/blackmisc/samplesperformance.cpp | 4 ++-- samples/blackmisc/samplesperformance.h | 4 ++-- src/blackconfig/buildconfig.cpp | 2 +- .../afv/audio/receiversampleprovider.cpp | 10 +++++----- .../afv/audio/soundcardsampleprovider.cpp | 10 +++++----- src/blackcore/afv/clients/afvclient.cpp | 2 +- src/blackcore/aircraftmatcher.cpp | 12 ++++++------ src/blackcore/airspacemonitor.cpp | 2 +- src/blackcore/application.cpp | 4 ++-- src/blackcore/context/contextnetworkimpl.cpp | 2 +- src/blackcore/context/contextsimulator.h | 2 +- src/blackcore/context/contextsimulatorempty.h | 2 +- src/blackcore/context/contextsimulatorimpl.cpp | 2 +- src/blackcore/context/contextsimulatorimpl.h | 2 +- src/blackcore/context/contextsimulatorproxy.cpp | 2 +- src/blackcore/context/contextsimulatorproxy.h | 2 +- src/blackcore/db/databasereader.cpp | 4 ++-- src/blackcore/fsd/deleteatc.cpp | 2 +- src/blackcore/fsd/deletepilot.cpp | 2 +- src/blackcore/fsd/fsdclient.cpp | 16 ++++++++-------- src/blackcore/fsd/fsdclient.h | 4 ++-- src/blackcore/weathermanager.cpp | 4 ++-- .../components/aircraftcombinedtypeselector.cpp | 2 +- src/blackgui/components/airportcompleter.cpp | 2 +- .../components/airportsmallcompleter.cpp | 4 ++-- src/blackgui/components/atcstationcomponent.cpp | 2 +- src/blackgui/components/cockpitcomponent.cpp | 6 +++--- src/blackgui/components/colorselector.cpp | 2 +- src/blackgui/components/colorselector.h | 2 +- .../dbaircrafticaoselectorcomponent.cpp | 3 +-- .../components/dbdistributorcomponent.cpp | 3 +-- src/blackgui/components/dblogincomponent.cpp | 2 +- src/blackgui/components/dbmappingcomponent.cpp | 2 +- src/blackgui/components/dbmappingcomponent.h | 2 +- src/blackgui/components/dbownmodelscomponent.cpp | 2 +- src/blackgui/components/dbownmodelscomponent.h | 2 +- src/blackgui/components/downloadcomponent.cpp | 2 +- .../components/loginoverviewcomponent.cpp | 4 ++-- .../components/mainkeypadareacomponent.cpp | 2 +- .../components/mainkeypadareacomponent.h | 2 +- src/blackgui/components/radarcomponent.cpp | 14 +++++++------- src/blackgui/components/textmessagecomponent.cpp | 3 +-- src/blackgui/components/updateinfocomponent.cpp | 2 +- src/blackgui/components/updateinfocomponent.h | 2 +- src/blackgui/dockwidgetinfoarea.cpp | 2 +- src/blackgui/dockwidgetinfoarea.h | 2 +- src/blackgui/graphs/barchart.cpp | 6 ++---- src/blackgui/guiapplication.cpp | 4 ++-- src/blackgui/guiutility.cpp | 12 ++++++------ src/blackgui/guiutility.h | 12 ++++++------ src/blackgui/menus/menuaction.cpp | 2 +- src/blackgui/models/columns.cpp | 2 +- src/blackgui/models/columns.h | 2 +- src/blackgui/shortcut.cpp | 2 +- src/blackgui/shortcut.h | 2 +- src/blackgui/views/applicationinfoview.cpp | 2 +- src/blackinput/win/joystickwindows.cpp | 2 +- src/blackmisc/applicationinfolist.cpp | 2 +- src/blackmisc/audio/audiodeviceinfolist.cpp | 2 +- src/blackmisc/audio/audiodeviceinfolist.h | 2 +- src/blackmisc/audio/notificationsounds.cpp | 5 +---- src/blackmisc/audio/notificationsounds.h | 2 +- src/blackmisc/aviation/aircraftsituation.cpp | 2 +- src/blackmisc/aviation/aircraftsituation.h | 2 +- src/blackmisc/aviation/airlineicaocode.cpp | 2 +- src/blackmisc/aviation/airlineicaocode.h | 2 +- src/blackmisc/aviation/airlineicaocodelist.cpp | 6 +++--- src/blackmisc/datacache.cpp | 2 +- src/blackmisc/datacache.h | 2 +- src/blackmisc/db/datastoreutility.cpp | 2 +- src/blackmisc/directoryutils.cpp | 2 +- src/blackmisc/directoryutils.h | 2 +- src/blackmisc/propertyindex.h | 2 +- src/blackmisc/propertyindexlist.h | 2 +- src/blackmisc/propertyindexref.h | 2 +- src/blackmisc/sequence.h | 6 +++--- src/blackmisc/settingscache.cpp | 2 +- src/blackmisc/settingscache.h | 2 +- src/blackmisc/sharedstate/activeobserver.h | 2 +- src/blackmisc/sharedstate/dbus/dupleximpl.h | 2 +- src/blackmisc/sharedstate/dbus/duplexproxy.h | 2 +- src/blackmisc/sharedstate/dbus/hubimpl.h | 2 +- src/blackmisc/sharedstate/dbus/hubproxy.h | 2 +- .../simulation/aircraftmatchersetup.cpp | 8 ++++---- src/blackmisc/simulation/aircraftmatchersetup.h | 2 +- src/blackmisc/simulation/aircraftmodel.cpp | 2 +- src/blackmisc/simulation/aircraftmodellist.cpp | 4 ++-- src/blackmisc/simulation/aircraftmodellist.h | 2 +- src/blackmisc/simulation/distributor.cpp | 2 +- src/blackmisc/simulation/distributor.h | 2 +- .../simulation/fscommon/fsdirectories.cpp | 6 +++--- .../simulation/fscommon/fsdirectories.h | 2 +- .../simulation/fscommon/vpilotmodelrule.cpp | 2 +- .../simulation/fscommon/vpilotmodelrule.h | 2 +- .../simulation/fscommon/vpilotmodelruleset.cpp | 2 +- src/blackmisc/simulation/matchinglog.cpp | 2 +- src/blackmisc/simulation/matchinglog.h | 2 +- src/blackmisc/simulation/matchingscript.cpp | 8 ++++---- src/blackmisc/simulation/matchingscript.h | 8 ++++---- .../simulation/remoteaircraftprovider.cpp | 2 +- .../simulation/settings/simulatorsettings.cpp | 4 ++-- .../simulation/settings/simulatorsettings.h | 2 +- src/blackmisc/simulation/simulatedaircraft.cpp | 2 +- src/blackmisc/simulation/simulatedaircraft.h | 2 +- src/blackmisc/simulation/simulatedaircraftlist.h | 4 ++-- src/blackmisc/simulation/simulatorinfo.cpp | 2 +- src/blackmisc/simulation/simulatorinfo.h | 2 +- src/blackmisc/statusmessagelist.cpp | 2 +- src/blackmisc/swiftdirectories.cpp | 2 +- src/blackmisc/test/testdata.cpp | 6 +++--- src/blackmisc/valuecache.cpp | 10 +++++----- src/blackmisc/weather/weathergrid.cpp | 2 +- src/blackmisc/weather/weathergrid.h | 2 +- src/blacksound/audioutilities.cpp | 2 +- src/blacksound/sampleprovider/resourcesound.cpp | 2 +- src/blacksound/threadedtonepairplayer.cpp | 2 +- .../simulator/flightgear/simulatorflightgear.cpp | 2 +- src/plugins/simulator/fscommon/fsuipcimpl.cpp | 2 +- src/plugins/simulator/xplane/simulatorxplane.cpp | 2 +- src/plugins/weatherdata/gfs/weatherdatagfs.cpp | 2 +- src/xswiftbus/dbusobject.cpp | 2 +- .../blackmisc/testcontainers/testcontainers.cpp | 8 ++++---- 122 files changed, 197 insertions(+), 205 deletions(-) diff --git a/samples/blackmisc/samplesperformance.cpp b/samples/blackmisc/samplesperformance.cpp index 2cb1938c2..dfea7634b 100644 --- a/samples/blackmisc/samplesperformance.cpp +++ b/samples/blackmisc/samplesperformance.cpp @@ -798,7 +798,7 @@ namespace BlackSample return set; } - const QMap CSamplesPerformance::situationsMap(const CCallsignSet &callsigns) + QMap CSamplesPerformance::situationsMap(const CCallsignSet &callsigns) { QMap situations; for (const CCallsign &cs : callsigns) @@ -809,7 +809,7 @@ namespace BlackSample return situations; } - const QHash CSamplesPerformance::situationsHash(const CCallsignSet &callsigns) + QHash CSamplesPerformance::situationsHash(const CCallsignSet &callsigns) { QHash situations; for (const CCallsign &cs : callsigns) diff --git a/samples/blackmisc/samplesperformance.h b/samples/blackmisc/samplesperformance.h index 956ee4e09..d34e169eb 100644 --- a/samples/blackmisc/samplesperformance.h +++ b/samples/blackmisc/samplesperformance.h @@ -96,10 +96,10 @@ namespace BlackSample static BlackMisc::Aviation::CCallsignSet callsigns(int number); //! Situations map - static const QMap situationsMap(const BlackMisc::Aviation::CCallsignSet &callsigns); + static QMap situationsMap(const BlackMisc::Aviation::CCallsignSet &callsigns); //! Situations hash - static const QHash situationsHash(const BlackMisc::Aviation::CCallsignSet &callsigns); + static QHash situationsHash(const BlackMisc::Aviation::CCallsignSet &callsigns); }; } // namespace diff --git a/src/blackconfig/buildconfig.cpp b/src/blackconfig/buildconfig.cpp index f813d04fb..c523e5a53 100644 --- a/src/blackconfig/buildconfig.cpp +++ b/src/blackconfig/buildconfig.cpp @@ -102,7 +102,7 @@ namespace BlackConfig return QDateTime::currentDateTime().daysTo(getEol()); } - const QString boolToYesNo(bool v) + static QString boolToYesNo(bool v) { return v ? QStringLiteral("yes") : QStringLiteral("no"); } diff --git a/src/blackcore/afv/audio/receiversampleprovider.cpp b/src/blackcore/afv/audio/receiversampleprovider.cpp index 4e03b5ee5..5d967cd90 100644 --- a/src/blackcore/afv/audio/receiversampleprovider.cpp +++ b/src/blackcore/afv/audio/receiversampleprovider.cpp @@ -56,7 +56,7 @@ namespace BlackCore void CReceiverSampleProvider::setBypassEffects(bool value) { - for (CCallsignSampleProvider *voiceInput : m_voiceInputs) + for (CCallsignSampleProvider *voiceInput : std::as_const(m_voiceInputs)) { voiceInput->setBypassEffects(value); } @@ -66,7 +66,7 @@ namespace BlackCore { if (frequencyHz != m_frequencyHz) { - for (CCallsignSampleProvider *voiceInput : m_voiceInputs) + for (CCallsignSampleProvider *voiceInput : std::as_const(m_voiceInputs)) { voiceInput->clear(); } @@ -88,7 +88,7 @@ namespace BlackCore m_mute = value; if (value) { - for (CCallsignSampleProvider *voiceInput : m_voiceInputs) + for (CCallsignSampleProvider *voiceInput : std::as_const(m_voiceInputs)) { voiceInput->clear(); } @@ -120,7 +120,7 @@ namespace BlackCore if (numberOfInUseInputs != m_lastNumberOfInUseInputs) { QStringList receivingCallsigns; - for (const CCallsignSampleProvider *voiceInput : m_voiceInputs) + for (const CCallsignSampleProvider *voiceInput : std::as_const(m_voiceInputs)) { const QString callsign = voiceInput->callsign(); if (!callsign.isEmpty()) @@ -221,7 +221,7 @@ namespace BlackCore QString l; int no = 0; - for (const CCallsignSampleProvider *sp : m_voiceInputs) + for (const CCallsignSampleProvider *sp : std::as_const(m_voiceInputs)) { if (!sp || !sp->inUse()) { continue; } // only log the ones in use l += (l.isEmpty() ? QStringLiteral("") : QStringLiteral("\n")) % diff --git a/src/blackcore/afv/audio/soundcardsampleprovider.cpp b/src/blackcore/afv/audio/soundcardsampleprovider.cpp index 8451a1c7f..ce7de3a6e 100644 --- a/src/blackcore/afv/audio/soundcardsampleprovider.cpp +++ b/src/blackcore/afv/audio/soundcardsampleprovider.cpp @@ -50,7 +50,7 @@ namespace BlackCore void CSoundcardSampleProvider::setBypassEffects(bool value) { - for (CReceiverSampleProvider *receiverInput : m_receiverInputs) + for (CReceiverSampleProvider *receiverInput : std::as_const(m_receiverInputs)) { receiverInput->setBypassEffects(value); } @@ -60,7 +60,7 @@ namespace BlackCore { if (active) { - if (txTransceivers.size() > 0) + if (!txTransceivers.isEmpty()) { QVector txTransceiversFiltered = txTransceivers; @@ -84,7 +84,7 @@ namespace BlackCore } else { - for (CReceiverSampleProvider *receiverInput : m_receiverInputs) + for (CReceiverSampleProvider *receiverInput : std::as_const(m_receiverInputs)) { receiverInput->setMute(false); } @@ -111,7 +111,7 @@ namespace BlackCore return a.distanceRatio > b.distanceRatio; }); - if (rxTransceiversFilteredAndSorted.size() > 0) + if (!rxTransceiversFilteredAndSorted.isEmpty()) { bool audioPlayed = false; QVector handledTransceiverIDs; @@ -171,7 +171,7 @@ namespace BlackCore } } - for (CReceiverSampleProvider *receiverInput : m_receiverInputs) + for (CReceiverSampleProvider *receiverInput : std::as_const(m_receiverInputs)) { const quint16 transceiverID = receiverInput->getId(); const bool contains = std::any_of(radioTransceivers.cbegin(), radioTransceivers.cend(), [ transceiverID ](const auto &tx) { return transceiverID == tx.id; }); diff --git a/src/blackcore/afv/clients/afvclient.cpp b/src/blackcore/afv/clients/afvclient.cpp index 129944f0f..8b84c7686 100644 --- a/src/blackcore/afv/clients/afvclient.cpp +++ b/src/blackcore/afv/clients/afvclient.cpp @@ -876,7 +876,7 @@ namespace BlackCore const QString callsign = this->getCallsign(); // threadsafe const auto transmittingTransceivers = this->getTransmittingTransceivers(); // threadsafe - if (transmittingTransceivers.size() > 0) + if (!transmittingTransceivers.isEmpty()) { if (transmit) { diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp index 3c82c4214..c62736a93 100644 --- a/src/blackcore/aircraftmatcher.cpp +++ b/src/blackcore/aircraftmatcher.cpp @@ -158,7 +158,7 @@ namespace BlackCore break; } - if (modelsWithAirline.size() > 0) + if (!modelsWithAirline.isEmpty()) { if (modelsWithAirline.size() > 1) { @@ -181,7 +181,7 @@ namespace BlackCore break; } - if (modelsWithAirline.size() > 0) + if (!modelsWithAirline.isEmpty()) { if (modelsWithAirline.size() > 1) { @@ -211,7 +211,7 @@ namespace BlackCore CCallsign::addLogDetailsToList(log, callsign, QStringLiteral("Found only 1 airline ICAO '%1' in %2 models").arg(countPerAirline.firstKey().getDesignatorDbKey()).arg(models.size()), getLogCategories()); break; } - if (modelsWithAirline.size() > 0) + if (!modelsWithAirline.isEmpty()) { if (modelsWithAirline.size() > 1) { @@ -1033,7 +1033,7 @@ namespace BlackCore } } - if (foundIcaos.size() < 1) + if (foundIcaos.isEmpty()) { CCallsign::addLogDetailsToList(log, logCallsign, QStringLiteral("Reverse lookup of aircraft ICAO '%1', nothing found").arg(designator), CAircraftMatcher::getLogCategories()); return CAircraftIcaoCode(icaoCandidate); @@ -1882,7 +1882,7 @@ namespace BlackCore } CAircraftModelList step1Data = inList.findByAirlineNamesOrTelephonyDesignator(airlineName); - if (step1Data.size() < 1 || step1Data.size() == inList.size()) + if (step1Data.isEmpty() || step1Data.size() == inList.size()) { if (log) { CCallsign::addLogDetailsToList(log, cs, info % QStringLiteral(" cannot reduce by '%1'").arg(airlineName), getLogCategories()); } step1Data = inList; @@ -1895,7 +1895,7 @@ namespace BlackCore if (step1Data.size() == 1) { return step1Data; } CAircraftModelList step2Data = inList.findByAirlineNamesOrTelephonyDesignator(telephony); - if (step2Data.size() < 1 || step2Data.size() == inList.size()) + if (step2Data.isEmpty() || step2Data.size() == inList.size()) { if (log) { CCallsign::addLogDetailsToList(log, cs, info % QStringLiteral(" cannot reduce by '%1'").arg(telephony), getLogCategories()); } step2Data = step1Data; diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index b863aa5a0..f9035c28e 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -1327,7 +1327,7 @@ namespace BlackCore // If there is no full position available yet, throw this interim position away. CAircraftSituation interimSituation(situation); CAircraftSituationList history = this->remoteAircraftSituations(callsign); - if (history.empty()) { return; } // we need one full situation at least + if (history.isEmpty()) { return; } // we need one full situation at least const CAircraftSituation lastSituation = history.latestObject(); // changed position, continue and copy values diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index ecd663c3d..56803ff04 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -1709,7 +1709,7 @@ namespace BlackCore if (m_webDataServices) { const CUrlList urls(m_webDataServices->getVatsimMetarUrls()); - if (!urls.empty()) { return urls; } + if (!urls.isEmpty()) { return urls; } } if (m_setupReader) { @@ -1724,7 +1724,7 @@ namespace BlackCore if (m_webDataServices) { const CUrlList urls(m_webDataServices->getVatsimDataFileUrls()); - if (!urls.empty()) { return urls; } + if (!urls.isEmpty()) { return urls; } } if (m_setupReader) { diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index ba15e05ab..0c20a368a 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -596,7 +596,7 @@ namespace BlackCore CCallsignSet callsigns; callsigns.push_back(callsign); const CUserList users = this->getUsersForCallsigns(callsigns); - if (users.size() < 1) { return CUser(); } + if (users.isEmpty()) { return CUser(); } return users[0]; } diff --git a/src/blackcore/context/contextsimulator.h b/src/blackcore/context/contextsimulator.h index f7284a410..c4c32a1f7 100644 --- a/src/blackcore/context/contextsimulator.h +++ b/src/blackcore/context/contextsimulator.h @@ -341,7 +341,7 @@ namespace BlackCore virtual bool testRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool add) = 0; //! Test update remote aircraft - virtual bool testUpdateRemoteAircraft(const BlackMisc::Aviation::CCallsign cs, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CAircraftParts &parts) = 0; + virtual bool testUpdateRemoteAircraft(const BlackMisc::Aviation::CCallsign &cs, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CAircraftParts &parts) = 0; //! Get matching setup virtual BlackMisc::Simulation::CAircraftMatcherSetup getMatchingSetup() const = 0; diff --git a/src/blackcore/context/contextsimulatorempty.h b/src/blackcore/context/contextsimulatorempty.h index eb863f5e6..07cbe7fa0 100644 --- a/src/blackcore/context/contextsimulatorempty.h +++ b/src/blackcore/context/contextsimulatorempty.h @@ -437,7 +437,7 @@ namespace BlackCore } //! \copydoc IContextSimulator::testUpdateRemoteAircraft - virtual bool testUpdateRemoteAircraft(const BlackMisc::Aviation::CCallsign cs, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CAircraftParts &parts) override + virtual bool testUpdateRemoteAircraft(const BlackMisc::Aviation::CCallsign &cs, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CAircraftParts &parts) override { Q_UNUSED(cs) Q_UNUSED(situation) diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index a1bb5ac46..be7394293 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -1066,7 +1066,7 @@ namespace BlackCore return added; } - bool CContextSimulator::testUpdateRemoteAircraft(const CCallsign cs, const CAircraftSituation &situation, const CAircraftParts &parts) + bool CContextSimulator::testUpdateRemoteAircraft(const CCallsign &cs, const CAircraftSituation &situation, const CAircraftParts &parts) { if (!m_simulatorPlugin.second || !m_simulatorPlugin.second->isConnected()) { return false; } CAircraftSituation s = situation; // make sure to have correct callsign diff --git a/src/blackcore/context/contextsimulatorimpl.h b/src/blackcore/context/contextsimulatorimpl.h index f7397fc21..e3774ab91 100644 --- a/src/blackcore/context/contextsimulatorimpl.h +++ b/src/blackcore/context/contextsimulatorimpl.h @@ -130,7 +130,7 @@ namespace BlackCore virtual BlackMisc::Simulation::CAircraftMatcherSetup getMatchingSetup() const override; virtual BlackMisc::CStatusMessageList copyFsxTerrainProbe(const BlackMisc::Simulation::CSimulatorInfo &simulator) override; virtual bool testRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool add) override; - virtual bool testUpdateRemoteAircraft(const BlackMisc::Aviation::CCallsign cs, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CAircraftParts &parts) override; + virtual bool testUpdateRemoteAircraft(const BlackMisc::Aviation::CCallsign &cs, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CAircraftParts &parts) override; // also in IAircraftModelSetProvider virtual BlackMisc::Simulation::CAircraftModelList getModelSet() const override; diff --git a/src/blackcore/context/contextsimulatorproxy.cpp b/src/blackcore/context/contextsimulatorproxy.cpp index 0d94494ed..ccd84c9f4 100644 --- a/src/blackcore/context/contextsimulatorproxy.cpp +++ b/src/blackcore/context/contextsimulatorproxy.cpp @@ -391,7 +391,7 @@ namespace BlackCore return m_dBusInterface->callDBusRet(QLatin1String("testRemoteAircraft"), aircraft, add); } - bool CContextSimulatorProxy::testUpdateRemoteAircraft(const CCallsign cs, const CAircraftSituation &situation, const CAircraftParts &parts) + bool CContextSimulatorProxy::testUpdateRemoteAircraft(const CCallsign &cs, const CAircraftSituation &situation, const CAircraftParts &parts) { return m_dBusInterface->callDBusRet(QLatin1String("testUpdateRemoteAircraft"), cs, situation, parts); } diff --git a/src/blackcore/context/contextsimulatorproxy.h b/src/blackcore/context/contextsimulatorproxy.h index 46c18fccd..ef817de4a 100644 --- a/src/blackcore/context/contextsimulatorproxy.h +++ b/src/blackcore/context/contextsimulatorproxy.h @@ -114,7 +114,7 @@ namespace BlackCore virtual BlackMisc::Simulation::CAircraftMatcherSetup getMatchingSetup() const override; virtual BlackMisc::CStatusMessageList copyFsxTerrainProbe(const BlackMisc::Simulation::CSimulatorInfo &simulator) override; virtual bool testRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool add) override; - virtual bool testUpdateRemoteAircraft(const BlackMisc::Aviation::CCallsign cs, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CAircraftParts &parts) override; + virtual bool testUpdateRemoteAircraft(const BlackMisc::Aviation::CCallsign &cs, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CAircraftParts &parts) override; //! @} private: diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp index 2c2f13fbd..73718803c 100644 --- a/src/blackcore/db/databasereader.cpp +++ b/src/blackcore/db/databasereader.cpp @@ -330,12 +330,12 @@ namespace BlackCore bool CDatabaseReader::hasDbInfoObjects() const { - return getDbInfoObjects().size() > 0; + return !getDbInfoObjects().isEmpty(); } bool CDatabaseReader::hasSharedInfoObjects() const { - return getSharedInfoObjects().size() > 0; + return !getSharedInfoObjects().isEmpty(); } bool CDatabaseReader::hasSharedFileHeader(const CEntityFlags::Entity entity) const diff --git a/src/blackcore/fsd/deleteatc.cpp b/src/blackcore/fsd/deleteatc.cpp index 1d1a7d5d2..c3ce07d6a 100644 --- a/src/blackcore/fsd/deleteatc.cpp +++ b/src/blackcore/fsd/deleteatc.cpp @@ -32,7 +32,7 @@ namespace BlackCore DeleteAtc DeleteAtc::fromTokens(const QStringList &tokens) { - if (tokens.size() < 1) + if (tokens.isEmpty()) { BlackMisc::CLogMessage(static_cast(nullptr)).debug(u"Wrong number of arguments."); return {}; diff --git a/src/blackcore/fsd/deletepilot.cpp b/src/blackcore/fsd/deletepilot.cpp index ff5fdbc8f..73e27d54e 100644 --- a/src/blackcore/fsd/deletepilot.cpp +++ b/src/blackcore/fsd/deletepilot.cpp @@ -33,7 +33,7 @@ namespace BlackCore DeletePilot DeletePilot::fromTokens(const QStringList &tokens) { - if (tokens.size() < 1) + if (tokens.isEmpty()) { CLogMessage(static_cast(nullptr)).debug(u"Wrong number of arguments."); return {}; diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp index 4e1ebe5d5..c44d33058 100644 --- a/src/blackcore/fsd/fsdclient.cpp +++ b/src/blackcore/fsd/fsdclient.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 +/* Copyright (C) 2019 * swift project community / contributors * * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level @@ -433,12 +433,12 @@ namespace BlackCore sendClientQuery(ClientQueryType::ATIS, callsign); } - void CFSDClient::sendClientQueryFlightPlan(const CCallsign callsign) + void CFSDClient::sendClientQueryFlightPlan(const CCallsign &callsign) { sendClientQuery(ClientQueryType::FP, {}, { callsign.toQString() }); } - void CFSDClient::sendClientQueryAircraftConfig(const CCallsign callsign) + void CFSDClient::sendClientQueryAircraftConfig(const CCallsign &callsign) { QString data = QJsonDocument(JsonPackets::aircraftConfigRequest()).toJson(QJsonDocument::Compact); data = convertToUnicodeEscaped(data); @@ -504,13 +504,13 @@ namespace BlackCore } else if (queryType == ClientQueryType::FP) { - if (queryData.size() == 0) { return; } + if (queryData.isEmpty()) { return; } const ClientQuery clientQuery(getOwnCallsignAsString(), "SERVER", ClientQueryType::FP, queryData); sendQueudedMessage(clientQuery); } else if (queryType == ClientQueryType::AircraftConfig) { - if (queryData.size() == 0) { return; } + if (queryData.isEmpty()) { return; } const ClientQuery clientQuery(getOwnCallsignAsString(), reveiverCallsign, ClientQueryType::AircraftConfig, queryData); sendQueudedMessage(clientQuery); } @@ -1342,7 +1342,7 @@ namespace BlackCore if (!inRange) { return; } // sort out all broadcasted we DO NOT NEED if (!getSetupForServer().receiveAircraftParts()) { return; } const QJsonObject config = doc.object().value("config").toObject(); - if (config.empty()) { return; } + if (config.isEmpty()) { return; } const qint64 offsetTimeMs = currentOffsetTime(callsign); emit aircraftConfigReceived(clientQuery.sender(), config, offsetTimeMs); @@ -1938,7 +1938,7 @@ namespace BlackCore if (!callByTime.isEmpty()) { const qint64 lastTs = callByTime.front().first; - for (const auto &pair : callByTime) + for (const auto &pair : std::as_const(callByTime)) { const qint64 deltaTs = lastTs - pair.first; stats += separator % QStringLiteral("%1").arg(deltaTs, 5, 10, QChar('0')) % u": " % pair.second; @@ -2175,7 +2175,7 @@ namespace BlackCore emit atisLogoffTimeReplyReceived(cs, m_mapAtisMessages[callsign].zuluLogoff); CInformationMessage atisMessage(CInformationMessage::ATIS); - for (const QString &tm : m_mapAtisMessages[callsign].textLines) + for (const QString &tm : std::as_const(m_mapAtisMessages[callsign].textLines)) { const QString fixed = tm.trimmed(); if (!fixed.isEmpty()) diff --git a/src/blackcore/fsd/fsdclient.h b/src/blackcore/fsd/fsdclient.h index fbdc7d848..e4e562212 100644 --- a/src/blackcore/fsd/fsdclient.h +++ b/src/blackcore/fsd/fsdclient.h @@ -162,8 +162,8 @@ namespace BlackCore void sendClientQueryRealName(const BlackMisc::Aviation::CCallsign &callsign); void sendClientQueryServer(const BlackMisc::Aviation::CCallsign &callsign); void sendClientQueryAtis(const BlackMisc::Aviation::CCallsign &callsign); - void sendClientQueryFlightPlan(const BlackMisc::Aviation::CCallsign callsign); - void sendClientQueryAircraftConfig(const BlackMisc::Aviation::CCallsign callsign); + void sendClientQueryFlightPlan(const BlackMisc::Aviation::CCallsign &callsign); + void sendClientQueryAircraftConfig(const BlackMisc::Aviation::CCallsign &callsign); void sendTextMessages(const BlackMisc::Network::CTextMessageList &messages); void sendTextMessage(const BlackMisc::Network::CTextMessage &message); void sendTextMessage(TextMessageGroups receiverGroup, const QString &message); diff --git a/src/blackcore/weathermanager.cpp b/src/blackcore/weathermanager.cpp index 83d4aca78..965971657 100644 --- a/src/blackcore/weathermanager.cpp +++ b/src/blackcore/weathermanager.cpp @@ -53,7 +53,7 @@ namespace BlackCore void CWeatherManager::appendRequest(const WeatherRequest &request) { const qint64 now = QDateTime::currentMSecsSinceEpoch(); - if (m_pendingRequests.size() > 0 && m_lastPendingRequestTs > 0) + if (!m_pendingRequests.isEmpty() && m_lastPendingRequestTs > 0) { const qint64 pendingMs = now - m_lastPendingRequestTs; if (pendingMs > 30 * 1000) @@ -227,7 +227,7 @@ namespace BlackCore m_pendingRequests.pop_front(); // In case there are pending requests, start over again - if (m_pendingRequests.size() > 0) + if (!m_pendingRequests.isEmpty()) { fetchNextWeatherData(); } diff --git a/src/blackgui/components/aircraftcombinedtypeselector.cpp b/src/blackgui/components/aircraftcombinedtypeselector.cpp index dce8ae6cd..b1b9dad1c 100644 --- a/src/blackgui/components/aircraftcombinedtypeselector.cpp +++ b/src/blackgui/components/aircraftcombinedtypeselector.cpp @@ -48,7 +48,7 @@ namespace BlackGui if (m_cc == cc) { return; } m_cc = cc; - if (cc.length() > 0) { aircraftType = cc.left(1); } + if (cc.length() > 0) { aircraftType = cc.at(0); } if (cc.length() > 1) { engineCount = cc.mid(1, 1); } if (cc.length() > 2) { engineType = cc.mid(2, 1); } diff --git a/src/blackgui/components/airportcompleter.cpp b/src/blackgui/components/airportcompleter.cpp index f7d9385cd..168bd937a 100644 --- a/src/blackgui/components/airportcompleter.cpp +++ b/src/blackgui/components/airportcompleter.cpp @@ -94,7 +94,7 @@ namespace BlackGui void CAirportCompleter::onAirportsChanged() { - if (!sGui && !sGui->hasWebDataServices()) { return; } + if (!sGui || !sGui->hasWebDataServices()) { return; } const CAirportList airports = sGui->getWebDataServices()->getAirports(); ui->le_Icao->setCompleter(new QCompleter(airports.allIcaoCodes(true), ui->le_Icao)); ui->le_Name->setCompleter(new QCompleter(airports.allDescriptivesNames(true), ui->le_Name)); diff --git a/src/blackgui/components/airportsmallcompleter.cpp b/src/blackgui/components/airportsmallcompleter.cpp index 16c429336..97f9b60b3 100644 --- a/src/blackgui/components/airportsmallcompleter.cpp +++ b/src/blackgui/components/airportsmallcompleter.cpp @@ -104,7 +104,7 @@ namespace BlackGui void CAirportSmallCompleter::onIcaoChanged() { - if (!sGui && !sGui->hasWebDataServices()) { return; } + if (!sGui || !sGui->hasWebDataServices()) { return; } const CAirport airport = sGui->getWebDataServices()->getAirportForIcaoDesignator(this->getIcaoText()); if (!airport.isNull()) { @@ -114,7 +114,7 @@ namespace BlackGui void CAirportSmallCompleter::onAirportsChanged() { - if (!sGui && !sGui->hasWebDataServices()) { return; } + if (!sGui || !sGui->hasWebDataServices()) { return; } const CAirportList airports = sGui->getWebDataServices()->getAirports(); ui->le_Icao->setCompleter(new QCompleter(airports.allIcaoCodes(true), ui->le_Icao)); diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index dd908b0c7..00af7c011 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -536,7 +536,7 @@ namespace BlackGui void CAtcStationComponent::showOverlayInlineTextMessage() { // COverlayMessagesFrame::showOverlayInlineTextMessage(TextMessagesCom1); - this->requestTextMessageEntryTab(TextMessagesCom1); + emit requestTextMessageEntryTab(TextMessagesCom1); } void CAtcStationComponent::onDetailsToggled(bool checked) diff --git a/src/blackgui/components/cockpitcomponent.cpp b/src/blackgui/components/cockpitcomponent.cpp index 96ede28ce..6f5eac560 100644 --- a/src/blackgui/components/cockpitcomponent.cpp +++ b/src/blackgui/components/cockpitcomponent.cpp @@ -120,18 +120,18 @@ namespace BlackGui void CCockpitComponent::mouseDoubleClickEvent(QMouseEvent *event) { - if (event) { this->requestTextMessageEntryTab(TextMessagesAll); } + if (event) { emit requestTextMessageEntryTab(TextMessagesAll); } COverlayMessagesFrame::mouseDoubleClickEvent(event); } void CCockpitComponent::onRequestTextMessageCom1() { - this->requestTextMessageEntryTab(TextMessagesCom1); + emit requestTextMessageEntryTab(TextMessagesCom1); } void CCockpitComponent::onRequestTextMessageCom2() { - this->requestTextMessageEntryTab(TextMessagesCom2); + emit requestTextMessageEntryTab(TextMessagesCom2); } void CCockpitComponent::onATCStationsChanged() diff --git a/src/blackgui/components/colorselector.cpp b/src/blackgui/components/colorselector.cpp index 5fe07a1a4..babafca64 100644 --- a/src/blackgui/components/colorselector.cpp +++ b/src/blackgui/components/colorselector.cpp @@ -83,7 +83,7 @@ namespace BlackGui this->setColor(CRgbColor(color)); } - const BlackMisc::CRgbColor CColorSelector::getColor() const + BlackMisc::CRgbColor CColorSelector::getColor() const { CRgbColor q(ui->le_Color->text()); return q; diff --git a/src/blackgui/components/colorselector.h b/src/blackgui/components/colorselector.h index 0bd9101a4..576309ebb 100644 --- a/src/blackgui/components/colorselector.h +++ b/src/blackgui/components/colorselector.h @@ -54,7 +54,7 @@ namespace BlackGui void setColor(const QColor &color); //! Selected color - const BlackMisc::CRgbColor getColor() const; + BlackMisc::CRgbColor getColor() const; //! Read only void setReadOnly(bool readOnly); diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp index 94e6b2c78..de16c9194 100644 --- a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp +++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp @@ -54,9 +54,8 @@ namespace BlackGui if (sApp && sApp->hasWebDataServices()) { connect(sApp->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAircraftIcaoSelectorComponent::onCodesRead, Qt::QueuedConnection); + this->onCodesRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFinished, sApp->getWebDataServices()->getAircraftIcaoCodesCount()); } - - this->onCodesRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFinished, sApp->getWebDataServices()->getAircraftIcaoCodesCount()); } CDbAircraftIcaoSelectorComponent::~CDbAircraftIcaoSelectorComponent() diff --git a/src/blackgui/components/dbdistributorcomponent.cpp b/src/blackgui/components/dbdistributorcomponent.cpp index 8102fb76b..218870e1d 100644 --- a/src/blackgui/components/dbdistributorcomponent.cpp +++ b/src/blackgui/components/dbdistributorcomponent.cpp @@ -46,9 +46,8 @@ namespace BlackGui if (sGui && sGui->getWebDataServices()) { connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbDistributorComponent::onDistributorsRead, Qt::QueuedConnection); + this->onDistributorsRead(CEntityFlags::DistributorEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getDistributorsCount()); } - - this->onDistributorsRead(CEntityFlags::DistributorEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getDistributorsCount()); } CDbDistributorComponent::~CDbDistributorComponent() diff --git a/src/blackgui/components/dblogincomponent.cpp b/src/blackgui/components/dblogincomponent.cpp index 1a98950a8..c050b01ad 100644 --- a/src/blackgui/components/dblogincomponent.cpp +++ b/src/blackgui/components/dblogincomponent.cpp @@ -115,7 +115,7 @@ namespace BlackGui displayOverlayMessages(msgs); return; } - else if (!msgs.empty()) + else if (!msgs.isEmpty()) { CLogMessage::preformatted(msgs); } diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp index 1cd9c372e..4cf56850d 100644 --- a/src/blackgui/components/dbmappingcomponent.cpp +++ b/src/blackgui/components/dbmappingcomponent.cpp @@ -844,7 +844,7 @@ namespace BlackGui return ui->comp_OwnAircraftModels->getOwnModelForModelString(modelString); } - const CSimulatorInfo CDbMappingComponent::getOwnModelsSimulator() const + CSimulatorInfo CDbMappingComponent::getOwnModelsSimulator() const { return ui->comp_OwnAircraftModels->getOwnModelsSimulator(); } diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h index 0d9980537..118552825 100644 --- a/src/blackgui/components/dbmappingcomponent.h +++ b/src/blackgui/components/dbmappingcomponent.h @@ -153,7 +153,7 @@ namespace BlackGui BlackMisc::Simulation::CAircraftModel getOwnModelForModelString(const QString &modelString) const; //! Own models for simulator - const BlackMisc::Simulation::CSimulatorInfo getOwnModelsSimulator() const; + BlackMisc::Simulation::CSimulatorInfo getOwnModelsSimulator() const; //! Set simulator for own models void setOwnModelsSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator); diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp index 9b4b9a43c..ab12e2106 100644 --- a/src/blackgui/components/dbownmodelscomponent.cpp +++ b/src/blackgui/components/dbownmodelscomponent.cpp @@ -145,7 +145,7 @@ namespace BlackGui return ui->tvp_OwnAircraftModels->selectedObjects(); } - const CSimulatorInfo CDbOwnModelsComponent::getOwnModelsSimulator() const + CSimulatorInfo CDbOwnModelsComponent::getOwnModelsSimulator() const { return ui->comp_SimulatorSelector->getValue(); } diff --git a/src/blackgui/components/dbownmodelscomponent.h b/src/blackgui/components/dbownmodelscomponent.h index c1c470a7a..8c5c6433e 100644 --- a/src/blackgui/components/dbownmodelscomponent.h +++ b/src/blackgui/components/dbownmodelscomponent.h @@ -81,7 +81,7 @@ namespace BlackGui BlackMisc::Simulation::CAircraftModelList getOwnSelectedModels() const; //! Own models for simulator - const BlackMisc::Simulation::CSimulatorInfo getOwnModelsSimulator() const; + BlackMisc::Simulation::CSimulatorInfo getOwnModelsSimulator() const; //! Change current simulator for own models bool setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator, bool forced = false); diff --git a/src/blackgui/components/downloadcomponent.cpp b/src/blackgui/components/downloadcomponent.cpp index 3da6766d1..21cef1034 100644 --- a/src/blackgui/components/downloadcomponent.cpp +++ b/src/blackgui/components/downloadcomponent.cpp @@ -262,7 +262,7 @@ namespace BlackGui if (!myself || !sGui || sGui->isShuttingDown()) { return; } myself->ui->pb_Download->setEnabled(true); myself->ui->pb_Launch->setEnabled(true); - this->allDownloadsCompleted(); + emit allDownloadsCompleted(); }); this->startDownloadedExecutable(); } diff --git a/src/blackgui/components/loginoverviewcomponent.cpp b/src/blackgui/components/loginoverviewcomponent.cpp index 23af1c481..043f8b403 100644 --- a/src/blackgui/components/loginoverviewcomponent.cpp +++ b/src/blackgui/components/loginoverviewcomponent.cpp @@ -143,11 +143,11 @@ namespace BlackGui CLogMessage::preformatted(msg); if (msg.isSuccess()) { - emit this->loginOrLogoffSuccessful(); + emit loginOrLogoffSuccessful(); } else { - emit this->cancel(); + this->cancel(); } } diff --git a/src/blackgui/components/mainkeypadareacomponent.cpp b/src/blackgui/components/mainkeypadareacomponent.cpp index 1031f1af0..cfa90e7c5 100644 --- a/src/blackgui/components/mainkeypadareacomponent.cpp +++ b/src/blackgui/components/mainkeypadareacomponent.cpp @@ -87,7 +87,7 @@ namespace BlackGui CMainKeypadAreaComponent::~CMainKeypadAreaComponent() { } - void CMainKeypadAreaComponent::onMainInfoAreaChanged(int currentTabIndex, QList dockedIndexes, QList floatingIndexes) + void CMainKeypadAreaComponent::onMainInfoAreaChanged(int currentTabIndex, const QList &dockedIndexes, const QList &floatingIndexes) { this->unsetInfoAreaButtons(); if (currentTabIndex >= 0) diff --git a/src/blackgui/components/mainkeypadareacomponent.h b/src/blackgui/components/mainkeypadareacomponent.h index 0156dcd46..0906585ac 100644 --- a/src/blackgui/components/mainkeypadareacomponent.h +++ b/src/blackgui/components/mainkeypadareacomponent.h @@ -44,7 +44,7 @@ namespace BlackGui virtual ~CMainKeypadAreaComponent() override; //! Main info area changed - void onMainInfoAreaChanged(int currentTabIndex, QList dockedIndexes, QList floatingIndexes); + void onMainInfoAreaChanged(int currentTabIndex, const QList &dockedIndexes, const QList &floatingIndexes); //! Focus in entry fields void focusInEntryField(); diff --git a/src/blackgui/components/radarcomponent.cpp b/src/blackgui/components/radarcomponent.cpp index 99a4397da..d790353d9 100644 --- a/src/blackgui/components/radarcomponent.cpp +++ b/src/blackgui/components/radarcomponent.cpp @@ -37,11 +37,11 @@ namespace BlackGui ui->gv_RadarView->setScene(&m_scene); ui->cb_RadarRange->addItem(QString::number(0.5) % u" nm", 0.5); - for (qreal r = 1.0; r < 10; r += 1) + for (int r = 1; r <= 9; ++r) { ui->cb_RadarRange->addItem(QString::number(r) % u" nm", r); } - for (qreal r = 10; r < 91; r += 10) + for (int r = 10; r <= 90; r += 10) { ui->cb_RadarRange->addItem(QString::number(r) % u" nm", r); } @@ -110,7 +110,7 @@ namespace BlackGui pen.setCosmetic(true); // Macro graticule, drawn as full line at every 10 nm - for (qreal range = 10.0; range < 101.0; range += 10.0) + for (int range = 10; range <= 100; range += 10) { QGraphicsEllipseItem *circle = new QGraphicsEllipseItem(-range, -range, 2.0 * range, 2.0 * range, &m_macroGraticule); circle->setPen(pen); @@ -119,9 +119,9 @@ namespace BlackGui pen.setCosmetic(true); // Micro graticule, drawn as dash line at every 2.5 nm - for (qreal range = 2.5; range < 9.9; range += 2.5) + for (qreal range = 1; range <= 3; ++range) { - QGraphicsEllipseItem *circle = new QGraphicsEllipseItem(-range, -range, 2.0 * range, 2.0 * range, &m_microGraticule); + QGraphicsEllipseItem *circle = new QGraphicsEllipseItem(-range * 2.5, -range * 2.5, 5.0 * range, 5.0 * range, &m_microGraticule); circle->setPen(pen); } } @@ -131,9 +131,9 @@ namespace BlackGui QPen pen(Qt::gray, 1, Qt::DashDotDotLine); pen.setCosmetic(true); - for (qreal angle = 0.0; angle < 359.0; angle += 30.0) + for (int angle = 0; angle < 360; angle += 30) { - const QLineF line({ 0.0, 0.0 }, polarPoint(1000.0, qDegreesToRadians(angle))); + const QLineF line({ 0.0, 0.0 }, polarPoint(1000.0, qDegreesToRadians(static_cast(angle)))); QGraphicsLineItem *li = new QGraphicsLineItem(line, &m_radials); li->setFlags(QGraphicsItem::ItemIgnoresTransformations); li->setPen(pen); diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index 25316a43a..6df15accb 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -629,7 +629,6 @@ namespace BlackGui QWidget *CTextMessageComponent::findTextMessageTabByName(const QString &name) const { if (name.isEmpty()) { return nullptr; } - const QString n = name.trimmed(); // search the private message tabs first for (int index = ui->tw_TextMessages->count() - 1; index >= 0; index--) @@ -685,7 +684,7 @@ namespace BlackGui { const CCallsign cs(tab->property("callsign").toString()); if (!validated) { return cs; } - if (!sGui && sGui->getIContextNetwork()) + if (sGui && sGui->getIContextNetwork()) { const CAtcStation atc = sGui->getIContextNetwork()->getOnlineStationForCallsign(cs); if (atc.hasCallsign()) { return atc.getCallsign(); } // first hand callsign diretcly from network context diff --git a/src/blackgui/components/updateinfocomponent.cpp b/src/blackgui/components/updateinfocomponent.cpp index af41b8f34..beeea0801 100644 --- a/src/blackgui/components/updateinfocomponent.cpp +++ b/src/blackgui/components/updateinfocomponent.cpp @@ -257,7 +257,7 @@ namespace BlackGui return CPlatform::stringToPlatformObject(p); } - const CDistribution CUpdateInfoComponent::getSelectedOrDefaultDistribution() const + CDistribution CUpdateInfoComponent::getSelectedOrDefaultDistribution() const { const QStringList settings = m_updateSettings.get(); // channel / platform QString c = ui->cb_Channels->currentText(); diff --git a/src/blackgui/components/updateinfocomponent.h b/src/blackgui/components/updateinfocomponent.h index a392e94b6..89475c936 100644 --- a/src/blackgui/components/updateinfocomponent.h +++ b/src/blackgui/components/updateinfocomponent.h @@ -99,7 +99,7 @@ namespace BlackGui const BlackMisc::CPlatform &getSelectedOrDefaultPlatform() const; //! Selected or default distribution - const BlackMisc::Db::CDistribution getSelectedOrDefaultDistribution() const; + BlackMisc::Db::CDistribution getSelectedOrDefaultDistribution() const; }; } // ns } // ns diff --git a/src/blackgui/dockwidgetinfoarea.cpp b/src/blackgui/dockwidgetinfoarea.cpp index ddf92650f..4438155e5 100644 --- a/src/blackgui/dockwidgetinfoarea.cpp +++ b/src/blackgui/dockwidgetinfoarea.cpp @@ -146,7 +146,7 @@ namespace BlackGui return nestedInfoAreas; } - const QList CDockWidgetInfoArea::findParentInfoAreas() const + QList CDockWidgetInfoArea::findParentInfoAreas() const { QList parents; QWidget *currentWidget = this->parentWidget(); diff --git a/src/blackgui/dockwidgetinfoarea.h b/src/blackgui/dockwidgetinfoarea.h index 092cb869e..17273829f 100644 --- a/src/blackgui/dockwidgetinfoarea.h +++ b/src/blackgui/dockwidgetinfoarea.h @@ -64,7 +64,7 @@ namespace BlackGui QList findNestedInfoAreas(); //! The parent info areas - const QList findParentInfoAreas() const; + QList findParentInfoAreas() const; }; } // namespace diff --git a/src/blackgui/graphs/barchart.cpp b/src/blackgui/graphs/barchart.cpp index 45a1f9551..dc28886d7 100644 --- a/src/blackgui/graphs/barchart.cpp +++ b/src/blackgui/graphs/barchart.cpp @@ -107,7 +107,7 @@ namespace BlackGui void CBarChart::setSymbols(const QStringList &titles, const QStringList &colors) { - Q_ASSERT_X(titles.size() > 0, Q_FUNC_INFO, "Need titles"); + Q_ASSERT_X(!titles.isEmpty(), Q_FUNC_INFO, "Need titles"); Q_ASSERT_X(titles.size() == colors.size(), Q_FUNC_INFO, "Need same size"); int i = 0; @@ -135,9 +135,7 @@ namespace BlackGui QVector< QVector > series; for (double d : samples) { - QVector values; - values << d; - series << values; + series << QVector { d }; } if (orientation == Qt::Vertical) diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index fa48dbdf1..e54f1d54e 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -385,7 +385,7 @@ namespace BlackGui { const QWidget *w = CGuiApplication::mainApplicationWidget(); const int s = QApplication::desktop()->screenNumber(w); - if (s < QGuiApplication::screens().size()) { return QGuiApplication::screens()[s]; } + if (s < QGuiApplication::screens().size()) { return QGuiApplication::screens().at(s); } return QGuiApplication::primaryScreen(); } @@ -1039,7 +1039,7 @@ namespace BlackGui { if (this->isShuttingDown()) { return; } if (!qObject || qObject->objectName().isEmpty()) { this->showHelp(); } - this->showHelp(qObject->objectName()); + else { this->showHelp(qObject->objectName()); } } bool CGuiApplication::triggerShowHelp(const QWidget *widget, QEvent *event) diff --git a/src/blackgui/guiutility.cpp b/src/blackgui/guiutility.cpp index 7531c731c..09c9e9348 100644 --- a/src/blackgui/guiutility.cpp +++ b/src/blackgui/guiutility.cpp @@ -263,22 +263,22 @@ namespace BlackGui return unknown; } - const QString CGuiUtility::rectAsString(const QRect &rect) + QString CGuiUtility::rectAsString(const QRect &rect) { return QStringLiteral("x: %1 y: %2 w: %3 h: %4").arg(rect.x()).arg(rect.y()).arg(rect.width()).arg(rect.height()); } - const QString CGuiUtility::rectAsString(const QRectF &rect) + QString CGuiUtility::rectAsString(const QRectF &rect) { return QStringLiteral("x: %1 y: %2 w: %3 h: %4").arg(rect.x()).arg(rect.y()).arg(rect.width()).arg(rect.height()); } - const QString CGuiUtility::sizeAsString(const QSize &size) + QString CGuiUtility::sizeAsString(const QSize &size) { return QStringLiteral("w: %1 h: %2").arg(size.width()).arg(size.height()); } - const QString CGuiUtility::sizeAsString(const QSizeF &size) + QString CGuiUtility::sizeAsString(const QSizeF &size) { return QStringLiteral("w: %1 h: %2").arg(size.width()).arg(size.height()); } @@ -972,7 +972,7 @@ namespace BlackGui return openWidgets; } - QStringList CGuiUtility::getAllWidgetTitles(const QWidgetList widgets) + QStringList CGuiUtility::getAllWidgetTitles(const QWidgetList &widgets) { QStringList titles; for (const QWidget *w : widgets) @@ -990,7 +990,7 @@ namespace BlackGui return titles; } - QStringList CGuiUtility::getAllWidgetNames(const QWidgetList widgets) + QStringList CGuiUtility::getAllWidgetNames(const QWidgetList &widgets) { QStringList titles; for (const QWidget *w : widgets) diff --git a/src/blackgui/guiutility.h b/src/blackgui/guiutility.h index e544006b2..50dd61c5b 100644 --- a/src/blackgui/guiutility.h +++ b/src/blackgui/guiutility.h @@ -87,10 +87,10 @@ namespace BlackGui //! QRect, QSize as string //! @{ - static const QString rectAsString(const QRect &rect); - static const QString rectAsString(const QRectF &rect); - static const QString sizeAsString(const QSize &size); - static const QString sizeAsString(const QSizeF &size); + static QString rectAsString(const QRect &rect); + static QString rectAsString(const QRectF &rect); + static QString sizeAsString(const QSize &size); + static QString sizeAsString(const QSizeF &size); //! @} //! Top level widgets with names @@ -292,10 +292,10 @@ namespace BlackGui static QWidgetList getAllModallWidgets(); //! All titles - static QStringList getAllWidgetTitles(const QWidgetList widgets); + static QStringList getAllWidgetTitles(const QWidgetList &widgets); //! All names - static QStringList getAllWidgetNames(const QWidgetList widgets); + static QStringList getAllWidgetNames(const QWidgetList &widgets); //! Get all dock widgets static QList getAllDockWidgets(QWidget *parent, bool floatingOnly); diff --git a/src/blackgui/menus/menuaction.cpp b/src/blackgui/menus/menuaction.cpp index 5f9b60664..8140a6845 100644 --- a/src/blackgui/menus/menuaction.cpp +++ b/src/blackgui/menus/menuaction.cpp @@ -377,7 +377,7 @@ namespace BlackGui QMenu *currentMenu = nullptr; // reverse iteration because same key values are inserted and have reverse order - for (const CMenuAction &menuAction : actions) + for (const CMenuAction &menuAction : std::as_const(actions)) { // create submenu if required if (!currentMenu) diff --git a/src/blackgui/models/columns.cpp b/src/blackgui/models/columns.cpp index 1044bc964..dc1c71ca4 100644 --- a/src/blackgui/models/columns.cpp +++ b/src/blackgui/models/columns.cpp @@ -220,7 +220,7 @@ namespace BlackGui return false; } - void CColumns::setWidthPercentages(const QList percentages) + void CColumns::setWidthPercentages(const QList &percentages) { if (percentages.isEmpty()) { diff --git a/src/blackgui/models/columns.h b/src/blackgui/models/columns.h index e8e84a1b4..a1137b8e4 100644 --- a/src/blackgui/models/columns.h +++ b/src/blackgui/models/columns.h @@ -232,7 +232,7 @@ namespace BlackGui bool hasAnyWidthPercentage() const; //! Set the width percentages - void setWidthPercentages(const QList percentages); + void setWidthPercentages(const QList &percentages); //! Calculate the absolute width QList calculateWidths(int totalWidth) const; diff --git a/src/blackgui/shortcut.cpp b/src/blackgui/shortcut.cpp index a1a39fc96..36d69d4ae 100644 --- a/src/blackgui/shortcut.cpp +++ b/src/blackgui/shortcut.cpp @@ -100,7 +100,7 @@ namespace BlackGui return k; } - const QString CShortcut::toParenthesisString(const QKeySequence &sequence) + QString CShortcut::toParenthesisString(const QKeySequence &sequence) { return QStringLiteral("(%1)").arg(sequence.toString()); } diff --git a/src/blackgui/shortcut.h b/src/blackgui/shortcut.h index 70d09d501..4dce103b7 100644 --- a/src/blackgui/shortcut.h +++ b/src/blackgui/shortcut.h @@ -71,7 +71,7 @@ namespace BlackGui static const QKeySequence &keyFontReset(); //! As string for menus etc. Looks like "(CTRL + R)" - static const QString toParenthesisString(const QKeySequence &sequence); + static QString toParenthesisString(const QKeySequence &sequence); }; } // ns #endif // guard diff --git a/src/blackgui/views/applicationinfoview.cpp b/src/blackgui/views/applicationinfoview.cpp index 13c89741e..89b992c5c 100644 --- a/src/blackgui/views/applicationinfoview.cpp +++ b/src/blackgui/views/applicationinfoview.cpp @@ -29,7 +29,7 @@ namespace BlackGui int CApplicationInfoView::otherSwiftVersionsFromDataDirectories(bool reinitOtherVersions) { const CApplicationInfoList others = CApplicationInfoList::fromOtherSwiftVersionsFromDataDirectories(reinitOtherVersions); - m_acceptRowSelection = (others.size() > 0); + m_acceptRowSelection = (!others.isEmpty()); this->updateContainer(others); return others.size(); diff --git a/src/blackinput/win/joystickwindows.cpp b/src/blackinput/win/joystickwindows.cpp index 27c7e7fe1..b032ce08b 100644 --- a/src/blackinput/win/joystickwindows.cpp +++ b/src/blackinput/win/joystickwindows.cpp @@ -252,7 +252,7 @@ namespace BlackInput return hr; } - if (m_joystickDevices.empty()) + if (m_joystickDevices.isEmpty()) { CLogMessage(this).info(u"No joystick device found"); } diff --git a/src/blackmisc/applicationinfolist.cpp b/src/blackmisc/applicationinfolist.cpp index ad7affb12..2001464f5 100644 --- a/src/blackmisc/applicationinfolist.cpp +++ b/src/blackmisc/applicationinfolist.cpp @@ -102,6 +102,6 @@ namespace BlackMisc bool CApplicationInfoList::hasOtherSwiftDataDirectories() { - return applicationDataDirectoryMapWithoutCurrentVersion().size() > 0; + return !applicationDataDirectoryMapWithoutCurrentVersion().isEmpty(); } } // ns diff --git a/src/blackmisc/audio/audiodeviceinfolist.cpp b/src/blackmisc/audio/audiodeviceinfolist.cpp index 6ceace87b..5e7c5401e 100644 --- a/src/blackmisc/audio/audiodeviceinfolist.cpp +++ b/src/blackmisc/audio/audiodeviceinfolist.cpp @@ -42,7 +42,7 @@ namespace BlackMisc return this->findByNameOrDefault(name, CAudioDeviceInfo(), strict); } - CAudioDeviceInfo CAudioDeviceInfoList::findByNameOrDefault(const QString &name, const CAudioDeviceInfo defaultDevice, bool strict) const + CAudioDeviceInfo CAudioDeviceInfoList::findByNameOrDefault(const QString &name, const CAudioDeviceInfo &defaultDevice, bool strict) const { if (name.isEmpty()) { return defaultDevice; } for (const CAudioDeviceInfo &d : *this) diff --git a/src/blackmisc/audio/audiodeviceinfolist.h b/src/blackmisc/audio/audiodeviceinfolist.h index 4659b2b1f..f1c7dfe40 100644 --- a/src/blackmisc/audio/audiodeviceinfolist.h +++ b/src/blackmisc/audio/audiodeviceinfolist.h @@ -50,7 +50,7 @@ namespace BlackMisc CAudioDeviceInfo findByName(const QString &name, bool strict = false) const; //! Find by name - CAudioDeviceInfo findByNameOrDefault(const QString &name, const CAudioDeviceInfo defaultDevice, bool strict = false) const; + CAudioDeviceInfo findByNameOrDefault(const QString &name, const CAudioDeviceInfo &defaultDevice, bool strict = false) const; //! Find by host name CAudioDeviceInfoList findByHostName(const QString &hostName) const; diff --git a/src/blackmisc/audio/notificationsounds.cpp b/src/blackmisc/audio/notificationsounds.cpp index 1fa14d6b2..d34c4b49c 100644 --- a/src/blackmisc/audio/notificationsounds.cpp +++ b/src/blackmisc/audio/notificationsounds.cpp @@ -28,12 +28,9 @@ namespace BlackMisc static const QString supMsg("supervisor msg."); static const QString unicomMsg("unicom msg."); static const QString mentioned("cs mentioned"); - static const QString joined("room joined"); - static const QString left("room left"); static const QString pttUp("PTT click up"); static const QString pttDown("PTT click down"); static const QString pttBlocked("PTT blocked"); - static const QString load("load sounds"); static const QString noaudiotx("No audio tx"); static const QString afvclick("AFC click"); static const QString afvblock("AFV blocked"); @@ -64,7 +61,7 @@ namespace BlackMisc return unknown; } - const QString CNotificationSounds::toString(Notification notification) + QString CNotificationSounds::toString(Notification notification) { QStringList n; if (notification.testFlag(NotificationError)) n << flagToString(NotificationError); diff --git a/src/blackmisc/audio/notificationsounds.h b/src/blackmisc/audio/notificationsounds.h index 55ae83438..27e747c4d 100644 --- a/src/blackmisc/audio/notificationsounds.h +++ b/src/blackmisc/audio/notificationsounds.h @@ -79,7 +79,7 @@ namespace BlackMisc static const QString &flagToString(NotificationFlag notification); //! As string - static const QString toString(Notification notification); + static QString toString(Notification notification); }; } // ns } // ns diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp index d9cc6f65d..35cdf597b 100644 --- a/src/blackmisc/aviation/aircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -544,7 +544,7 @@ namespace BlackMisc return this->getOnGroundDetails() != CAircraftSituation::NotSetGroundDetails; } - const QString CAircraftSituation::getOnGroundDetailsAsString() const + const QString &CAircraftSituation::getOnGroundDetailsAsString() const { return CAircraftSituation::onGroundDetailsToString(this->getOnGroundDetails()); } diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index 483ed1d74..309b4161e 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -250,7 +250,7 @@ namespace BlackMisc bool hasGroundDetailsForGndInterpolation() const; //! On ground reliability as string - const QString getOnGroundDetailsAsString() const; + const QString &getOnGroundDetailsAsString() const; //! On ground details bool setOnGroundDetails(CAircraftSituation::OnGroundDetails details); diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp index b2cab7b6d..c5fb460bd 100644 --- a/src/blackmisc/aviation/airlineicaocode.cpp +++ b/src/blackmisc/aviation/airlineicaocode.cpp @@ -53,7 +53,7 @@ namespace BlackMisc } } - const QString CAirlineIcaoCode::getVDesignator() const + QString CAirlineIcaoCode::getVDesignator() const { if (!this->isVirtualAirline()) { return m_designator; } return u'V' % m_designator; diff --git a/src/blackmisc/aviation/airlineicaocode.h b/src/blackmisc/aviation/airlineicaocode.h index 83a9b9db2..d4e40378d 100644 --- a/src/blackmisc/aviation/airlineicaocode.h +++ b/src/blackmisc/aviation/airlineicaocode.h @@ -69,7 +69,7 @@ namespace BlackMisc const QString &getDesignator() const { return m_designator; } //! Get airline, e.g. "DLH", but "VMVA" for virtual airlines - const QString getVDesignator() const; + QString getVDesignator() const; //! Get VDesignator plus key QString getVDesignatorDbKey() const; diff --git a/src/blackmisc/aviation/airlineicaocodelist.cpp b/src/blackmisc/aviation/airlineicaocodelist.cpp index 6332ee52e..0f7820874 100644 --- a/src/blackmisc/aviation/airlineicaocodelist.cpp +++ b/src/blackmisc/aviation/airlineicaocodelist.cpp @@ -218,7 +218,7 @@ namespace BlackMisc } CAirlineIcaoCodeList step1Data = airlineName.isEmpty() ? *this : this->findByNamesOrTelephonyDesignator(airlineName); - if (step1Data.size() < 1 || step1Data.size() == this->size()) + if (step1Data.isEmpty() || step1Data.size() == this->size()) { if (log) { CCallsign::addLogDetailsToList(log, cs, loginfo % QStringLiteral(" cannot reduce by '%1'").arg(airlineName), getLogCategories()); } step1Data = *this; @@ -231,7 +231,7 @@ namespace BlackMisc if (step1Data.size() == 1) { return step1Data; } CAirlineIcaoCodeList step2Data = telephony.isEmpty() ? step1Data : step1Data.findByNamesOrTelephonyDesignator(telephony); - if (step2Data.size() < 1 || step2Data.size() == this->size()) + if (step2Data.isEmpty() || step2Data.size() == this->size()) { if (log) { CCallsign::addLogDetailsToList(log, cs, loginfo % QStringLiteral(" cannot reduce by name '%1'").arg(telephony), getLogCategories()); } step2Data = step1Data; @@ -244,7 +244,7 @@ namespace BlackMisc if (step2Data.size() == 1) { return step2Data; } CAirlineIcaoCodeList step3Data = countryIso.isEmpty() ? step2Data : step2Data.findByCountryIsoCode(countryIso); - if (step3Data.size() < 1 || step3Data.size() == this->size()) + if (step3Data.isEmpty() || step3Data.size() == this->size()) { if (log) { CCallsign::addLogDetailsToList(log, cs, loginfo % QStringLiteral(" cannot reduce by country '%1'").arg(countryIso), getLogCategories()); } step3Data = step2Data; diff --git a/src/blackmisc/datacache.cpp b/src/blackmisc/datacache.cpp index c0575c306..b9f602b9f 100644 --- a/src/blackmisc/datacache.cpp +++ b/src/blackmisc/datacache.cpp @@ -190,7 +190,7 @@ namespace BlackMisc singleShot(0, m_serializer, [this, key] { m_revision.sessionValue(key); }); } - const QString CDataCache::relativeFilePath() + const QString &CDataCache::relativeFilePath() { static const QString p("/data/cache/core"); return p; diff --git a/src/blackmisc/datacache.h b/src/blackmisc/datacache.h index 6a345fc3c..bf743088a 100644 --- a/src/blackmisc/datacache.h +++ b/src/blackmisc/datacache.h @@ -292,7 +292,7 @@ namespace BlackMisc void sessionValue(const QString &key); //! Relative file path in application data directory - static const QString relativeFilePath(); + static const QString &relativeFilePath(); private: CDataCache(); diff --git a/src/blackmisc/db/datastoreutility.cpp b/src/blackmisc/db/datastoreutility.cpp index bc4f4a183..d36c9722b 100644 --- a/src/blackmisc/db/datastoreutility.cpp +++ b/src/blackmisc/db/datastoreutility.cpp @@ -67,7 +67,7 @@ namespace BlackMisc { const int i = valueWithKey.indexOf('('); if (i < 0) { return valueWithKey.trimmed(); } - if (i < 1) { return QStringLiteral(""); } + if (i < 1) { return {}; } return valueWithKey.left(i - 1).trimmed(); } diff --git a/src/blackmisc/directoryutils.cpp b/src/blackmisc/directoryutils.cpp index f101d82bd..b5d9cceea 100644 --- a/src/blackmisc/directoryutils.cpp +++ b/src/blackmisc/directoryutils.cpp @@ -201,7 +201,7 @@ namespace BlackMisc return sl; } - const QSet CDirectoryUtils::filesToCanonicalNames(const QSet &fileNames, const QSet &canonicalFileNames) + QSet CDirectoryUtils::filesToCanonicalNames(const QSet &fileNames, const QSet &canonicalFileNames) { CSetBuilder found; if (fileNames.isEmpty()) return {}; diff --git a/src/blackmisc/directoryutils.h b/src/blackmisc/directoryutils.h index bdb501489..31852fe2f 100644 --- a/src/blackmisc/directoryutils.h +++ b/src/blackmisc/directoryutils.h @@ -106,7 +106,7 @@ namespace BlackMisc static QSet canonicalFileNamesToQSet(const QFileInfoList &fileInfoList); //! File to canonical names - static const QSet filesToCanonicalNames(const QSet &fileNames, const QSet &canonicalFileNames); + static QSet filesToCanonicalNames(const QSet &fileNames, const QSet &canonicalFileNames); //! Can connect the UNC machine static bool canPingUncMachine(const QString &machine); diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h index c0357efc0..2cc93eb12 100644 --- a/src/blackmisc/propertyindex.h +++ b/src/blackmisc/propertyindex.h @@ -72,7 +72,7 @@ namespace BlackMisc operator CPropertyIndexRef() const; //! Copy with first element removed - CPropertyIndex copyFrontRemoved() const; + Q_REQUIRED_RESULT CPropertyIndex copyFrontRemoved() const; //! Is nested index? bool isNested() const; diff --git a/src/blackmisc/propertyindexlist.h b/src/blackmisc/propertyindexlist.h index 71c5d4b1b..809de76f0 100644 --- a/src/blackmisc/propertyindexlist.h +++ b/src/blackmisc/propertyindexlist.h @@ -36,7 +36,7 @@ namespace BlackMisc CPropertyIndexList(const CSequence &other); //! List without front element, or empty list if not applicable - CPropertyIndexList copyFrontRemoved() const; + Q_REQUIRED_RESULT CPropertyIndexList copyFrontRemoved() const; }; } //namespace diff --git a/src/blackmisc/propertyindexref.h b/src/blackmisc/propertyindexref.h index 521ae7513..5b82673ea 100644 --- a/src/blackmisc/propertyindexref.h +++ b/src/blackmisc/propertyindexref.h @@ -140,7 +140,7 @@ namespace BlackMisc explicit CPropertyIndexRef(QVector &&) = delete; //! Copy with first element removed - CPropertyIndexRef copyFrontRemoved() const; + Q_REQUIRED_RESULT CPropertyIndexRef copyFrontRemoved() const; //! Is nested index? bool isNested() const; diff --git a/src/blackmisc/sequence.h b/src/blackmisc/sequence.h index 3e05a0cdd..73bc7dc63 100644 --- a/src/blackmisc/sequence.h +++ b/src/blackmisc/sequence.h @@ -418,7 +418,7 @@ namespace BlackMisc } //! Reversed order - CSequence reversed() const + Q_REQUIRED_RESULT CSequence reversed() const { CSequence result = *this; result.reverse(); @@ -441,7 +441,7 @@ namespace BlackMisc //! Return a copy sorted by a given comparator predicate. template - CSequence sorted(Predicate p) const + Q_REQUIRED_RESULT CSequence sorted(Predicate p) const { CSequence result = *this; result.sort(p); @@ -474,7 +474,7 @@ namespace BlackMisc //! Return a copy with the smallest n elements at the beginning and sorted. template - CSequence partiallySorted(size_type n, Predicate p) const + Q_REQUIRED_RESULT CSequence partiallySorted(size_type n, Predicate p) const { CSequence result = *this; result.partiallySort(n, p); diff --git a/src/blackmisc/settingscache.cpp b/src/blackmisc/settingscache.cpp index 87a6a3775..13e31c9c5 100644 --- a/src/blackmisc/settingscache.cpp +++ b/src/blackmisc/settingscache.cpp @@ -102,7 +102,7 @@ namespace BlackMisc return CFileUtils::appendFilePaths(persistentStore(), instance()->CValueCache::filenameForKey(key)); } - const QString CSettingsCache::relativeFilePath() + const QString &CSettingsCache::relativeFilePath() { static const QString p("/settings/core"); return p; diff --git a/src/blackmisc/settingscache.h b/src/blackmisc/settingscache.h index 85bab6a48..527bc4898 100644 --- a/src/blackmisc/settingscache.h +++ b/src/blackmisc/settingscache.h @@ -53,7 +53,7 @@ namespace BlackMisc static QString filenameForKey(const QString &key); //! Relative file path in application data directory - static const QString relativeFilePath(); + static const QString &relativeFilePath(); //! Return all files where settings may be stored. QStringList enumerateStore() const; diff --git a/src/blackmisc/sharedstate/activeobserver.h b/src/blackmisc/sharedstate/activeobserver.h index 81f99c8ac..7b0b65e71 100644 --- a/src/blackmisc/sharedstate/activeobserver.h +++ b/src/blackmisc/sharedstate/activeobserver.h @@ -51,7 +51,7 @@ namespace BlackMisc signals: //! Emitted by request and requestAsync. - void requestPosted(const CVariant ¶m, BlackMisc::CPromise o_reply); + void requestPosted(const BlackMisc::CVariant ¶m, BlackMisc::CPromise o_reply); }; } } diff --git a/src/blackmisc/sharedstate/dbus/dupleximpl.h b/src/blackmisc/sharedstate/dbus/dupleximpl.h index 4a8c41baa..84a84b4ee 100644 --- a/src/blackmisc/sharedstate/dbus/dupleximpl.h +++ b/src/blackmisc/sharedstate/dbus/dupleximpl.h @@ -28,7 +28,7 @@ namespace BlackMisc /*! * Server side implementation of IDuplex. Receives messages from clients and forwards them to other clients via the CHub. */ - class BLACKMISC_EXPORT CDuplex : public IDuplex + class BLACKMISC_EXPORT CDuplex final : public IDuplex { Q_OBJECT Q_CLASSINFO("D-Bus Interface", BLACKMISC_DUPLEX_INTERFACE) diff --git a/src/blackmisc/sharedstate/dbus/duplexproxy.h b/src/blackmisc/sharedstate/dbus/duplexproxy.h index 6e0573a2a..225c7bf48 100644 --- a/src/blackmisc/sharedstate/dbus/duplexproxy.h +++ b/src/blackmisc/sharedstate/dbus/duplexproxy.h @@ -24,7 +24,7 @@ namespace BlackMisc /*! * Client side implementation of IDuplex, through which the client communicates with the server. */ - class BLACKMISC_EXPORT CDuplexProxy : public IDuplex + class BLACKMISC_EXPORT CDuplexProxy final : public IDuplex { Q_OBJECT Q_CLASSINFO("D-Bus Interface", BLACKMISC_DUPLEX_INTERFACE) diff --git a/src/blackmisc/sharedstate/dbus/hubimpl.h b/src/blackmisc/sharedstate/dbus/hubimpl.h index 41586169d..9c59e992a 100644 --- a/src/blackmisc/sharedstate/dbus/hubimpl.h +++ b/src/blackmisc/sharedstate/dbus/hubimpl.h @@ -29,7 +29,7 @@ namespace BlackMisc /*! * Server side implementation of IHub. Maintains a collection of CDuplex objects. */ - class BLACKMISC_EXPORT CHub : public IHub + class BLACKMISC_EXPORT CHub final : public IHub { Q_OBJECT Q_CLASSINFO("D-Bus Interface", BLACKMISC_HUB_INTERFACE) diff --git a/src/blackmisc/sharedstate/dbus/hubproxy.h b/src/blackmisc/sharedstate/dbus/hubproxy.h index 423954690..c1b0caf0e 100644 --- a/src/blackmisc/sharedstate/dbus/hubproxy.h +++ b/src/blackmisc/sharedstate/dbus/hubproxy.h @@ -25,7 +25,7 @@ namespace BlackMisc /*! * Client side implementation of IHub. */ - class BLACKMISC_EXPORT CHubProxy : public IHub + class BLACKMISC_EXPORT CHubProxy final : public IHub { Q_OBJECT Q_CLASSINFO("D-Bus Interface", BLACKMISC_HUB_INTERFACE) diff --git a/src/blackmisc/simulation/aircraftmatchersetup.cpp b/src/blackmisc/simulation/aircraftmatchersetup.cpp index 7df266fbd..5e1bc432d 100644 --- a/src/blackmisc/simulation/aircraftmatchersetup.cpp +++ b/src/blackmisc/simulation/aircraftmatchersetup.cpp @@ -303,14 +303,14 @@ namespace BlackMisc return n; } - const QString CAircraftMatcherSetup::forceToString(ForceMode force) + QString CAircraftMatcherSetup::forceToString(ForceMode force) { if (force.testFlag(ForceNothing)) { return QStringLiteral("nothing"); } QStringList forces; - if (force.testFlag(ForceType)) { forces << forceToString(ForceType); } - if (force.testFlag(ForceEnginecount)) { forces << forceToString(ForceEnginecount); } - if (force.testFlag(ForceEngine)) { forces << forceToString(ForceEngine); } + if (force.testFlag(ForceType)) { forces << forceFlagToString(ForceType); } + if (force.testFlag(ForceEnginecount)) { forces << forceFlagToString(ForceEnginecount); } + if (force.testFlag(ForceEngine)) { forces << forceFlagToString(ForceEngine); } return forces.join(", "); } diff --git a/src/blackmisc/simulation/aircraftmatchersetup.h b/src/blackmisc/simulation/aircraftmatchersetup.h index 2527e40f4..5eb7dad36 100644 --- a/src/blackmisc/simulation/aircraftmatchersetup.h +++ b/src/blackmisc/simulation/aircraftmatchersetup.h @@ -258,7 +258,7 @@ namespace BlackMisc static const QString &forceFlagToString(ForceModeFlag forceFlag); //! Force to string - static const QString forceToString(ForceMode force); + static QString forceToString(ForceMode force); //! Strategy to string static const QString &strategyToString(PickSimilarStrategy strategy); diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index a26205d2b..ebc913650 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -781,7 +781,7 @@ namespace BlackMisc QString CAircraftModel::getFileDirectoryPath() const { - if (!this->hasFileName()) { return QStringLiteral(""); } + if (!this->hasFileName()) { return {}; } return this->getFileDirectory().absolutePath(); } diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index 22aa35178..ce2350548 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -651,7 +651,7 @@ namespace BlackMisc CAirlineIcaoCode CAircraftModelList::getAirlineWithMaxCount() const { const QMap ac = this->countPerAirlineIcao(); - if (ac.size() < 1) { return {}; } + if (ac.isEmpty()) { return {}; } if (ac.size() == 1) { return ac.firstKey(); } const QList values = ac.values(); const int max = *std::max_element(values.begin(), values.end()); @@ -1641,7 +1641,7 @@ namespace BlackMisc return msgs; } - CStatusMessageList CAircraftModelList::validateUncFiles(const QSet uncFiles) const + CStatusMessageList CAircraftModelList::validateUncFiles(const QSet &uncFiles) const { // check if UNC paths can be reached CStatusMessageList msgs; diff --git a/src/blackmisc/simulation/aircraftmodellist.h b/src/blackmisc/simulation/aircraftmodellist.h index f123f7620..a10dbdd2a 100644 --- a/src/blackmisc/simulation/aircraftmodellist.h +++ b/src/blackmisc/simulation/aircraftmodellist.h @@ -567,7 +567,7 @@ namespace BlackMisc private: //! Validate UNC paths (Windows) - CStatusMessageList validateUncFiles(const QSet uncFiles) const; + CStatusMessageList validateUncFiles(const QSet &uncFiles) const; }; //! Model per callsign diff --git a/src/blackmisc/simulation/distributor.cpp b/src/blackmisc/simulation/distributor.cpp index db8251da7..9806de3e0 100644 --- a/src/blackmisc/simulation/distributor.cpp +++ b/src/blackmisc/simulation/distributor.cpp @@ -33,7 +33,7 @@ namespace BlackMisc this->setDbKey(unifyKeyOrAlias(id)); } - const QString CDistributor::getIdAndDescription() const + QString CDistributor::getIdAndDescription() const { if (!this->getDbKey().isEmpty() && !this->getDescription().isEmpty()) { diff --git a/src/blackmisc/simulation/distributor.h b/src/blackmisc/simulation/distributor.h index 9efc336aa..33de330f3 100644 --- a/src/blackmisc/simulation/distributor.h +++ b/src/blackmisc/simulation/distributor.h @@ -59,7 +59,7 @@ namespace BlackMisc const QString &getDescription() const { return m_description;} //! Get id and description - const QString getIdAndDescription() const; + QString getIdAndDescription() const; //! Set description void setDescription(const QString &description) { m_description = description.trimmed(); } diff --git a/src/blackmisc/simulation/fscommon/fsdirectories.cpp b/src/blackmisc/simulation/fscommon/fsdirectories.cpp index 0bfcea306..f6dfaf73e 100644 --- a/src/blackmisc/simulation/fscommon/fsdirectories.cpp +++ b/src/blackmisc/simulation/fscommon/fsdirectories.cpp @@ -477,7 +477,7 @@ namespace BlackMisc if (!correctPath) { continue; } // absolute or relative path - const QString fp = pathValue.left(3).contains(':') ? + const QString fp = pathValue.leftRef(3).contains(':') ? pathValue : CFileUtils::appendFilePaths(addOnPath, pathValue); if (CFsDirectories::logConfigPathReading()) { CLogMessage(static_cast(nullptr)).info(u"Testing '%1' as addon path: '%2'") << fp << addOnPath; } @@ -562,7 +562,7 @@ namespace BlackMisc if (containsAny(soPath, CFsDirectories::fsxSimObjectsExcludeDirectoryPatterns(), Qt::CaseInsensitive)) { continue; } // make absolute - if (!soPath.left(3).contains(':')) { soPath = CFileUtils::appendFilePaths(relPath, soPath); } + if (!soPath.leftRef(3).contains(':')) { soPath = CFileUtils::appendFilePaths(relPath, soPath); } const QDir dir(soPath); // always absolute path now if (checked && !dir.exists()) @@ -585,7 +585,7 @@ namespace BlackMisc return paths; } - const QString CFsDirectories::airFileFilter() + const QString &CFsDirectories::airFileFilter() { static const QString a("*.air"); return a; diff --git a/src/blackmisc/simulation/fscommon/fsdirectories.h b/src/blackmisc/simulation/fscommon/fsdirectories.h index 9776c245c..562a5f160 100644 --- a/src/blackmisc/simulation/fscommon/fsdirectories.h +++ b/src/blackmisc/simulation/fscommon/fsdirectories.h @@ -132,7 +132,7 @@ namespace BlackMisc static QSet fsxSimObjectsPaths(const QString &fsxFile, bool checked); //! .air file filter - static const QString airFileFilter(); + static const QString &airFileFilter(); private: //! Utility functions diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp b/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp index 541cb9986..6f6f64eb5 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp +++ b/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp @@ -32,7 +32,7 @@ namespace BlackMisc m_typeCode(typeCode.trimmed().toUpper()), m_callsignPrefix(callsignPrefix.trimmed().toUpper()), m_updatedMsSinceEpoch(updated) { } - const QString CVPilotModelRule::getDistributor() const + QString CVPilotModelRule::getDistributor() const { QString f(this->getFolder().toUpper().simplified()); f.replace(" ", ""); diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h index d8aedc727..0bfd22711 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h +++ b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h @@ -57,7 +57,7 @@ namespace BlackMisc const QString &getFolder() const { return this->m_folder;} //! Distributor derived from folder (hardcoded) - const QString getDistributor() const; + QString getDistributor() const; //! Get type code const QString &getTypeCode() const { return this->m_typeCode;} diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp index 930606186..b44c27094 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp +++ b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp @@ -92,7 +92,7 @@ namespace BlackMisc QSet removeSet(knownModels.begin(), knownModels.end()); removeSet &= QSet(remove.begin(), remove.end()); int c = 0; - for (const QString &model : removeSet) + for (const QString &model : std::as_const(removeSet)) { c += this->removeIf(&CVPilotModelRule::getModelName, model); } diff --git a/src/blackmisc/simulation/matchinglog.cpp b/src/blackmisc/simulation/matchinglog.cpp index 67b4a0b99..c93f06a4b 100644 --- a/src/blackmisc/simulation/matchinglog.cpp +++ b/src/blackmisc/simulation/matchinglog.cpp @@ -41,7 +41,7 @@ namespace BlackMisc } //! Log flag to string - const QString matchingLogToString(MatchingLog log) + QString matchingLogToString(MatchingLog log) { if (log == MatchingLogNothing) { return matchingLogFlagToString(MatchingLogNothing); } QStringList l; diff --git a/src/blackmisc/simulation/matchinglog.h b/src/blackmisc/simulation/matchinglog.h index dabebf758..dec079149 100644 --- a/src/blackmisc/simulation/matchinglog.h +++ b/src/blackmisc/simulation/matchinglog.h @@ -35,7 +35,7 @@ namespace BlackMisc Q_DECLARE_FLAGS(MatchingLog, MatchingLogFlag) //! Log flag to string - BLACKMISC_EXPORT const QString matchingLogToString(MatchingLog log); + BLACKMISC_EXPORT QString matchingLogToString(MatchingLog log); //! Log flag to string BLACKMISC_EXPORT const QString &matchingLogFlagToString(MatchingLogFlag logFlag); diff --git a/src/blackmisc/simulation/matchingscript.cpp b/src/blackmisc/simulation/matchingscript.cpp index a02d5cc0d..bfbfb3643 100644 --- a/src/blackmisc/simulation/matchingscript.cpp +++ b/src/blackmisc/simulation/matchingscript.cpp @@ -16,8 +16,8 @@ namespace BlackMisc namespace Simulation { MSInOutValues::MSInOutValues(const CCallsign &cs, - const CAircraftIcaoCode aircraftIcao, - const CAirlineIcaoCode airlineIcao, + const CAircraftIcaoCode &aircraftIcao, + const CAirlineIcaoCode &airlineIcao, const QString &livery, int liveryId) : MSInOutValues(cs.asString(), cs.getStringAsSet(), cs.getFlightNumber(), aircraftIcao.getDesignator(), aircraftIcao.getFamily(), aircraftIcao.getCombinedType(), aircraftIcao.getDbKey(), @@ -26,8 +26,8 @@ namespace BlackMisc { } MSInOutValues::MSInOutValues(const CCallsign &cs, - const CAircraftIcaoCode aircraftIcao, - const CLivery livery) : + const CAircraftIcaoCode &aircraftIcao, + const CLivery &livery) : MSInOutValues(cs, aircraftIcao, livery.getAirlineIcaoCode(), diff --git a/src/blackmisc/simulation/matchingscript.h b/src/blackmisc/simulation/matchingscript.h index f6bf41165..bb647fc5a 100644 --- a/src/blackmisc/simulation/matchingscript.h +++ b/src/blackmisc/simulation/matchingscript.h @@ -80,14 +80,14 @@ namespace BlackMisc //! Ctor MSInOutValues(const BlackMisc::Aviation::CCallsign &cs, - const BlackMisc::Aviation::CAircraftIcaoCode aircraftIcao, - const BlackMisc::Aviation::CAirlineIcaoCode airlineIcao, + const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcao, + const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcao, const QString &livery, int liveryId); //! Ctor MSInOutValues(const BlackMisc::Aviation::CCallsign &cs, - const BlackMisc::Aviation::CAircraftIcaoCode aircraftIcao, - const BlackMisc::Aviation::CLivery livery); + const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcao, + const BlackMisc::Aviation::CLivery &livery); //! Ctor MSInOutValues(const BlackMisc::Simulation::CAircraftModel &model); diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index 7e91ef6cf..8840f7a53 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -1176,7 +1176,7 @@ namespace BlackMisc // but to make sure we do the search const qint64 ts = partsList.latestTimestampMsecsSinceEpoch() - MaxPartsAgePerCallsignSecs * 1000; partsList.removeBefore(ts); - Q_ASSERT_X(partsList.size() >= 1, Q_FUNC_INFO, "Need at least 1 value"); + Q_ASSERT_X(!partsList.isEmpty(), Q_FUNC_INFO, "Need at least 1 value"); } const CCallsign &IRemoteAircraftProvider::testAltitudeOffsetCallsign() diff --git a/src/blackmisc/simulation/settings/simulatorsettings.cpp b/src/blackmisc/simulation/settings/simulatorsettings.cpp index b5dd2c82e..2ec68b6ad 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.cpp +++ b/src/blackmisc/simulation/settings/simulatorsettings.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 +/* Copyright (C) 2016 * swift project community / contributors * * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level @@ -734,7 +734,7 @@ namespace BlackMisc return empty; } - const QString CXPlaneSimulatorSettings::getPluginDirOrDefault() const + QString CXPlaneSimulatorSettings::getPluginDirOrDefault() const { return CFileUtils::appendFilePathsAndFixUnc(this->getSimulatorDirectoryOrDefault(), CXPlaneUtil::xplanePluginPathName()); } diff --git a/src/blackmisc/simulation/settings/simulatorsettings.h b/src/blackmisc/simulation/settings/simulatorsettings.h index 8a656dda5..9d29152cf 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.h +++ b/src/blackmisc/simulation/settings/simulatorsettings.h @@ -295,7 +295,7 @@ namespace BlackMisc {} //! Plugin directory or default plugin dir - const QString getPluginDirOrDefault() const; + QString getPluginDirOrDefault() const; }; //! Trait for simulator settings diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp index 8d7bc4f4d..947546ff1 100644 --- a/src/blackmisc/simulation/simulatedaircraft.cpp +++ b/src/blackmisc/simulation/simulatedaircraft.cpp @@ -195,7 +195,7 @@ namespace BlackMisc return this->getModel().hasAircraftAndAirlineDesignator(); } - const CComSystem CSimulatedAircraft::getComSystem(CComSystem::ComUnit unit) const + CComSystem CSimulatedAircraft::getComSystem(CComSystem::ComUnit unit) const { switch (unit) { diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h index 811be51aa..311b9ab0f 100644 --- a/src/blackmisc/simulation/simulatedaircraft.h +++ b/src/blackmisc/simulation/simulatedaircraft.h @@ -235,7 +235,7 @@ namespace BlackMisc const Aviation::CComSystem &getCom2System() const { return m_com2system; } //! Get COM unit - const Aviation::CComSystem getComSystem(Aviation::CComSystem::ComUnit unit) const; + Aviation::CComSystem getComSystem(Aviation::CComSystem::ComUnit unit) const; //! Set COM unit void setComSystem(const Aviation::CComSystem &com, Aviation::CComSystem::ComUnit unit); diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h index 34714b6ff..0c5c6c71d 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.h +++ b/src/blackmisc/simulation/simulatedaircraftlist.h @@ -59,10 +59,10 @@ namespace BlackMisc CAircraftModelList getModels() const; //! Enabled / disabled aircraft - CSimulatedAircraftList findByEnabled(bool enabled) const; + Q_REQUIRED_RESULT CSimulatedAircraftList findByEnabled(bool enabled) const; //! Rendered / not rendered aircraft - CSimulatedAircraftList findByRendered(bool rendered) const; + Q_REQUIRED_RESULT CSimulatedAircraftList findByRendered(bool rendered) const; //! VTOL / non VTOL aircraft CSimulatedAircraftList findByVtol(bool vtol) const; diff --git a/src/blackmisc/simulation/simulatorinfo.cpp b/src/blackmisc/simulation/simulatorinfo.cpp index 8393aca07..d43cb98e9 100644 --- a/src/blackmisc/simulation/simulatorinfo.cpp +++ b/src/blackmisc/simulation/simulatorinfo.cpp @@ -288,7 +288,7 @@ namespace BlackMisc return s; } - const CSimulatorInfo CSimulatorInfo::getLocallyInstalledSimulators() + CSimulatorInfo CSimulatorInfo::getLocallyInstalledSimulators() { CSimulatorInfo sim; bool fs9 = false; diff --git a/src/blackmisc/simulation/simulatorinfo.h b/src/blackmisc/simulation/simulatorinfo.h index af242478c..01c9729b0 100644 --- a/src/blackmisc/simulation/simulatorinfo.h +++ b/src/blackmisc/simulation/simulatorinfo.h @@ -195,7 +195,7 @@ namespace BlackMisc static const CSimulatorInfo &allFsFamilySimulators(); //! Locally installed simulators - static const CSimulatorInfo getLocallyInstalledSimulators(); + static CSimulatorInfo getLocallyInstalledSimulators(); //! Guess a default simulator based on installation static const CSimulatorInfo &guessDefaultSimulator(); diff --git a/src/blackmisc/statusmessagelist.cpp b/src/blackmisc/statusmessagelist.cpp index 5a92b2770..021c6cf2b 100644 --- a/src/blackmisc/statusmessagelist.cpp +++ b/src/blackmisc/statusmessagelist.cpp @@ -278,7 +278,7 @@ namespace BlackMisc return properties; } - const QString htmlStyleSheetImpl() + QString htmlStyleSheetImpl() { const QString style = u'.' % CStatusMessage::severityToString(CStatusMessage::SeverityDebug) % u" { color: lightgreen; } " % u'.' % CStatusMessage::severityToString(CStatusMessage::SeverityInfo) % u" { color: lightgreen; } " % diff --git a/src/blackmisc/swiftdirectories.cpp b/src/blackmisc/swiftdirectories.cpp index e4099ec28..cd45c9956 100644 --- a/src/blackmisc/swiftdirectories.cpp +++ b/src/blackmisc/swiftdirectories.cpp @@ -206,7 +206,7 @@ namespace BlackMisc return n; } - const QString getBootstrapResourceFileImpl() + QString getBootstrapResourceFileImpl() { const QString d(CSwiftDirectories::shareDirectory()); if (d.isEmpty()) { return {}; } diff --git a/src/blackmisc/test/testdata.cpp b/src/blackmisc/test/testdata.cpp index 96aa2c982..809eb9c86 100644 --- a/src/blackmisc/test/testdata.cpp +++ b/src/blackmisc/test/testdata.cpp @@ -54,7 +54,7 @@ namespace BlackMisc return vl; } - const CPropertyIndexVariantMap getCPropertyIndexVariantMapImpl() + CPropertyIndexVariantMap getCPropertyIndexVariantMapImpl() { CPropertyIndexVariantMap valueMap; valueMap.addValue(1000, 111.222); @@ -300,7 +300,7 @@ namespace BlackMisc return model; } - const CSimulatedAircraft getC172AircraftImpl() + CSimulatedAircraft getC172AircraftImpl() { CUser pilot = CTestData::getRandomPilot(); CSimulatedAircraft aircraft(pilot.getCallsign(), CTestData::getDbAircraftModelFsxA2AC172Skyhawk(), pilot, CTestData::getAircraftSituationAboveMunichTower()); @@ -317,7 +317,7 @@ namespace BlackMisc return aircraft; } - const CSimulatedAircraft getA320AircraftImpl() + CSimulatedAircraft getA320AircraftImpl() { CUser pilot = CTestData::getRandomPilot(); CSimulatedAircraft aircraft(pilot.getCallsign(), CTestData::getDbAircraftModelFsxAerosoftA320(), pilot, CTestData::getAircraftSituationAboveFrankfurtTower()); diff --git a/src/blackmisc/valuecache.cpp b/src/blackmisc/valuecache.cpp index c4ca81b04..a5063ee17 100644 --- a/src/blackmisc/valuecache.cpp +++ b/src/blackmisc/valuecache.cpp @@ -254,7 +254,7 @@ namespace BlackMisc void CValueCache::changeValues(const CValueCachePacket &values) { QMutexLocker lock(&m_mutex); - if (values.empty()) { return; } + if (values.isEmpty()) { return; } m_elements.detach(); //! \fixme see http://doc.qt.io/qt-5/containers.html#implicit-sharing-iterator-problem auto out = std::as_const(m_elements).lowerBound(values.cbegin().key()); auto end = std::as_const(m_elements).upperBound((values.cend() - 1).key()); @@ -284,7 +284,7 @@ namespace BlackMisc void CValueCache::changeValuesFromRemote(const CValueCachePacket &values, const CIdentifier &originator) { QMutexLocker lock(&m_mutex); - if (values.empty()) { return; } + if (values.isEmpty()) { return; } if (! values.valuesChanged()) { if (values.isSaved()) { emit valuesSaveRequested(values); } @@ -314,12 +314,12 @@ namespace BlackMisc ratifiedChanges.insert(in.key(), in.value(), in.timestamp()); } } - if (! ratifiedChanges.empty()) + if (! ratifiedChanges.isEmpty()) { if (ratifiedChanges.isSaved()) { emit valuesSaveRequested(ratifiedChanges); } emit valuesChanged(ratifiedChanges, nullptr); } - if (! ackedChanges.empty() && ackedChanges.isSaved()) { emit valuesSaveRequested(ackedChanges); } + if (! ackedChanges.isEmpty() && ackedChanges.isSaved()) { emit valuesSaveRequested(ackedChanges); } } QJsonObject CValueCache::saveToJson(const QString &keyPrefix) const @@ -820,7 +820,7 @@ namespace BlackMisc Q_ASSERT(m_batchMode >= 0); m_batchMode--; - if (m_batchMode <= 0 && ! m_batchedValues.empty()) + if (m_batchMode <= 0 && ! m_batchedValues.isEmpty()) { qint64 timestamp = QDateTime::currentMSecsSinceEpoch(); forEachIntersection(m_elements, m_batchedValues, [timestamp](const QString &, const ElementPtr & element, CVariantMap::const_iterator it) diff --git a/src/blackmisc/weather/weathergrid.cpp b/src/blackmisc/weather/weathergrid.cpp index 4f45ab709..caf2425ff 100644 --- a/src/blackmisc/weather/weathergrid.cpp +++ b/src/blackmisc/weather/weathergrid.cpp @@ -65,7 +65,7 @@ namespace BlackMisc return closest; } - QString CWeatherGrid::getDescription(const QString sep) const + QString CWeatherGrid::getDescription(const QString &sep) const { QString s; QTextStream qtout(&s); diff --git a/src/blackmisc/weather/weathergrid.h b/src/blackmisc/weather/weathergrid.h index 1413edd26..158d00d83 100644 --- a/src/blackmisc/weather/weathergrid.h +++ b/src/blackmisc/weather/weathergrid.h @@ -52,7 +52,7 @@ namespace BlackMisc CWeatherGrid findClosest(int number, const BlackMisc::Geo::ICoordinateGeodetic &coordinate) const; //! Allow to describe myself - QString getDescription(const QString sep = "\n") const; + QString getDescription(const QString &sep = "\n") const; //! Get all available weather scenarios static const QVector &getAllScenarios(); diff --git a/src/blacksound/audioutilities.cpp b/src/blacksound/audioutilities.cpp index a99c230ff..7251a2324 100644 --- a/src/blacksound/audioutilities.cpp +++ b/src/blacksound/audioutilities.cpp @@ -124,7 +124,7 @@ namespace BlackSound } } - if (supportedDevices.empty()) { return {}; } + if (supportedDevices.isEmpty()) { return {}; } QAudioDeviceInfo deviceWithLowestLatency = supportedDevices.at(0); diff --git a/src/blacksound/sampleprovider/resourcesound.cpp b/src/blacksound/sampleprovider/resourcesound.cpp index 4c3e9069e..195744347 100644 --- a/src/blacksound/sampleprovider/resourcesound.cpp +++ b/src/blacksound/sampleprovider/resourcesound.cpp @@ -57,7 +57,7 @@ namespace BlackSound const QString &CResourceSound::getFileName() const { static const QString empty; - return m_data ? empty : m_data->fileName; + return m_data ? m_data->fileName : empty; } bool CResourceSound::isSameFileName(const QString &fn) const diff --git a/src/blacksound/threadedtonepairplayer.cpp b/src/blacksound/threadedtonepairplayer.cpp index 64dd46990..d0492bd7c 100644 --- a/src/blacksound/threadedtonepairplayer.cpp +++ b/src/blacksound/threadedtonepairplayer.cpp @@ -113,7 +113,7 @@ namespace BlackSound QByteArray CThreadedTonePairPlayer::getAudioByTonePairs(const QList &tonePairs) { - Q_ASSERT(tonePairs.size() > 0); + Q_ASSERT(!tonePairs.isEmpty()); QByteArray finalBufferData; for (const auto &tonePair : std::as_const(tonePairs)) diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.cpp b/src/plugins/simulator/flightgear/simulatorflightgear.cpp index 8f9fc9e8f..b92b51710 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.cpp +++ b/src/plugins/simulator/flightgear/simulatorflightgear.cpp @@ -639,7 +639,7 @@ namespace BlackSimPlugin int aircraftNumber = 0; const bool updateAllAircraft = this->isUpdateAllRemoteAircraft(currentTimestamp); const CCallsignSet callsignsInRange = this->getAircraftInRangeCallsigns(); - for (const CFlightgearMPAircraft &flightgearAircraft : m_flightgearAircraftObjects) + for (const CFlightgearMPAircraft &flightgearAircraft : std::as_const(m_flightgearAircraftObjects)) { const CCallsign callsign(flightgearAircraft.getCallsign()); const bool hasCallsign = !callsign.isEmpty(); diff --git a/src/plugins/simulator/fscommon/fsuipcimpl.cpp b/src/plugins/simulator/fscommon/fsuipcimpl.cpp index cf596e192..d512671c3 100644 --- a/src/plugins/simulator/fscommon/fsuipcimpl.cpp +++ b/src/plugins/simulator/fscommon/fsuipcimpl.cpp @@ -599,7 +599,7 @@ namespace BlackSimPlugin void CFsuipc::processWeatherMessages() { - if (m_weatherMessageQueue.empty()) { return; } + if (m_weatherMessageQueue.isEmpty()) { return; } if (!m_opened) { return; } FsuipcWeatherMessage &weatherMessage = m_weatherMessageQueue.first(); diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index f049f3f9f..68b5e337f 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -1046,7 +1046,7 @@ namespace BlackSimPlugin int aircraftNumber = 0; const bool updateAllAircraft = this->isUpdateAllRemoteAircraft(currentTimestamp); const CCallsignSet callsignsInRange = this->getAircraftInRangeCallsigns(); - for (const CXPlaneMPAircraft &xplaneAircraft : m_xplaneAircraftObjects) + for (const CXPlaneMPAircraft &xplaneAircraft : std::as_const(m_xplaneAircraftObjects)) { const CCallsign callsign(xplaneAircraft.getCallsign()); const bool hasCallsign = !callsign.isEmpty(); diff --git a/src/plugins/weatherdata/gfs/weatherdatagfs.cpp b/src/plugins/weatherdata/gfs/weatherdatagfs.cpp index cc58bfe51..ea66c6720 100644 --- a/src/plugins/weatherdata/gfs/weatherdatagfs.cpp +++ b/src/plugins/weatherdata/gfs/weatherdatagfs.cpp @@ -379,7 +379,7 @@ namespace BlackWxPlugin if (nscan != 0) { CLogMessage(this).error(u"Can only handle scanning mode NS:WE."); } if (npnts != nx * ny) { CLogMessage(this).error(u"Cannot handle non-regular grid."); } - if (m_gfsWeatherGrid.empty()) { createWeatherGrid(gfld); } + if (m_gfsWeatherGrid.isEmpty()) { createWeatherGrid(gfld); } if (gfld->ipdtnum == 0) { handleProductDefinitionTemplate40(gfld); } else if (gfld->ipdtnum == 8) { handleProductDefinitionTemplate48(gfld); } diff --git a/src/xswiftbus/dbusobject.cpp b/src/xswiftbus/dbusobject.cpp index cf11063ec..5e374c042 100644 --- a/src/xswiftbus/dbusobject.cpp +++ b/src/xswiftbus/dbusobject.cpp @@ -66,7 +66,7 @@ namespace XSwiftBus void CDBusObject::invokeQueuedDBusCalls() { std::lock_guard lock(m_mutex); - while (m_qeuedDBusCalls.size() > 0) + while (!m_qeuedDBusCalls.empty()) { m_qeuedDBusCalls.front()(); m_qeuedDBusCalls.pop_front(); diff --git a/tests/blackmisc/testcontainers/testcontainers.cpp b/tests/blackmisc/testcontainers/testcontainers.cpp index f27256480..8986c8ed7 100644 --- a/tests/blackmisc/testcontainers/testcontainers.cpp +++ b/tests/blackmisc/testcontainers/testcontainers.cpp @@ -80,7 +80,7 @@ namespace BlackMiscTest void CTestContainers::collectionBasics() { CCollection c1; - QVERIFY2(c1.empty(), "Uninitialized collection is empty"); + QVERIFY2(c1.isEmpty(), "Uninitialized collection is empty"); auto c2 = c1; QVERIFY2(c1 == c2, "Copy of collection is equal"); c1.insert(1); @@ -89,7 +89,7 @@ namespace BlackMiscTest c2.insert(1); QVERIFY2(c1 == c2, "Collections with equal elements are equal"); c1.clear(); - QVERIFY2(c1.empty(), "Cleared collection is empty"); + QVERIFY2(c1.isEmpty(), "Cleared collection is empty"); c1.insert(2); QVERIFY2(c1 != c2, "Collections with different elements are not equal"); c1 = c2; @@ -99,7 +99,7 @@ namespace BlackMiscTest void CTestContainers::sequenceBasics() { CSequence s1; - QVERIFY2(s1.empty(), "Uninitialized sequence is empty"); + QVERIFY2(s1.isEmpty(), "Uninitialized sequence is empty"); auto s2 = s1; QVERIFY2(s1 == s2, "Copy of sequence is equal"); s1.push_back(1); @@ -108,7 +108,7 @@ namespace BlackMiscTest s2.push_back(1); QVERIFY2(s1 == s2, "Sequences with equal elements are equal"); s1.clear(); - QVERIFY2(s1.empty(), "Cleared sequence is empty"); + QVERIFY2(s1.isEmpty(), "Cleared sequence is empty"); s1.push_back(2); QVERIFY2(s1 != s2, "Sequences with different elements are not equal"); s1 = s2;