From c71d358648d1c7379751db2ac9c89e996f585f63 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Mon, 17 Dec 2018 17:43:31 +0000 Subject: [PATCH] Fixed clazy warnings: unnecessary containers and containers being detached. --- src/blackgui/components/commandinput.cpp | 2 +- src/blackgui/menus/menuaction.h | 4 ++-- src/blackgui/overlaymessages.cpp | 2 +- src/blackmisc/aviation/aircrafticaocode.cpp | 2 +- src/blackmisc/datacache.cpp | 2 +- src/blackmisc/json.cpp | 8 ++++---- src/blackmisc/loghandler.cpp | 4 ++-- src/blackmisc/simulation/settings/simulatorsettings.cpp | 2 +- src/blackmisc/simulation/simulatorinfo.cpp | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/blackgui/components/commandinput.cpp b/src/blackgui/components/commandinput.cpp index 5c3825ed3..aeaf7ccaf 100644 --- a/src/blackgui/components/commandinput.cpp +++ b/src/blackgui/components/commandinput.cpp @@ -59,7 +59,7 @@ namespace BlackGui if (c.isEmpty()) { return; } if (c.startsWith('.')) { - if (c.toLower().contains("help")) + if (c.contains("help", Qt::CaseInsensitive)) { this->setCommandTooltip(); return; diff --git a/src/blackgui/menus/menuaction.h b/src/blackgui/menus/menuaction.h index c22525023..9a97217ff 100644 --- a/src/blackgui/menus/menuaction.h +++ b/src/blackgui/menus/menuaction.h @@ -320,10 +320,10 @@ namespace BlackGui QList toQList() const; //! First action - CMenuAction first() const { return toQList().first(); } + CMenuAction first() const { return m_actions.first(); } //! Last action - CMenuAction last() const { return toQList().last(); } + CMenuAction last() const { return m_actions.last(); } //! All actions; operator QList() const; diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp index 0700b98b3..d1357bf89 100644 --- a/src/blackgui/overlaymessages.cpp +++ b/src/blackgui/overlaymessages.cpp @@ -513,7 +513,7 @@ namespace BlackGui if (!m_pendingMessageCalls.isEmpty()) { - std::function f = m_pendingMessageCalls.front(); + std::function f = m_pendingMessageCalls.constFirst(); m_pendingMessageCalls.removeFirst(); const QPointer myself(this); QTimer::singleShot(500, this, [ = ] diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp index 90037dc43..3dac8435a 100644 --- a/src/blackmisc/aviation/aircrafticaocode.cpp +++ b/src/blackmisc/aviation/aircrafticaocode.cpp @@ -218,7 +218,7 @@ namespace BlackMisc CSpeed guessedVRotate = this->isVtol() ? CSpeed::null() : CSpeed(70, CSpeedUnit::km_h()); const int engines = this->getEnginesCount(); - const QChar engineType = this->getEngineType()[0].toUpper(); + const QChar engineType = this->getEngineType().at(0).toUpper(); do { if (engines == 1) diff --git a/src/blackmisc/datacache.cpp b/src/blackmisc/datacache.cpp index 8243b7189..abb6779e9 100644 --- a/src/blackmisc/datacache.cpp +++ b/src/blackmisc/datacache.cpp @@ -719,7 +719,7 @@ namespace BlackMisc QMutexLocker lock(&m_mutex); Q_ASSERT(! m_updateInProgress); - m_sessionValues[key]; // insert default-constructed value, unless key already present + m_sessionValues[key]; // clazy:exclude=detaching-member } QJsonObject CDataCacheRevision::toJson(const QMap ×tamps) diff --git a/src/blackmisc/json.cpp b/src/blackmisc/json.cpp index e9a18e453..81f3bd8d8 100644 --- a/src/blackmisc/json.cpp +++ b/src/blackmisc/json.cpp @@ -498,8 +498,8 @@ namespace BlackMisc // - type // - value if (object.size() != 1) { return object; } // no cache format - const QString key = object.keys().front(); - const QJsonObject cacheObject = object.value(key).toObject(); + const QString key = object.constBegin().key(); + const QJsonObject cacheObject = object.constBegin()->toObject(); if (cacheObject.contains("type") && cacheObject.contains("value")) { const QString type = cacheObject.value("type").toString(); // just to verify in debugger @@ -512,8 +512,8 @@ namespace BlackMisc QJsonObject unwrapCache(const QJsonObject &object) { if (object.size() != 1) { return object; } // no cache format - const QString key = object.keys().front(); - const QJsonObject cacheObject = object.value(key).toObject(); + const QString key = object.constBegin().key(); + const QJsonObject cacheObject = object.constBegin()->toObject(); if (cacheObject.contains("type") && cacheObject.contains("value")) { // return object in form type/value diff --git a/src/blackmisc/loghandler.cpp b/src/blackmisc/loghandler.cpp index 9c0d12b42..0a11fa840 100644 --- a/src/blackmisc/loghandler.cpp +++ b/src/blackmisc/loghandler.cpp @@ -82,8 +82,8 @@ namespace BlackMisc auto finder = [ & ](const PatternPair &pair) { return pair.first == pattern; }; auto comparator = [](const PatternPair &a, const PatternPair &b) { return a.first.isProperSubsetOf(b.first); }; - auto it = std::find_if(m_patternHandlers.begin(), m_patternHandlers.end(), finder); - if (it == m_patternHandlers.end()) + auto it = std::find_if(m_patternHandlers.cbegin(), m_patternHandlers.cend(), finder); + if (it == m_patternHandlers.cend()) { auto *handler = new CLogPatternHandler(this, pattern); topologicallySortedInsert(m_patternHandlers, PatternPair(pattern, handler), comparator); diff --git a/src/blackmisc/simulation/settings/simulatorsettings.cpp b/src/blackmisc/simulation/settings/simulatorsettings.cpp index be4f7f725..70c126d19 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.cpp +++ b/src/blackmisc/simulation/settings/simulatorsettings.cpp @@ -537,7 +537,7 @@ namespace BlackMisc { static const QString empty; if (this->getModelDirectoriesOrDefault().isEmpty()) { return empty; } - return this->getModelDirectoriesOrDefault().first(); + return this->getModelDirectoriesOrDefault().constFirst(); } const QStringList &CSpecializedSimulatorSettings::getDefaultModelDirectories() const diff --git a/src/blackmisc/simulation/simulatorinfo.cpp b/src/blackmisc/simulation/simulatorinfo.cpp index 775c8b949..ccb876cf1 100644 --- a/src/blackmisc/simulation/simulatorinfo.cpp +++ b/src/blackmisc/simulation/simulatorinfo.cpp @@ -418,7 +418,7 @@ namespace BlackMisc if (simulator.isNoSimulator() || simulator.isUnspecified()) { // unknown count - m_counts[5] = m_counts[5] + 1; + m_counts[5]++; return; } if (simulator.isFSX()) { m_counts[0]++; }