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

Renamed _originalName to mOriginalName

This commit is contained in:
Daniel Marjamäki 2018-06-16 21:40:25 +02:00
parent 76280fe847
commit 82169b6247
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/token.cpp
View File

@ -53,7 +53,7 @@ Token::Token(TokensFrontBack *tokensFrontBack) :
mAstOperand1(nullptr), mAstOperand1(nullptr),
mAstOperand2(nullptr), mAstOperand2(nullptr),
mAstParent(nullptr), mAstParent(nullptr),
_originalName(nullptr), mOriginalName(nullptr),
_valuetype(nullptr), _valuetype(nullptr),
_values(nullptr) _values(nullptr)
{ {
@ -61,7 +61,7 @@ Token::Token(TokensFrontBack *tokensFrontBack) :
Token::~Token() Token::~Token()
{ {
delete _originalName; delete mOriginalName;
delete _valuetype; delete _valuetype;
delete _values; delete _values;
} }
@ -259,7 +259,7 @@ void Token::swapWithNext()
std::swap(mLink, mNext->mLink); std::swap(mLink, mNext->mLink);
std::swap(mScope, mNext->mScope); std::swap(mScope, mNext->mScope);
std::swap(mFunction, mNext->mFunction); std::swap(mFunction, mNext->mFunction);
std::swap(_originalName, mNext->_originalName); std::swap(mOriginalName, mNext->mOriginalName);
std::swap(_values, mNext->_values); std::swap(_values, mNext->_values);
std::swap(_valuetype, mNext->_valuetype); std::swap(_valuetype, mNext->_valuetype);
std::swap(mProgressValue, mNext->mProgressValue); std::swap(mProgressValue, mNext->mProgressValue);
@ -277,10 +277,10 @@ void Token::takeData(Token *fromToken)
mLink = fromToken->mLink; mLink = fromToken->mLink;
mScope = fromToken->mScope; mScope = fromToken->mScope;
mFunction = fromToken->mFunction; mFunction = fromToken->mFunction;
if (fromToken->_originalName) { if (fromToken->mOriginalName) {
delete _originalName; delete mOriginalName;
_originalName = fromToken->_originalName; mOriginalName = fromToken->mOriginalName;
fromToken->_originalName = nullptr; fromToken->mOriginalName = nullptr;
} }
delete _values; delete _values;
_values = fromToken->_values; _values = fromToken->_values;

10
lib/token.h
View File

@ -804,7 +804,7 @@ public:
* @return the original name. * @return the original name.
*/ */
const std::string & originalName() const { const std::string & originalName() const {
return _originalName ? *_originalName : emptyString; return mOriginalName ? *mOriginalName : emptyString;
} }
const std::list<ValueFlow::Value>& values() const { const std::list<ValueFlow::Value>& values() const {
@ -816,10 +816,10 @@ public:
*/ */
template<typename T> template<typename T>
void originalName(T&& name) { void originalName(T&& name) {
if (!_originalName) if (!mOriginalName)
_originalName = new std::string(name); mOriginalName = new std::string(name);
else else
*_originalName = name; *mOriginalName = name;
} }
bool hasKnownIntValue() const { bool hasKnownIntValue() const {
@ -994,7 +994,7 @@ private:
Token *mAstParent; Token *mAstParent;
// original name like size_t // original name like size_t
std::string* _originalName; std::string* mOriginalName;
// ValueType // ValueType
ValueType *_valuetype; ValueType *_valuetype;