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

SymbolDatabase: rename _access

This commit is contained in:
Daniel Marjamäki 2018-06-16 16:12:27 +02:00
parent 7dfd4f61a1
commit 5154eb10c6
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/symboldatabase.cpp
View File

@ -1672,7 +1672,7 @@ void Variable::evaluate(const Library* lib)
setFlag(fIsStlType, Token::simpleMatch(mTypeStartToken, "std ::")); setFlag(fIsStlType, Token::simpleMatch(mTypeStartToken, "std ::"));
setFlag(fIsStlString, isStlType() && (Token::Match(mTypeStartToken->tokAt(2), "string|wstring|u16string|u32string !!::") || (Token::simpleMatch(mTypeStartToken->tokAt(2), "basic_string <") && !Token::simpleMatch(mTypeStartToken->linkAt(3), "> ::")))); setFlag(fIsStlString, isStlType() && (Token::Match(mTypeStartToken->tokAt(2), "string|wstring|u16string|u32string !!::") || (Token::simpleMatch(mTypeStartToken->tokAt(2), "basic_string <") && !Token::simpleMatch(mTypeStartToken->linkAt(3), "> ::"))));
} }
if (_access == Argument) { if (mAccess == Argument) {
tok = mNameToken; tok = mNameToken;
if (!tok) { if (!tok) {
// Argument without name // Argument without name
@ -2623,7 +2623,7 @@ void SymbolDatabase::printVariable(const Variable *var, const char *indent) cons
} }
} }
std::cout << indent << "mIndex: " << var->index() << std::endl; std::cout << indent << "mIndex: " << var->index() << std::endl;
std::cout << indent << "_access: " << std::cout << indent << "mAccess: " <<
(var->isPublic() ? "Public" : (var->isPublic() ? "Public" :
var->isProtected() ? "Protected" : var->isProtected() ? "Protected" :
var->isPrivate() ? "Private" : var->isPrivate() ? "Private" :
@ -3005,7 +3005,7 @@ void SymbolDatabase::printXml(std::ostream &out) const
out << " isReference=\"" << var->isReference() << '\"'; out << " isReference=\"" << var->isReference() << '\"';
out << " isStatic=\"" << var->isStatic() << '\"'; out << " isStatic=\"" << var->isStatic() << '\"';
out << " constness=\"" << var->constness() << '\"'; out << " constness=\"" << var->constness() << '\"';
out << " access=\"" << accessControlToString(var->_access) << '\"'; out << " access=\"" << accessControlToString(var->mAccess) << '\"';
out << "/>" << std::endl; out << "/>" << std::endl;
} }
out << " </variables>" << std::endl; out << " </variables>" << std::endl;

20
lib/symboldatabase.h
View File

@ -226,7 +226,7 @@ public:
mTypeStartToken(start_), mTypeStartToken(start_),
mTypeEndToken(end_), mTypeEndToken(end_),
mIndex(index_), mIndex(index_),
_access(access_), mAccess(access_),
_flags(0), _flags(0),
_constness(0), _constness(0),
_type(type_), _type(type_),
@ -312,7 +312,7 @@ public:
* @return true if public, false if not * @return true if public, false if not
*/ */
bool isPublic() const { bool isPublic() const {
return _access == Public; return mAccess == Public;
} }
/** /**
@ -320,7 +320,7 @@ public:
* @return true if protected, false if not * @return true if protected, false if not
*/ */
bool isProtected() const { bool isProtected() const {
return _access == Protected; return mAccess == Protected;
} }
/** /**
@ -328,7 +328,7 @@ public:
* @return true if private, false if not * @return true if private, false if not
*/ */
bool isPrivate() const { bool isPrivate() const {
return _access == Private; return mAccess == Private;
} }
/** /**
@ -336,7 +336,7 @@ public:
* @return true if global, false if not * @return true if global, false if not
*/ */
bool isGlobal() const { bool isGlobal() const {
return _access == Global; return mAccess == Global;
} }
/** /**
@ -344,7 +344,7 @@ public:
* @return true if in a namespace, false if not * @return true if in a namespace, false if not
*/ */
bool isNamespace() const { bool isNamespace() const {
return _access == Namespace; return mAccess == Namespace;
} }
/** /**
@ -352,7 +352,7 @@ public:
* @return true if a function argument, false if not * @return true if a function argument, false if not
*/ */
bool isArgument() const { bool isArgument() const {
return _access == Argument; return mAccess == Argument;
} }
/** /**
@ -360,7 +360,7 @@ public:
* @return true if local, false if not * @return true if local, false if not
*/ */
bool isLocal() const { bool isLocal() const {
return (_access == Local) && !isExtern(); return (mAccess == Local) && !isExtern();
} }
/** /**
@ -408,7 +408,7 @@ public:
* @return true if throw type, false if not * @return true if throw type, false if not
*/ */
bool isThrow() const { bool isThrow() const {
return _access == Throw; return mAccess == Throw;
} }
/** /**
@ -628,7 +628,7 @@ private:
std::size_t mIndex; std::size_t mIndex;
/** @brief what section is this variable declared in? */ /** @brief what section is this variable declared in? */
AccessControl _access; // public/protected/private AccessControl mAccess; // public/protected/private
/** @brief flags */ /** @brief flags */
unsigned int _flags; unsigned int _flags;