Fixed some gcc and cppcheck messages

PKEuS · PKEuS · commit a94598e44731 · 2013-03-05T07:07:59.000-08:00
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
@@ -58,7 +58,7 @@ void ThreadHandler::Check(const Settings &settings, bool recheck)
         mResults.SetFiles(GetReCheckFiles());
     }
 
-    if (mResults.GetFileCount() == 0 || mRunningThreadCount > 0 || settings._jobs <= 0) {
+    if (mResults.GetFileCount() == 0 || mRunningThreadCount > 0 || settings._jobs == 0) {
         qDebug() << "Can't start checking if there's no files to check or if check is in progress.";
         emit Done();
         return;
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -1253,8 +1253,8 @@ void CheckClass::virtualDestructor()
                     // pointer variables of type 'Base *'
                     std::set<unsigned int> basepointer;
 
-                    for (std::size_t i = 0; i < symbolDatabase->getVariableListSize(); i++) {
-                        const Variable* var = symbolDatabase->getVariableFromVarId(i);
+                    for (std::size_t k = 0; k < symbolDatabase->getVariableListSize(); k++) {
+                        const Variable* var = symbolDatabase->getVariableFromVarId(k);
                         if (var && var->isPointer() && var->type() == derivedFrom)
                             basepointer.insert(var->varId());
                     }
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -1907,13 +1907,13 @@ bool Function::isImplicitlyVirtual(bool defaultVal) const
         return false;
 }
 
-bool Function::isImplicitlyVirtual_rec(const ::Type* type, bool& safe) const
+bool Function::isImplicitlyVirtual_rec(const ::Type* baseType, bool& safe) const
 {
     // check each base class
-    for (unsigned int i = 0; i < type->derivedFrom.size(); ++i) {
+    for (unsigned int i = 0; i < baseType->derivedFrom.size(); ++i) {
         // check if base class exists in database
-        if (type->derivedFrom[i].type && type->derivedFrom[i].type->classScope) {
-            const Scope *parent = type->derivedFrom[i].type->classScope;
+        if (baseType->derivedFrom[i].type && baseType->derivedFrom[i].type->classScope) {
+            const Scope *parent = baseType->derivedFrom[i].type->classScope;
 
             std::list<Function>::const_iterator func;
 
@@ -1936,14 +1936,14 @@ bool Function::isImplicitlyVirtual_rec(const ::Type* type, bool& safe) const
                     }
 
                     // check for matching function parameters
-                    if (returnMatch && argsMatch(type->classScope, func->argDef, argDef, "", 0)) {
+                    if (returnMatch && argsMatch(baseType->classScope, func->argDef, argDef, "", 0)) {
                         return true;
                     }
                 }
             }
 
-            if (!type->derivedFrom[i].type->derivedFrom.empty())
-                if (isImplicitlyVirtual_rec(type->derivedFrom[i].type, safe))
+            if (!baseType->derivedFrom[i].type->derivedFrom.empty())
+                if (isImplicitlyVirtual_rec(baseType->derivedFrom[i].type, safe))
                     return true;
         } else {
             // unable to find base class so assume it has no virtual function

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ void ThreadHandler::Check(const Settings &settings, bool recheck)`
`58`	`58`	`mResults.SetFiles(GetReCheckFiles());`
`59`	`59`	`}`
`60`	`60`
`61`		`- if (mResults.GetFileCount() == 0 \|\| mRunningThreadCount > 0 \|\| settings._jobs <= 0) {`
	`61`	`+ if (mResults.GetFileCount() == 0 \|\| mRunningThreadCount > 0 \|\| settings._jobs == 0) {`
`62`	`62`	`qDebug() << "Can't start checking if there's no files to check or if check is in progress.";`
`63`	`63`	`emit Done();`
`64`	`64`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -1907,13 +1907,13 @@ bool Function::isImplicitlyVirtual(bool defaultVal) const`
`1907`	`1907`	`return false;`
`1908`	`1908`	`}`
`1909`	`1909`
`1910`		`-bool Function::isImplicitlyVirtual_rec(const ::Type* type, bool& safe) const`
	`1910`	`+bool Function::isImplicitlyVirtual_rec(const ::Type* baseType, bool& safe) const`
`1911`	`1911`	`{`
`1912`	`1912`	`// check each base class`
`1913`		`- for (unsigned int i = 0; i < type->derivedFrom.size(); ++i) {`
	`1913`	`+ for (unsigned int i = 0; i < baseType->derivedFrom.size(); ++i) {`
`1914`	`1914`	`// check if base class exists in database`
`1915`		`- if (type->derivedFrom[i].type && type->derivedFrom[i].type->classScope) {`
`1916`		`- const Scope *parent = type->derivedFrom[i].type->classScope;`
	`1915`	`+ if (baseType->derivedFrom[i].type && baseType->derivedFrom[i].type->classScope) {`
	`1916`	`+ const Scope *parent = baseType->derivedFrom[i].type->classScope;`
`1917`	`1917`
`1918`	`1918`	`std::list<Function>::const_iterator func;`
`1919`	`1919`
`@@ -1936,14 +1936,14 @@ bool Function::isImplicitlyVirtual_rec(const ::Type* type, bool& safe) const`
`1936`	`1936`	`}`
`1937`	`1937`
`1938`	`1938`	`// check for matching function parameters`
`1939`		`- if (returnMatch && argsMatch(type->classScope, func->argDef, argDef, "", 0)) {`
	`1939`	`+ if (returnMatch && argsMatch(baseType->classScope, func->argDef, argDef, "", 0)) {`
`1940`	`1940`	`return true;`
`1941`	`1941`	`}`
`1942`	`1942`	`}`
`1943`	`1943`	`}`
`1944`	`1944`
`1945`		`- if (!type->derivedFrom[i].type->derivedFrom.empty())`
`1946`		`- if (isImplicitlyVirtual_rec(type->derivedFrom[i].type, safe))`
	`1945`	`+ if (!baseType->derivedFrom[i].type->derivedFrom.empty())`
	`1946`	`+ if (isImplicitlyVirtual_rec(baseType->derivedFrom[i].type, safe))`
`1947`	`1947`	`return true;`
`1948`	`1948`	`} else {`
`1949`	`1949`	`// unable to find base class so assume it has no virtual function`