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

Change-Id: Idb93d359bd45696a38cb863dcea30c5c377eeabb
Reviewed-by: hjk <qthjk@ovi.com>

1 files changed, 2 insertions, 18 deletions

diff --git a/src/libs/cplusplus/PreprocessorEnvironment.cpp b/src/libs/cplusplus/PreprocessorEnvironment.cpp
index 1149d22268..2e24b1b66e 100644
--- a/src/libs/cplusplus/PreprocessorEnvironment.cpp
+++ b/src/libs/cplusplus/PreprocessorEnvironment.cpp
@@ -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)