From 16b1e8b40d18a9f52fa292b788d7504a4c98947a Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 12 Aug 2010 12:35:22 +0200
Subject: [PATCH] Renamed Symboo::isScopedSymbol().
---
src/libs/cplusplus/OverviewModel.cpp | 2 +-
src/plugins/debugger/watchutils.cpp | 2 +-
src/shared/cplusplus/Symbol.cpp | 2 +-
src/shared/cplusplus/Symbol.h | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/libs/cplusplus/OverviewModel.cpp b/src/libs/cplusplus/OverviewModel.cpp
index 2174735c118..6ab186ac3bb 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 67d57f68a7f..3e9cda008a7 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 f41c02d3a9e..c2fe6482442 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 3ca9f13f8fd..61c4e69b2dd 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;
--
GitLab