Fixed some cppcheck warnings about methods that can be static/const

danmar · danmar · commit ad0d23036cf3 · 2015-11-14T18:43:07.000+01:00
diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
@@ -317,7 +317,7 @@ void CheckAutoVariables::errorUselessAssignmentPtrArg(const Token *tok)
 //---------------------------------------------------------------------------
 
 // return temporary?
-bool CheckAutoVariables::returnTemporary(const Token *tok) const
+bool CheckAutoVariables::returnTemporary(const Token *tok)
 {
     bool func = false;     // Might it be a function call?
     bool retref = false;   // is there such a function that returns a reference?
diff --git a/lib/checkautovariables.h b/lib/checkautovariables.h
@@ -79,7 +79,7 @@ class CPPCHECKLIB CheckAutoVariables : public Check {
      * @param tok pointing at the "return" token
      * @return true if a temporary object is returned
      */
-    bool returnTemporary(const Token *tok) const;
+    static bool returnTemporary(const Token *tok);
 
     void errorReturnAddressToAutoVariable(const Token *tok);
     void errorReturnPointerToLocalArray(const Token *tok);
diff --git a/lib/checkobsolescentfunctions.h b/lib/checkobsolescentfunctions.h
@@ -62,7 +62,7 @@ class CPPCHECKLIB CheckObsoleteFunctions : public Check {
     static std::map<std::string, std::string> _obsoleteC99Functions;
 
     /** init obsolete functions list ' */
-    void initObsoleteFunctions() {
+    static void initObsoleteFunctions() {
         // Obsolete posix functions, which messages suggest only one alternative and doesn't contain additional information.
         const struct {
             const char* bad;
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -1301,7 +1301,7 @@ SymbolDatabase::~SymbolDatabase()
     }
 }
 
-bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const Token **funcStart, const Token **argStart)
+bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const Token **funcStart, const Token **argStart) const
 {
     if (tok->varId())
         return false;
diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
@@ -1019,7 +1019,7 @@ class CPPCHECKLIB SymbolDatabase {
     Function *addGlobalFunctionDecl(Scope*& scope, const Token* tok, const Token *argStart, const Token* funcStart);
     Function *addGlobalFunction(Scope*& scope, const Token*& tok, const Token *argStart, const Token* funcStart);
     void addNewFunction(Scope **info, const Token **tok);
-    bool isFunction(const Token *tok, const Scope* outerScope, const Token **funcStart, const Token **argStart);
+    bool isFunction(const Token *tok, const Scope* outerScope, const Token **funcStart, const Token **argStart) const;
     const Type *findTypeInNested(const Token *tok, const Scope *startScope) const;
     const Scope *findNamespace(const Token * tok, const Scope * scope) const;
     Function *findFunctionInScope(const Token *func, const Scope *ns);

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ void CheckAutoVariables::errorUselessAssignmentPtrArg(const Token *tok)`
`317`	`317`	`//---------------------------------------------------------------------------`
`318`	`318`
`319`	`319`	`// return temporary?`
`320`		`-bool CheckAutoVariables::returnTemporary(const Token *tok) const`
	`320`	`+bool CheckAutoVariables::returnTemporary(const Token *tok)`
`321`	`321`	`{`
`322`	`322`	`bool func = false; // Might it be a function call?`
`323`	`323`	`bool retref = false; // is there such a function that returns a reference?`
Original file line number	Diff line number	Diff line change
`@@ -1301,7 +1301,7 @@ SymbolDatabase::~SymbolDatabase()`
`1301`	`1301`	`}`
`1302`	`1302`	`}`
`1303`	`1303`
`1304`		`-bool SymbolDatabase::isFunction(const Token tok, const Scope outerScope, const Token funcStart, const Token argStart)`
	`1304`	`+bool SymbolDatabase::isFunction(const Token tok, const Scope outerScope, const Token funcStart, const Token argStart) const`
`1305`	`1305`	`{`
`1306`	`1306`	`if (tok->varId())`
`1307`	`1307`	`return false;`