Fix compiler warnings and comment/string typos

Andrew C. Martin · Andrew C. Martin · commit 4a73c9375052 · 2013-01-16T07:37:07.000-07:00
- fix g++ warning: > lib/checkother.cpp:3779: warning: comparison between signed and unsigned integer expressions - fix suncc warning (see [everything2](http://everything2.com/title/C%252B%252B%253A+static+extern+%2522C%2522)): > "lib/checkmemoryleak.cpp", line 578: Warning (Anachronism): Formal argument __compar of type extern "C" int(*)(const void*,const void*) in call to bsearch(const void*, const void*, unsigned long, unsigned long, extern "C" int(*)(const void*,const void*)) is being passed int(*)(const void*,const void*). - prefer empty() / isEmpty() over "size() > 0" (cases not caught by stlSize) - fix word misspellings (mostly comments, a few output lines) - Parenthesis => Parentheses (both variations were used in the codebase) - fix typo and wording ("never alwayw") in gui/test/data/benchmark/simple.cpp's CheckOther::unsignedPositive(): ``` - "An unsigned variable will never alwayw be positive so it is either pointless or " + "An unsigned variable can't be negative so it is either pointless or " ```
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -210,7 +210,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
         }
 
         // Filter errors
-        // This is deprecated, see --supressions-list above
+        // This is deprecated, see --suppressions-list above
         else if (std::strcmp(argv[i], "--suppressions") == 0) {
             ++i;
 
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -186,7 +186,7 @@ unsigned int ThreadExecutor::check()
                 fileChecker.settings() = _settings;
                 unsigned int resultOfCheck = 0;
 
-                if (_fileContents.size() > 0 && _fileContents.find(i->first) != _fileContents.end()) {
+                if (!_fileContents.empty() && _fileContents.find(i->first) != _fileContents.end()) {
                     // File content was given as a string
                     resultOfCheck = fileChecker.check(i->first, _fileContents[ i->first ]);
                 } else {
diff --git a/gui/scratchpad.cpp b/gui/scratchpad.cpp
@@ -32,7 +32,7 @@ ScratchPad::ScratchPad(MainWindow& mainWindow)
 void ScratchPad::CheckButtonClicked()
 {
     QString filename = mUI.lineEdit->text();
-    if (filename.size() == 0)
+    if (filename.isEmpty())
         filename = "test.cpp";
     mMainWindow.CheckCode(mUI.plainTextEdit->toPlainText(), filename);
 }
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
@@ -242,7 +242,7 @@ void SettingsDialog::EditApplication()
 void SettingsDialog::DefaultApplication()
 {
     QList<QListWidgetItem *> selected = mUI.mListWidget->selectedItems();
-    if (selected.size() > 0) {
+    if (!selected.isEmpty()) {
         int index = mUI.mListWidget->row(selected[0]);
         mTempApplications->SetDefault(index);
         mUI.mListWidget->clear();
diff --git a/gui/test/data/benchmark/simple.cpp b/gui/test/data/benchmark/simple.cpp
@@ -532,7 +532,7 @@ void CheckOther::checkIncorrectLogicOperator()
     const Token *endTok = tok ? tok->next()->link() : NULL;
 
     while (tok && endTok) {
-        // Find a pair of OR'd terms, with or without parenthesis
+        // Find a pair of OR'd terms, with or without parentheses
         // e.g. if (x != 3 || x != 4)
         const Token *logicTok = NULL, *term1Tok = NULL, *term2Tok = NULL;
         const Token *op1Tok = NULL, *op2Tok = NULL, *op3Tok = NULL, *nextTok = NULL;
@@ -2772,7 +2772,7 @@ void CheckOther::checkMathFunctions()
                  MathLib::toLongNumber(tok->tokAt(2)->str()) <= 0) {
             mathfunctionCallError(tok);
         }
-        // acos( x ), asin( x )  where x is defined for intervall [-1,+1], but not beyound
+        // acos( x ), asin( x )  where x is defined for interval [-1,+1], but not beyond
         else if (tok->varId() == 0 &&
                  Token::Match(tok, "acos|asin ( %num% )") &&
                  std::fabs(MathLib::toDoubleNumber(tok->tokAt(2)->str())) > 1.0) {
@@ -3508,6 +3508,6 @@ void CheckOther::unsignedPositive(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::style, "unsignedPositive",
                 "Checking if unsigned variable '" + varname + "' is positive is always true.\n"
-                "An unsigned variable will never alwayw be positive so it is either pointless or "
+                "An unsigned variable can't be negative so it is either pointless or "
                 "an error to check if it is.");
 }
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
@@ -175,10 +175,7 @@ void ThreadHandler::SaveSettings(QSettings &settings) const
 
 bool ThreadHandler::HasPreviousFiles() const
 {
-    if (mLastFiles.size() > 0)
-        return true;
-
-    return false;
+    return !mLastFiles.isEmpty();
 }
 
 int ThreadHandler::GetPreviousFilesCount() const
diff --git a/gui/threadresult.cpp b/gui/threadresult.cpp
@@ -91,7 +91,7 @@ void ThreadResult::reportErr(const ErrorLogger::ErrorMessage &msg)
 QString ThreadResult::GetNextFile()
 {
     QMutexLocker locker(&mutex);
-    if (mFiles.size() == 0) {
+    if (mFiles.isEmpty()) {
         return "";
     }
 
diff --git a/gui/txtreport.cpp b/gui/txtreport.cpp
@@ -59,7 +59,7 @@ void TxtReport::WriteError(const ErrorItem &error)
     for (int i = 0; i < error.lines.size(); i++) {
         const QString file = QDir::toNativeSeparators(error.files[i]);
         line += QString("[%1:%2]").arg(file).arg(error.lines[i]);
-        if (i < error.lines.size() - 1 && error.lines.size() > 0) {
+        if (i < error.lines.size() - 1 && !error.lines.isEmpty()) {
             line += " -> ";
         }
 
diff --git a/gui/xmlreportv1.cpp b/gui/xmlreportv1.cpp
@@ -162,7 +162,7 @@ ErrorItem XmlReportV1::ReadError(QXmlStreamReader *reader)
         item.errorId = attribs.value("", IdAttribute).toString();
         item.severity = GuiSeverity::fromString(attribs.value("", SeverityAttribute).toString());
 
-        // NOTE: This dublicates the message to Summary-field. But since
+        // NOTE: This duplicates the message to Summary-field. But since
         // old XML format doesn't have separate summary and verbose messages
         // we must add same message to both data so it shows up in GUI.
         // Check if there is full stop and cut the summary to it.
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
@@ -75,7 +75,7 @@ void Check64BitPortability::pointerassignment()
         }
     }
 
-    // Check assignements
+    // Check assignments
     for (std::size_t i = 0; i < functions; ++i) {
         const Scope * scope = symbolDatabase->functionScopes[i];
         for (const Token *tok = scope->classStart; tok && tok != scope->classEnd; tok = tok->next()) {
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -825,7 +825,7 @@ void CheckBufferOverrun::checkScopeForBody(const Token *tok, const ArrayInfo &ar
     if (Token::Match(tok2->next(), "%var% =") && MathLib::toLongNumber(max_counter_value) < size)
         condition_out_of_bounds = false;
 
-    // Goto the end parenthesis of the for-statement: "for (x; y; z)" ..
+    // Goto the end parentheses of the for-statement: "for (x; y; z)" ..
     tok2 = tok->next()->link();
     if (!tok2 || !tok2->tokAt(5)) {
         bailout = true;
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -771,7 +771,7 @@ void CheckClass::privateFunctions()
             }
         }
 
-        // Bailout for overriden virtual functions of base classes
+        // Bailout for overridden virtual functions of base classes
         if (!scope->derivedFrom.empty()) {
             // Check virtual functions
             for (std::list<const Function*>::iterator it = FuncList.begin(); it != FuncList.end();) {
@@ -1108,7 +1108,7 @@ bool CheckClass::hasAllocation(const Function *func, const Scope* scope)
             var = tok->tokAt(3);
         else if (Token::Match(tok, "delete %var%"))
             var = tok->next();
-        // Check for assignement to the deleted pointer (only if its a member of the class)
+        // Check for assignment to the deleted pointer (only if its a member of the class)
         if (var && isMemberVar(scope, var)) {
             for (const Token *tok1 = var->next(); tok1 && (tok1 != last); tok1 = tok1->next()) {
                 if (Token::Match(tok1, "%var% =")) {
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
@@ -115,7 +115,7 @@ void CheckExceptionSafety::deallocThrow()
 
                 // Variable is assigned -> Bail out
                 else if (Token::Match(tok2, "%varid% =", varid)) {
-                    if (ThrowToken) // For non-inconclusive checking, wait until we find an assignement to it. Otherwise we assume it is safe to leave a dead pointer.
+                    if (ThrowToken) // For non-inconclusive checking, wait until we find an assignment to it. Otherwise we assume it is safe to leave a dead pointer.
                         deallocThrowError(ThrowToken, tok2->str());
                     break;
                 }
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -92,9 +92,14 @@ static const char * const call_func_white_list[] = {
     , "vscanf", "vsnprintf", "vsprintf", "vsscanf", "while", "wordexp","write", "writev"
 };
 
-static int call_func_white_list_compare(const void *a, const void *b)
+extern "C"
 {
-    return std::strcmp((const char *)a, *(const char * const *)b);
+    int call_func_white_list_compare(const void *a, const void *b);
+
+    int call_func_white_list_compare(const void *a, const void *b)
+    {
+        return std::strcmp((const char *)a, *(const char * const *)b);
+    }
 }
 
 //---------------------------------------------------------------------------
diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
@@ -358,7 +358,7 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Sym
     // streams dereference nullpointers
     if (Token::Match(tok->previous(), "<<|>> %var%")) {
         const Variable* var = symbolDatabase->getVariableFromVarId(tok->varId());
-        if (var && var->isPointer() && Token::Match(var->typeStartToken(), "char|wchar_t")) { // Only outputing or reading to char* can cause problems
+        if (var && var->isPointer() && Token::Match(var->typeStartToken(), "char|wchar_t")) { // Only outputting or reading to char* can cause problems
             const Token* tok2 = tok->previous(); // Find start of statement
             for (; tok2; tok2 = tok2->previous()) {
                 if (Token::Match(tok2->previous(), ";|{|}|:"))
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -1266,7 +1266,7 @@ void CheckOther::checkIncorrectLogicOperator()
     for (std::size_t ii = 0; ii < functions; ++ii) {
         const Scope * scope = symbolDatabase->functionScopes[ii];
         for (const Token* tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {
-            // Find a pair of comparison expressions with or without parenthesis
+            // Find a pair of comparison expressions with or without parentheses
             // with a shared variable and constants and with a logical operator between them.
             // e.g. if (x != 3 || x != 4)
             const Token *term1Tok = NULL, *term2Tok = NULL;
@@ -2231,7 +2231,7 @@ void CheckOther::checkMathFunctions()
                 }
             }
 
-            // acos( x ), asin( x )  where x is defined for intervall [-1,+1], but not beyound
+            // acos( x ), asin( x )  where x is defined for interval [-1,+1], but not beyond
             else if (Token::Match(tok, "acos|asin ( %num% )") &&
                      std::fabs(MathLib::toDoubleNumber(tok->strAt(2))) > 1.0) {
                 mathfunctionCallError(tok);
@@ -2985,7 +2985,7 @@ void CheckOther::checkExpressionRange(const std::list<const Function*> &constFun
     for (; it != expressions.getMap().end(); ++it) {
         // check expression..
         bool valid = true;
-        unsigned int parenthesis = 0;  // ()
+        unsigned int parentheses = 0;  // ()
         unsigned int brackets = 0;     // []
 
         // taking address?
@@ -2995,13 +2995,13 @@ void CheckOther::checkExpressionRange(const std::list<const Function*> &constFun
 
         for (const Token *tok = it->second.start; tok && tok != it->second.end; tok = tok->next()) {
             if (tok->str() == "(") {
-                ++parenthesis;
+                ++parentheses;
             } else if (tok->str() == ")") {
-                if (parenthesis == 0) {
+                if (parentheses == 0) {
                     valid = false;
                     break;
                 }
-                --parenthesis;
+                --parentheses;
             } else if (tok->str() == "[") {
                 ++brackets;
             } else if (tok->str() == "]") {
@@ -3016,7 +3016,7 @@ void CheckOther::checkExpressionRange(const std::list<const Function*> &constFun
             }
         }
 
-        if (!valid || parenthesis!=0 || brackets!=0)
+        if (!valid || parentheses!=0 || brackets!=0)
             continue;
 
         const ExpressionTokens &expr = it->second;
@@ -3764,7 +3764,7 @@ void CheckOther::checkVarFuncNullUB()
             if (Token::Match(tok,"[(,] NULL [,)]")) {
                 // Locate function name in this function call.
                 const Token *ftok = tok;
-                int argnr = 1;
+                std::size_t argnr = 1;
                 while (ftok && ftok->str() != "(") {
                     if (ftok->str() == ")")
                         ftok = ftok->link();
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -1344,10 +1344,10 @@ bool CheckUninitVar::checkScopeForVariable(const Scope* scope, const Token *tok,
     return false;
 }
 
-bool CheckUninitVar::checkIfForWhileHead(const Scope *scope, const Token *startparanthesis, const Variable& var, bool suppressErrors, bool isuninit)
+bool CheckUninitVar::checkIfForWhileHead(const Scope *scope, const Token *startparentheses, const Variable& var, bool suppressErrors, bool isuninit)
 {
-    const Token * const endpar = startparanthesis->link();
-    for (const Token *tok = startparanthesis->next(); tok && tok != endpar; tok = tok->next()) {
+    const Token * const endpar = startparentheses->link();
+    for (const Token *tok = startparentheses->next(); tok && tok != endpar; tok = tok->next()) {
         if (tok->varId() == var.varId()) {
             if (isVariableUsage(scope, tok, var.isPointer())) {
                 if (!suppressErrors)
@@ -1374,7 +1374,7 @@ bool CheckUninitVar::isVariableUsage(const Scope* scope, const Token *vartok, bo
     if (Token::Match(vartok->previous(), "[(,] %var% [,)]") || Token::Match(vartok->tokAt(-2), "[(,] & %var% [,)]")) {
         const bool address(vartok->previous()->str() == "&");
 
-        // locate start parenthesis in function call..
+        // locate start parentheses in function call..
         int argumentNumber = 0;
         const Token *start = vartok;
         while (start && !Token::Match(start, "[;{}(]")) {
diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
@@ -65,7 +65,7 @@ class CPPCHECKLIB CheckUninitVar : public Check {
     void check();
     void checkScope(const Scope* scope);
     bool checkScopeForVariable(const Scope* scope, const Token *tok, const Variable& var, bool * const possibleInit, bool * const noreturn);
-    bool checkIfForWhileHead(const Scope *scope, const Token *startparanthesis, const Variable& var, bool suppressErrors, bool isuninit);
+    bool checkIfForWhileHead(const Scope *scope, const Token *startparentheses, const Variable& var, bool suppressErrors, bool isuninit);
     bool isVariableUsage(const Scope* scope, const Token *vartok, bool ispointer) const;
 
 
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
@@ -129,7 +129,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer)
         else
             continue;
 
-        // funcname ( => Assert that the end parenthesis isn't followed by {
+        // funcname ( => Assert that the end parentheses isn't followed by {
         if (Token::Match(funcname, "%var% (")) {
             if (Token::Match(funcname->linkAt(1), ") const|throw|{"))
                 funcname = NULL;
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
@@ -363,7 +363,7 @@ std::string MathLib::abs(const std::string &tok)
 
 bool MathLib::isEqual(const std::string &first, const std::string &second)
 {
-    // this conversion is needed for formating
+    // this conversion is needed for formatting
     // e.g. if first=0.1 and second=1.0E-1, the direct comparison of the strings whould fail
     return doubleToString(toDoubleNumber(first)) == doubleToString(toDoubleNumber(second));
 }
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -646,7 +646,7 @@ std::string Preprocessor::removeParentheses(const std::string &str)
             while ((pos = line.find(") ", pos)) != std::string::npos)
                 line.erase(pos + 1, 1);
 
-            // Remove inner parenthesis "((..))"..
+            // Remove inner parentheses "((..))"..
             pos = 0;
             while ((pos = line.find("((", pos)) != std::string::npos) {
                 ++pos;
@@ -1506,7 +1506,7 @@ void Preprocessor::simplifyCondition(const std::map<std::string, std::string> &c
         modified = false;
         modified |= tokenizer.simplifySizeof();
         modified |= tokenizer.simplifyCalculations();
-        modified |= tokenizer.simplifyRedundantParenthesis();
+        modified |= tokenizer.simplifyRedundantParentheses();
         for (Token *tok = const_cast<Token *>(tokenizer.tokens()); tok; tok = tok->next()) {
             if (Token::Match(tok, "! %num%")) {
                 tok->deleteThis();
@@ -2231,7 +2231,7 @@ static void skipstring(const std::string &line, std::string::size_type &pos)
  * @param pos  in: Position to the '('. out: Position to the ')'
  * @param params out: The extracted parameters
  * @param numberOfNewlines out: number of newlines in the macro call
- * @param endFound out: was the end parenthesis found?
+ * @param endFound out: was the end parentheses found?
  */
 static void getparams(const std::string &line,
                       std::string::size_type &pos,
@@ -2257,14 +2257,14 @@ static void getparams(const std::string &line,
 
     // scan for parameters..
     for (; pos < line.length(); ++pos) {
-        // increase parenthesis level
+        // increase parentheses level
         if (line[pos] == '(') {
             ++parlevel;
             if (parlevel == 1)
                 continue;
         }
 
-        // decrease parenthesis level
+        // decrease parentheses level
         else if (line[pos] == ')') {
             --parlevel;
             if (parlevel <= 0) {
@@ -2909,7 +2909,7 @@ std::string Preprocessor::expandMacros(const std::string &code, std::string file
 
                     // if the macro has parentheses, get parameters
                     if (macro->variadic() || macro->nopar() || macro->params().size()) {
-                        // is the end parenthesis found?
+                        // is the end parentheses found?
                         bool endFound = false;
 
                         getparams(line,pos2,params,numberOfNewlines,endFound);
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -833,7 +833,7 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
                 _variableList[varId] = &(*var);
         }
 
-        // add all function paramaters
+        // add all function parameters
         std::list<Function>::const_iterator func;
         for (func = scope->functionList.begin(); func != scope->functionList.end(); ++func) {
             // ignore function without implementations
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -1035,7 +1035,7 @@ bool TemplateSimplifier::simplifyTemplateInstantions(
         std::string templateMatchPattern(name + " < ");
         unsigned int indentlevel = 0;
         for (const Token *tok3 = tok2->tokAt(2); tok3 && (indentlevel > 0 || tok3->str() != ">"); tok3 = tok3->next()) {
-            // #2648 - unhandled parenthesis => bail out
+            // #2648 - unhandled parentheses => bail out
             // #2721 - unhandled [ => bail out
             if (tok3->str() == "(" || tok3->str() == "[") {
                 typeForNewNameStr.clear();
@@ -1090,7 +1090,7 @@ bool TemplateSimplifier::simplifyTemplateInstantions(
         for (Token *tok4 = tok2; tok4; tok4 = tok4->next()) {
             if (Token::simpleMatch(tok4, templateMatchPattern.c_str())) {
                 Token * tok5 = tok4->tokAt(2);
-                unsigned int typeCountInInstantion = 1U; // There is always atleast one type
+                unsigned int typeCountInInstantion = 1U; // There is always at least one type
                 const Token *typetok = (!typesUsedInTemplateInstantion.empty()) ? typesUsedInTemplateInstantion[0] : 0;
                 unsigned int indentlevel5 = 0;  // indentlevel for tok5
                 while (tok5 && (indentlevel5 > 0 || tok5->str() != ">")) {
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -1058,7 +1058,7 @@ void Token::astFunctionCall()
     _next->_astParent = this;
 }
 
-void Token::astHandleParenthesis()
+void Token::astHandleParentheses()
 {
     Token *innerTop;
     if (_str != "(")
diff --git a/lib/token.h b/lib/token.h
@@ -578,7 +578,7 @@ class CPPCHECKLIB Token {
     void astOperand1(Token *tok);
     void astOperand2(Token *tok);
     void astFunctionCall();
-    void astHandleParenthesis();
+    void astHandleParentheses();
 
     const Token * astOperand1() const {
         return _astOperand1;
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
diff --git a/lib/tokenize.h b/lib/tokenize.h
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`// Filter errors`
`213`		`- // This is deprecated, see --supressions-list above`
	`213`	`+ // This is deprecated, see --suppressions-list above`
`214`	`214`	`else if (std::strcmp(argv[i], "--suppressions") == 0) {`
`215`	`215`	`++i;`
`216`	`216`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ ScratchPad::ScratchPad(MainWindow& mainWindow)`
`32`	`32`	`void ScratchPad::CheckButtonClicked()`
`33`	`33`	`{`
`34`	`34`	`QString filename = mUI.lineEdit->text();`
`35`		`- if (filename.size() == 0)`
	`35`	`+ if (filename.isEmpty())`
`36`	`36`	`filename = "test.cpp";`
`37`	`37`	`mMainWindow.CheckCode(mUI.plainTextEdit->toPlainText(), filename);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ void SettingsDialog::EditApplication()`
`242`	`242`	`void SettingsDialog::DefaultApplication()`
`243`	`243`	`{`
`244`	`244`	`QList<QListWidgetItem *> selected = mUI.mListWidget->selectedItems();`
`245`		`- if (selected.size() > 0) {`
	`245`	`+ if (!selected.isEmpty()) {`
`246`	`246`	`int index = mUI.mListWidget->row(selected[0]);`
`247`	`247`	`mTempApplications->SetDefault(index);`
`248`	`248`	`mUI.mListWidget->clear();`
Original file line number	Diff line number	Diff line change
`@@ -175,10 +175,7 @@ void ThreadHandler::SaveSettings(QSettings &settings) const`
`175`	`175`
`176`	`176`	`bool ThreadHandler::HasPreviousFiles() const`
`177`	`177`	`{`
`178`		`- if (mLastFiles.size() > 0)`
`179`		`- return true;`
`180`		`-`
`181`		`- return false;`
	`178`	`+ return !mLastFiles.isEmpty();`
`182`	`179`	`}`
`183`	`180`
`184`	`181`	`int ThreadHandler::GetPreviousFilesCount() const`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ void ThreadResult::reportErr(const ErrorLogger::ErrorMessage &msg)`
`91`	`91`	`QString ThreadResult::GetNextFile()`
`92`	`92`	`{`
`93`	`93`	`QMutexLocker locker(&mutex);`
`94`		`- if (mFiles.size() == 0) {`
	`94`	`+ if (mFiles.isEmpty()) {`
`95`	`95`	`return "";`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ void TxtReport::WriteError(const ErrorItem &error)`
`59`	`59`	`for (int i = 0; i < error.lines.size(); i++) {`
`60`	`60`	`const QString file = QDir::toNativeSeparators(error.files[i]);`
`61`	`61`	`line += QString("[%1:%2]").arg(file).arg(error.lines[i]);`
`62`		`- if (i < error.lines.size() - 1 && error.lines.size() > 0) {`
	`62`	`+ if (i < error.lines.size() - 1 && !error.lines.isEmpty()) {`
`63`	`63`	`line += " -> ";`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ void Check64BitPortability::pointerassignment()`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`- // Check assignements`
	`78`	`+ // Check assignments`
`79`	`79`	`for (std::size_t i = 0; i < functions; ++i) {`
`80`	`80`	`const Scope * scope = symbolDatabase->functionScopes[i];`
`81`	`81`	`for (const Token *tok = scope->classStart; tok && tok != scope->classEnd; tok = tok->next()) {`