walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

made some member functions static (#4966)

This commit is contained in:
Oliver Stöneberg 2023-04-28 12:29:40 +02:00 committed by GitHub
parent 2b92351b49
commit 0924e6616e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkclass.cpp
View File

@ -2223,7 +2223,7 @@ bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
return false;
}
bool CheckClass::isMemberFunc(const Scope *scope, const Token *tok) const
bool CheckClass::isMemberFunc(const Scope *scope, const Token *tok)
{
if (!tok->function()) {
for (const Function &func : scope->functionList) {
@ -2264,7 +2264,7 @@ bool CheckClass::isMemberFunc(const Scope *scope, const Token *tok) const
return false;
}
bool CheckClass::isConstMemberFunc(const Scope *scope, const Token *tok) const
bool CheckClass::isConstMemberFunc(const Scope *scope, const Token *tok)
{
if (!tok->function())
return false;

6
lib/checkclass.h
View File

@ -317,8 +317,8 @@ private:
// checkConst helper functions
bool isMemberVar(const Scope *scope, const Token *tok) const;
bool isMemberFunc(const Scope *scope, const Token *tok) const;
bool isConstMemberFunc(const Scope *scope, const Token *tok) const;
static bool isMemberFunc(const Scope *scope, const Token *tok);
static bool isConstMemberFunc(const Scope *scope, const Token *tok);
bool checkConstFunc(const Scope *scope, const Function *func, bool& memberAccessed) const;
// constructors helper function
@ -410,7 +410,7 @@ private:
* @param callToken token where pure virtual function is called directly or indirectly
* @param[in,out] pureFuncStack list to append the stack
*/
void getFirstVirtualFunctionCallStack(
static void getFirstVirtualFunctionCallStack(
std::map<const Function *, std::list<const Token *>> & virtualFunctionCallsMap,
const Token *callToken,
std::list<const Token *> & pureFuncStack);

2
lib/pathanalysis.cpp
View File

@ -68,7 +68,7 @@ std::pair<bool, bool> PathAnalysis::checkCond(const Token * tok, bool& known)
return std::make_pair(true, true);
}
PathAnalysis::Progress PathAnalysis::forwardRecursive(const Token* tok, Info info, const std::function<PathAnalysis::Progress(const Info&)>& f) const
PathAnalysis::Progress PathAnalysis::forwardRecursive(const Token* tok, Info info, const std::function<PathAnalysis::Progress(const Info&)>& f)
{
if (!tok)
return Progress::Continue;

2
lib/pathanalysis.h
View File

@ -61,7 +61,7 @@ struct PathAnalysis {
}
private:
Progress forwardRecursive(const Token* tok, Info info, const std::function<PathAnalysis::Progress(const Info&)>& f) const;
static Progress forwardRecursive(const Token* tok, Info info, const std::function<PathAnalysis::Progress(const Info&)>& f);
Progress forwardRange(const Token* startToken, const Token* endToken, Info info, const std::function<Progress(const Info&)>& f) const;
static const Scope* findOuterScope(const Scope * scope);

2
lib/symboldatabase.cpp
View File

@ -5013,7 +5013,7 @@ const Enumerator * SymbolDatabase::findEnumerator(const Token * tok, std::set<st
//---------------------------------------------------------------------------
const Type* SymbolDatabase::findVariableTypeInBase(const Scope* scope, const Token* typeTok) const
const Type* SymbolDatabase::findVariableTypeInBase(const Scope* scope, const Token* typeTok)
{
if (scope && scope->definedType && !scope->definedType->derivedFrom.empty()) {
const std::vector<Type::BaseInfo> &derivedFrom = scope->definedType->derivedFrom;

4
lib/symboldatabase.h
View File

@ -1493,8 +1493,8 @@ private:
bool isFunction(const Token *tok, const Scope* outerScope, const Token **funcStart, const Token **argStart, const Token** declEnd) const;
const Type *findTypeInNested(const Token *startTok, const Scope *startScope) const;
const Scope *findNamespace(const Token * tok, const Scope * scope) const;
Function *findFunctionInScope(const Token *func, const Scope *ns, const std::string & path, nonneg int path_length);
const Type *findVariableTypeInBase(const Scope *scope, const Token *typeTok) const;
static Function *findFunctionInScope(const Token *func, const Scope *ns, const std::string & path, nonneg int path_length);
static const Type *findVariableTypeInBase(const Scope *scope, const Token *typeTok);
using MemberIdMap = std::map<unsigned int, unsigned int>;
using VarIdMap = std::map<unsigned int, MemberIdMap>;