From 4ec3a76ed49d65066a0dc98c3901e70d31cf340e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 22 Mar 2018 16:18:39 +0100 Subject: [PATCH] cpp check result fix Prefer prefix ++/-- operators for non-primitive types --- cppcheck.supp | 5 +++++ src/blackmisc/directoryutils.cpp | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cppcheck.supp b/cppcheck.supp index 9be048510..55cad929a 100644 --- a/cppcheck.supp +++ b/cppcheck.supp @@ -33,3 +33,8 @@ passedByValue:src/xswiftbus/command.h // Unique pointers should be passed by value passedByValue:src/xswiftbus/menus.h + +// Suddenly appearing (KB 2018-03) issue here +// src/blackmisc/iterator.h 53 -> 'operator=' should return reference to 'this' instance. +operatorEqRetRefThis:src/blackmisc/iterator.h + diff --git a/src/blackmisc/directoryutils.cpp b/src/blackmisc/directoryutils.cpp index 9d1f14ece..87f732cec 100644 --- a/src/blackmisc/directoryutils.cpp +++ b/src/blackmisc/directoryutils.cpp @@ -572,12 +572,11 @@ namespace BlackMisc for (const QString &sourceFile : as_const(comp.sameNameInSource)) { const QFileInfo source(sourceFile); - const QFileInfo target(*targetIt++); - if (source.lastModified() == target.lastModified() && source.size() == target.size()) - { - // same - } - else if (source.lastModified() < target.lastModified()) + const QFileInfo target(*targetIt); + ++targetIt; // avoid cpp check warning + if (source.lastModified() == target.lastModified() && source.size() == target.size()) { continue; } + + if (source.lastModified() < target.lastModified()) { comp.newerInTarget.insert(target.canonicalFilePath()); }