Skip to content

Commit bfe19af

Browse files
firewavefirewave
authored
fixed some "Declaration and assignment can be joined" Rider warnings (danmar#5569)
1 parent b40d36a commit bfe19af

File tree

8 files changed

+22
-42
lines changed

8 files changed

+22
-42
lines changed

‎gui/projectfile.cpp‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -388,10 +388,9 @@ QString ProjectFile::readString(QXmlStreamReader &reader)
388388

389389
void ProjectFile::readIncludeDirs(QXmlStreamReader &reader)
390390
{
391-
QXmlStreamReader::TokenType type;
392391
bool allRead = false;
393392
do {
394-
type = reader.readNext();
393+
QXmlStreamReader::TokenType type = reader.readNext();
395394
switch (type) {
396395
case QXmlStreamReader::StartElement:
397396

@@ -426,10 +425,9 @@ void ProjectFile::readIncludeDirs(QXmlStreamReader &reader)
426425

427426
void ProjectFile::readDefines(QXmlStreamReader &reader)
428427
{
429-
QXmlStreamReader::TokenType type;
430428
bool allRead = false;
431429
do {
432-
type = reader.readNext();
430+
QXmlStreamReader::TokenType type = reader.readNext();
433431
switch (type) {
434432
case QXmlStreamReader::StartElement:
435433
// Read define-elements
@@ -463,10 +461,9 @@ void ProjectFile::readDefines(QXmlStreamReader &reader)
463461

464462
void ProjectFile::readCheckPaths(QXmlStreamReader &reader)
465463
{
466-
QXmlStreamReader::TokenType type;
467464
bool allRead = false;
468465
do {
469-
type = reader.readNext();
466+
QXmlStreamReader::TokenType type = reader.readNext();
470467
switch (type) {
471468
case QXmlStreamReader::StartElement:
472469

@@ -501,10 +498,9 @@ void ProjectFile::readCheckPaths(QXmlStreamReader &reader)
501498

502499
void ProjectFile::readExcludes(QXmlStreamReader &reader)
503500
{
504-
QXmlStreamReader::TokenType type;
505501
bool allRead = false;
506502
do {
507-
type = reader.readNext();
503+
QXmlStreamReader::TokenType type = reader.readNext();
508504
switch (type) {
509505
case QXmlStreamReader::StartElement:
510506
// Read exclude-elements
@@ -547,9 +543,8 @@ void ProjectFile::readExcludes(QXmlStreamReader &reader)
547543

548544
void ProjectFile::readVsConfigurations(QXmlStreamReader &reader)
549545
{
550-
QXmlStreamReader::TokenType type;
551546
do {
552-
type = reader.readNext();
547+
QXmlStreamReader::TokenType type = reader.readNext();
553548
switch (type) {
554549
case QXmlStreamReader::StartElement:
555550
// Read library-elements
@@ -611,9 +606,8 @@ void ProjectFile::readPlatform(QXmlStreamReader &reader)
611606

612607
void ProjectFile::readSuppressions(QXmlStreamReader &reader)
613608
{
614-
QXmlStreamReader::TokenType type;
615609
do {
616-
type = reader.readNext();
610+
QXmlStreamReader::TokenType type = reader.readNext();
617611
switch (type) {
618612
case QXmlStreamReader::StartElement:
619613
// Read library-elements
@@ -658,9 +652,8 @@ void ProjectFile::readSuppressions(QXmlStreamReader &reader)
658652

659653
void ProjectFile::readTagWarnings(QXmlStreamReader &reader, const QString &tag)
660654
{
661-
QXmlStreamReader::TokenType type;
662655
do {
663-
type = reader.readNext();
656+
QXmlStreamReader::TokenType type = reader.readNext();
664657
switch (type) {
665658
case QXmlStreamReader::StartElement:
666659
// Read library-elements
@@ -693,10 +686,9 @@ void ProjectFile::readTagWarnings(QXmlStreamReader &reader, const QString &tag)
693686

694687
void ProjectFile::readStringList(QStringList &stringlist, QXmlStreamReader &reader, const char elementname[])
695688
{
696-
QXmlStreamReader::TokenType type;
697689
bool allRead = false;
698690
do {
699-
type = reader.readNext();
691+
QXmlStreamReader::TokenType type = reader.readNext();
700692
switch (type) {
701693
case QXmlStreamReader::StartElement:
702694
// Read library-elements

‎gui/resultstree.cpp‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,11 @@ bool ResultsTree::addErrorItem(const ErrorItem &item)
221221
line.file = e.file;
222222
line.line = e.line;
223223
line.message = line.summary = e.info;
224-
QStandardItem *child_item;
225-
child_item = addBacktraceFiles(stditem,
226-
line,
227-
hide,
228-
":images/go-down.png",
229-
true);
224+
QStandardItem *child_item = addBacktraceFiles(stditem,
225+
line,
226+
hide,
227+
":images/go-down.png",
228+
true);
230229
if (!child_item)
231230
continue;
232231

@@ -1140,11 +1139,10 @@ QString ResultsTree::getFilePath(const QStandardItem *target, bool fullPath)
11401139
target = target->parent()->child(target->row(), 0);
11411140

11421141
QVariantMap data = target->data().toMap();
1143-
QString pathStr;
11441142

11451143
//Replace (file) with filename
11461144
QString file = data[FILENAME].toString();
1147-
pathStr = QDir::toNativeSeparators(file);
1145+
QString pathStr = QDir::toNativeSeparators(file);
11481146
if (!fullPath) {
11491147
QFileInfo fi(pathStr);
11501148
pathStr = fi.fileName();

‎gui/statsdialog.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ void StatsDialog::setProject(const ProjectFile* projectFile)
113113
}
114114
mUI->mLblHistoryFile->setText(tr("File: ") + (statsFile.isEmpty() ? tr("No cppcheck build dir") : statsFile));
115115
if (!statsFile.isEmpty()) {
116-
QChartView *chartView;
117-
chartView = createChart(statsFile, "cppcheck");
116+
QChartView *chartView = createChart(statsFile, "cppcheck");
118117
mUI->mTabHistory->layout()->addWidget(chartView);
119118
if (projectFile->getClangAnalyzer()) {
120119
chartView = createChart(statsFile, CLANG_ANALYZER);

‎lib/checknullpointer.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,7 @@ void CheckNullPointer::nullPointerError(const Token *tok, const std::string &var
452452
} else if (value->defaultArg) {
453453
reportError(errorPath, Severity::warning, "nullPointerDefaultArg", errmsgdefarg, CWE_NULL_POINTER_DEREFERENCE, inconclusive || value->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
454454
} else {
455-
std::string errmsg;
456-
errmsg = std::string(value->isKnown() ? "Null" : "Possible null") + " pointer dereference";
455+
std::string errmsg = std::string(value->isKnown() ? "Null" : "Possible null") + " pointer dereference";
457456
if (!varname.empty())
458457
errmsg = "$symbol:" + varname + '\n' + errmsg + ": $symbol";
459458

‎lib/checkstl.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2492,8 +2492,7 @@ void CheckStl::dereferenceInvalidIteratorError(const Token* tok, const ValueFlow
24922492
if (value->condition) {
24932493
reportError(errorPath, Severity::warning, "derefInvalidIteratorRedundantCheck", errmsgcond, CWE825, (inconclusive || value->isInconclusive()) ? Certainty::inconclusive : Certainty::normal);
24942494
} else {
2495-
std::string errmsg;
2496-
errmsg = std::string(value->isKnown() ? "Dereference" : "Possible dereference") + " of an invalid iterator";
2495+
std::string errmsg = std::string(value->isKnown() ? "Dereference" : "Possible dereference") + " of an invalid iterator";
24972496
if (!varname.empty())
24982497
errmsg = "$symbol:" + varname + '\n' + errmsg + ": $symbol";
24992498

‎lib/checkunusedvar.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,7 @@ void Variables::clearAliases(nonneg int varid)
231231

232232
if (usage) {
233233
// remove usage from all aliases
234-
std::set<nonneg int>::const_iterator i;
235-
236-
for (i = usage->_aliases.cbegin(); i != usage->_aliases.cend(); ++i) {
234+
for (std::set<nonneg int>::const_iterator i = usage->_aliases.cbegin(); i != usage->_aliases.cend(); ++i) {
237235
VariableUsage *temp = find(*i);
238236

239237
if (temp)

‎lib/symboldatabase.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3214,10 +3214,8 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
32143214
path.insert(0, ":: ");
32153215
}
32163216

3217-
std::list<Scope>::iterator it1;
3218-
32193217
// search for match
3220-
for (it1 = scopeList.begin(); it1 != scopeList.end(); ++it1) {
3218+
for (std::list<Scope>::iterator it1 = scopeList.begin(); it1 != scopeList.end(); ++it1) {
32213219
Scope *scope1 = &(*it1);
32223220

32233221
bool match = false;

‎lib/token.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1889,8 +1889,7 @@ const ValueFlow::Value * Token::getInvalidValue(const Token *ftok, nonneg int ar
18891889
if (!mImpl->mValues || !settings)
18901890
return nullptr;
18911891
const ValueFlow::Value *ret = nullptr;
1892-
std::list<ValueFlow::Value>::const_iterator it;
1893-
for (it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
1892+
for (std::list<ValueFlow::Value>::const_iterator it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
18941893
if (it->isImpossible())
18951894
continue;
18961895
if ((it->isIntValue() && !settings->library.isIntArgValid(ftok, argnr, it->intvalue)) ||
@@ -1916,8 +1915,7 @@ const Token *Token::getValueTokenMinStrSize(const Settings *settings, MathLib::b
19161915
return nullptr;
19171916
const Token *ret = nullptr;
19181917
int minsize = INT_MAX;
1919-
std::list<ValueFlow::Value>::const_iterator it;
1920-
for (it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
1918+
for (std::list<ValueFlow::Value>::const_iterator it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
19211919
if (it->isTokValue() && it->tokvalue && it->tokvalue->tokType() == Token::eString) {
19221920
const int size = getStrSize(it->tokvalue, settings);
19231921
if (!ret || size < minsize) {
@@ -1937,8 +1935,7 @@ const Token *Token::getValueTokenMaxStrLength() const
19371935
return nullptr;
19381936
const Token *ret = nullptr;
19391937
int maxlength = 0;
1940-
std::list<ValueFlow::Value>::const_iterator it;
1941-
for (it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
1938+
for (std::list<ValueFlow::Value>::const_iterator it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
19421939
if (it->isTokValue() && it->tokvalue && it->tokvalue->tokType() == Token::eString) {
19431940
const int length = getStrLength(it->tokvalue);
19441941
if (!ret || length > maxlength) {

0 commit comments

Comments
 (0)