diff --git a/src/blackcore/context/contextaudioempty.h b/src/blackcore/context/contextaudioempty.h index 2ef6c5e5e..3bf6e0e58 100644 --- a/src/blackcore/context/contextaudioempty.h +++ b/src/blackcore/context/contextaudioempty.h @@ -21,7 +21,6 @@ namespace BlackCore class IVoiceChannel; namespace Context { - //! Audio context implementation class BLACKCORE_EXPORT CContextAudioEmpty : public IContextAudio { diff --git a/src/blackgui/components/maininfoareacomponent.h b/src/blackgui/components/maininfoareacomponent.h index 0c8b49799..107879484 100644 --- a/src/blackgui/components/maininfoareacomponent.h +++ b/src/blackgui/components/maininfoareacomponent.h @@ -41,7 +41,6 @@ namespace BlackGui class CUserComponent; class CWeatherComponent; - //! Main info area of pilot client class BLACKGUI_EXPORT CMainInfoAreaComponent : public BlackGui::CInfoArea { diff --git a/src/blackgui/components/settingssimulatorcomponent.cpp b/src/blackgui/components/settingssimulatorcomponent.cpp index ababfd606..a0c02efda 100644 --- a/src/blackgui/components/settingssimulatorcomponent.cpp +++ b/src/blackgui/components/settingssimulatorcomponent.cpp @@ -298,13 +298,13 @@ namespace BlackGui void CSettingsSimulatorComponent::ps_showPluginConfig(const QString &identifier) { CSimulatorPluginInfoList simDrivers(getAvailablePlugins()); - auto selected = std::find_if(simDrivers.begin(), simDrivers.end(), - [&identifier](const CSimulatorPluginInfo & info) + const auto selected = std::find_if(simDrivers.begin(), simDrivers.end(), + [&identifier](const CSimulatorPluginInfo & info) { return info.getIdentifier() == identifier; }); - QString configId = m_plugins->getPluginConfigId(selected->getIdentifier()); + const QString configId = m_plugins->getPluginConfigId(selected->getIdentifier()); IPluginConfig *config = m_plugins->getPluginById(configId); if (!config) { diff --git a/src/blackgui/components/settingssimulatorcomponent.h b/src/blackgui/components/settingssimulatorcomponent.h index ae50b8e32..fb61ff6a1 100644 --- a/src/blackgui/components/settingssimulatorcomponent.h +++ b/src/blackgui/components/settingssimulatorcomponent.h @@ -42,7 +42,7 @@ namespace BlackGui explicit CSettingsSimulatorComponent(QWidget *parent = nullptr); //! Destructor - ~CSettingsSimulatorComponent(); + virtual ~CSettingsSimulatorComponent(); private slots: //! Driver plugin enabled/disabled @@ -87,7 +87,6 @@ namespace BlackGui bool m_pluginLoaded = false; //!< plugin loaded BlackCore::CPluginManagerSimulator* m_plugins = nullptr; BlackMisc::CSetting m_enabledSimulators { this, &CSettingsSimulatorComponent::ps_reloadPluginConfig }; - }; } } // namespace diff --git a/src/blackmisc/logpattern.cpp b/src/blackmisc/logpattern.cpp index 136bb3da9..67ca63630 100644 --- a/src/blackmisc/logpattern.cpp +++ b/src/blackmisc/logpattern.cpp @@ -147,7 +147,7 @@ namespace BlackMisc result.m_severities.clear(); switch (minimumSeverity) { - // there are deliberately no break statements in this switch block + // there are deliberately no break statements in this switch block default: case CStatusMessage::SeverityDebug: result.m_severities.insert(CStatusMessage::SeverityDebug); case CStatusMessage::SeverityInfo: result.m_severities.insert(CStatusMessage::SeverityInfo); @@ -191,18 +191,18 @@ namespace BlackMisc default: case Everything: return true; case ExactMatch: return message.getCategories().contains(getString()); - case AnyOf: return std::any_of(m_strings.begin(), m_strings.end(), [ & ](const QString &s) { return message.getCategories().contains(s); }); - case AllOf: return std::all_of(m_strings.begin(), m_strings.end(), [ & ](const QString &s) { return message.getCategories().contains(s); }); - case StartsWith: return message.getCategories().containsBy([this](const CLogCategory &cat) { return cat.startsWith(getPrefix()); }); - case EndsWith: return message.getCategories().containsBy([this](const CLogCategory &cat) { return cat.endsWith(getSuffix()); }); - case Contains: return message.getCategories().containsBy([this](const CLogCategory &cat) { return cat.contains(getSubstring()); }); + case AnyOf: return std::any_of(m_strings.begin(), m_strings.end(), [ & ](const QString & s) { return message.getCategories().contains(s); }); + case AllOf: return std::all_of(m_strings.begin(), m_strings.end(), [ & ](const QString & s) { return message.getCategories().contains(s); }); + case StartsWith: return message.getCategories().containsBy([this](const CLogCategory & cat) { return cat.startsWith(getPrefix()); }); + case EndsWith: return message.getCategories().containsBy([this](const CLogCategory & cat) { return cat.endsWith(getSuffix()); }); + case Contains: return message.getCategories().containsBy([this](const CLogCategory & cat) { return cat.contains(getSubstring()); }); case Nothing: return message.getCategories().isEmpty(); } } bool CLogPattern::isProperSubsetOf(const CLogPattern &other) const { - if (! (checkInvariants() && other.checkInvariants())) + if (!(checkInvariants() && other.checkInvariants())) { Q_ASSERT(false); return false; @@ -264,20 +264,20 @@ namespace BlackMisc switch (other.m_strategy) { case AnyOf: return other.m_strings.contains(m_strings) && other.m_strings.size() > m_strings.size(); - case StartsWith: return std::all_of(m_strings.begin(), m_strings.end(), [ & ](const QString &s) { return s.startsWith(other.getPrefix()); }); - case EndsWith: return std::all_of(m_strings.begin(), m_strings.end(), [ & ](const QString &s) { return s.endsWith(other.getSuffix()); }); - case Contains: return std::all_of(m_strings.begin(), m_strings.end(), [ & ](const QString &s) { return s.contains(other.getSubstring()); }); + case StartsWith: return std::all_of(m_strings.begin(), m_strings.end(), [ & ](const QString & s) { return s.startsWith(other.getPrefix()); }); + case EndsWith: return std::all_of(m_strings.begin(), m_strings.end(), [ & ](const QString & s) { return s.endsWith(other.getSuffix()); }); + case Contains: return std::all_of(m_strings.begin(), m_strings.end(), [ & ](const QString & s) { return s.contains(other.getSubstring()); }); default: ; } case AllOf: switch (other.m_strategy) { case ExactMatch: return m_strings.contains(other.getString()); - case AnyOf: return ! (m_strings & other.m_strings).isEmpty(); + case AnyOf: return !(m_strings & other.m_strings).isEmpty(); case AllOf: return m_strings.contains(other.m_strings) && m_strings.size() > other.m_strings.size(); - case StartsWith: return std::any_of(m_strings.begin(), m_strings.end(), [ & ](const QString &s) { return s.startsWith(other.getPrefix()); }); - case EndsWith: return std::any_of(m_strings.begin(), m_strings.end(), [ & ](const QString &s) { return s.endsWith(other.getSuffix()); }); - case Contains: return std::any_of(m_strings.begin(), m_strings.end(), [ & ](const QString &s) { return s.contains(other.getSubstring()); }); + case StartsWith: return std::any_of(m_strings.begin(), m_strings.end(), [ & ](const QString & s) { return s.startsWith(other.getPrefix()); }); + case EndsWith: return std::any_of(m_strings.begin(), m_strings.end(), [ & ](const QString & s) { return s.endsWith(other.getSuffix()); }); + case Contains: return std::any_of(m_strings.begin(), m_strings.end(), [ & ](const QString & s) { return s.contains(other.getSubstring()); }); default: ; } case StartsWith: