diff --git a/src/libs/cplusplus/OverviewModel.cpp b/src/libs/cplusplus/OverviewModel.cpp index 2174735c1185aaebd73e2a6c02e3aa1fd217d821..6ab186ac3bb8faab18734c18a8bd0146f603c4bf 100644 --- a/src/libs/cplusplus/OverviewModel.cpp +++ b/src/libs/cplusplus/OverviewModel.cpp @@ -177,7 +177,7 @@ QVariant OverviewModel::data(const QModelIndex &index, int role) const name = QLatin1Char('+') + name; else name = QLatin1Char('-') + name; - } else if (! symbol->isScopedSymbol() || symbol->isFunction()) { + } else if (! symbol->isScope() || symbol->isFunction()) { QString type = _overview.prettyType(symbol->type()); if (! type.isEmpty()) { if (! symbol->type()->isFunctionType()) diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp index 67d57f68a7fe956ee465ddc89a73be150905c22b..3e9cda008a7dde303edb03c1dc71a2581a3fe905 100644 --- a/src/plugins/debugger/watchutils.cpp +++ b/src/plugins/debugger/watchutils.cpp @@ -84,7 +84,7 @@ static void debugCppSymbolRecursion(QTextStream &str, const Overview &o, str << " declaration"; if (s.isBlock()) str << " block"; - if (doRecurse && s.isScopedSymbol()) { + if (doRecurse && s.isScope()) { const Scope *scoped = s.asScope(); const int size = scoped->memberCount(); str << " scoped symbol of " << size << '\n'; diff --git a/src/shared/cplusplus/Symbol.cpp b/src/shared/cplusplus/Symbol.cpp index f41c02d3a9e315d261ecc6a3fcd9bebb133ca7b1..c2fe64824429becc6c6281f8578b867a317f4e45 100644 --- a/src/shared/cplusplus/Symbol.cpp +++ b/src/shared/cplusplus/Symbol.cpp @@ -344,7 +344,7 @@ bool Symbol::isProtected() const bool Symbol::isPrivate() const { return _visibility == Private; } -bool Symbol::isScopedSymbol() const +bool Symbol::isScope() const { return asScope() != 0; } bool Symbol::isEnum() const diff --git a/src/shared/cplusplus/Symbol.h b/src/shared/cplusplus/Symbol.h index 3ca9f13f8fd684aec2ca20b73a4b8b4a6565997d..61c4e69b2dd49998dbbf5d96bf6d1cda1efb37b9 100644 --- a/src/shared/cplusplus/Symbol.h +++ b/src/shared/cplusplus/Symbol.h @@ -156,8 +156,8 @@ public: /// Returns true if this Symbol's visibility is private. bool isPrivate() const; - /// Returns true if this Symbol is a ScopedSymbol. - bool isScopedSymbol() const; + /// Returns true if this Symbol is a Scope. + bool isScope() const; /// Returns true if this Symbol is an Enum. bool isEnum() const;