feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

preprocessor: make Environment::{resolve,remove} work on ByteArrayRefs only

Browse Source 
Change-Id: Idb93d359bd45696a38cb863dcea30c5c377eeabb
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-04-18 17:44:23 +02:00
committed by hjk
parent 3428240233
commit acf6f8f0cb
8 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/cplusplus/PreprocessorEnvironment.cpp
View File

@@ -123,10 +123,10 @@ void Environment::addMacros(const QList<Macro> &macros)
}
}
Macro *Environment::remove(const QByteArray &name)
Macro *Environment::remove(const ByteArrayRef &name)
{
Macro macro;
macro.setName(name);
macro.setName(name.toByteArray());
macro.setHidden(true);
macro.setFileName(currentFile);
macro.setLine(currentLine);
@@ -220,22 +220,6 @@ Environment::iterator Environment::firstMacro() const
Environment::iterator Environment::lastMacro() const
{ return _macros + _macro_count + 1; }
Macro *Environment::resolve(const QByteArray &name) const
{
if (! _macros)
return 0;
Macro *it = _hash[hashCode(name) % _hash_count];
for (; it; it = it->_next) {
if (it->name() != name)
continue;
else if (it->isHidden())
return 0;
else break;
}
return it;
}
Macro *Environment::resolve(const ByteArrayRef &name) const
{
if (! _macros)