Fix cppcheck warnings and cleanup suppression config

- redundantAssignment
- knownConditionTrueFalse
This commit is contained in:
Roland Winklmeier
2018-08-07 14:41:05 +02:00
committed by Klaus Basan
parent 000bdee457
commit 3774f2b60f
7 changed files with 17 additions and 23 deletions

View File

@@ -14,31 +14,24 @@ noExplicitConstructor
// Ignore style issues in g2clib // Ignore style issues in g2clib
variableScope:src/plugins/weatherdata/gfs/g2clib/*.c variableScope:src/plugins/weatherdata/gfs/g2clib/*.c
// std::initializer_list should always be passed by value
passedByValue:src/blackmisc/input/actionhotkeylist.h
passedByValue:src/blackmisc/network/rawfsdmessagelist.cpp
passedByValue:src/blackmisc/logcategorylist.h
passedByValue:src/blackmisc/platformset.cpp
passedByValue:src/blackmisc/geo/coordinategeodeticlist.cpp
// variableHidingEnum for status message
variableHidingEnum:src/blackmisc/statusmessage.h
// Shared pointers should be passed by value // Shared pointers should be passed by value
passedByValue:src/blackmisc/lockfree.h passedByValue:src/blackmisc/lockfree.h
// False positive caused by cppcheck getting confused with preprocessor defines
ConfigurationNotChecked:src/xswiftbus/libxplanemp/src/XObjReadWrite.cpp
// Passing std::function by value is acceptable // Passing std::function by value is acceptable
passedByValue:src/xswiftbus/libxplanemp/src/ResourceManager.h passedByValue:src/xswiftbus/libxplanemp/src/ResourceManager.h
passedByValue:tests/blackcore/expect.h
passedByValue:src/xswiftbus/command.h passedByValue:src/xswiftbus/command.h
// Unique pointers should be passed by value // Unique pointers should be passed by value
passedByValue:src/xswiftbus/menus.h passedByValue:src/xswiftbus/menus.h
passedByValue:src/xswiftbus/menus.cpp passedByValue:src/xswiftbus/menus.cpp
// Suddenly appearing (KB 2018-03) issue here // cppcheck cannot handle the advanced workaround in use
// src/blackmisc/iterator.h 53 -> 'operator=' should return reference to 'this' instance.
operatorEqRetRefThis:src/blackmisc/iterator.h operatorEqRetRefThis:src/blackmisc/iterator.h
// Ignore unusedFunction as it has too many false positives (especially in tests)
unusedFunction
// Return value of those functions is not required.
ignoredReturnValue:src/blackmisc/dbusserver.cpp
ignoredReturnValue:src/blackmisc/simplecommandparser.cpp

View File

@@ -237,9 +237,10 @@ namespace BlackGui
const int all = models.size(); const int all = models.size();
// maximum // maximum
int max = CDbStashComponent::MaxModelPublished;
const QString maxStr(ui->le_MaxModelsStashed->text()); const QString maxStr(ui->le_MaxModelsStashed->text());
bool okMaxStr = true; bool okMaxStr = true;
int max = maxStr.isEmpty() ? CDbStashComponent::MaxModelPublished : maxStr.toInt(&okMaxStr); if (!maxStr.isEmpty()) { max = maxStr.toInt(&okMaxStr); }
if (!okMaxStr || max > all) { max = all; } if (!okMaxStr || max > all) { max = all; }
// override description // override description

View File

@@ -74,8 +74,7 @@ namespace BlackGui
void CSettingsComponent::initActions() void CSettingsComponent::initActions()
{ {
QAction *a = nullptr; QAction *a = new QAction(this);
a = new QAction(this);
a->setObjectName("overview"); a->setObjectName("overview");
a->setShortcut(QKeySequence(Qt::ALT + Qt::Key_S, Qt::Key_O)); a->setShortcut(QKeySequence(Qt::ALT + Qt::Key_S, Qt::Key_O));
connect(a, &QAction::triggered, this, &CSettingsComponent::onActionTriggered); connect(a, &QAction::triggered, this, &CSettingsComponent::onActionTriggered);

View File

@@ -23,12 +23,13 @@ namespace BlackGui
{ {
IWindowFinder *IWindowFinder::create() IWindowFinder *IWindowFinder::create()
{ {
IWindowFinder *finder = nullptr;
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
finder = new CWindowFinderWindows(); IWindowFinder *finder = new CWindowFinderWindows();
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_LINUX)
IWindowFinder *finder = nullptr;
#elif defined(Q_OS_MACOS) #elif defined(Q_OS_MACOS)
IWindowFinder *finder = nullptr;
#endif #endif
return finder; return finder;

View File

@@ -614,6 +614,7 @@ namespace BlackMisc
constexpr bool globalOffsetTest = false; constexpr bool globalOffsetTest = false;
const CCallsign cs(situation.getCallsign()); const CCallsign cs(situation.getCallsign());
// cppcheck-suppress knownConditionTrueFalse
if (!globalOffsetTest && !this->hasTestAltitudeOffset(cs)) { return situation; } if (!globalOffsetTest && !this->hasTestAltitudeOffset(cs)) { return situation; }
CLength os; CLength os;
if (globalOffsetTest) if (globalOffsetTest)

View File

@@ -53,8 +53,7 @@ namespace XSwiftBus
std::string CDBusMessage::getSender() const std::string CDBusMessage::getSender() const
{ {
const char *sender = nullptr; const char *sender = dbus_message_get_sender(m_message);
sender = dbus_message_get_sender(m_message);
return sender ? std::string(sender) : std::string(); return sender ? std::string(sender) : std::string();
} }