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

CppEditor: Avoid local TypeOfExpression objects in VirtualFunctionHelper

Browse Source 
Change-Id: Ifd9417b4573dab35dde72b84c261b58fec574ede
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-05-04 22:32:11 +03:00
committed by Orgad Shaneh
parent f27aa09ac5
commit ee37f60bff
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
View File

@@ -61,7 +61,7 @@ namespace {
class VirtualFunctionHelper { class VirtualFunctionHelper {
public: public:
VirtualFunctionHelper(const TypeOfExpression &typeOfExpression, VirtualFunctionHelper(TypeOfExpression &typeOfExpression,
Scope *scope, Scope *scope,
const Document::Ptr &document, const Document::Ptr &document,
const Snapshot &snapshot, const Snapshot &snapshot,
@@ -85,6 +85,7 @@ private:
Scope *m_scope; Scope *m_scope;
const Document::Ptr &m_document; const Document::Ptr &m_document;
const Snapshot &m_snapshot; const Snapshot &m_snapshot;
TypeOfExpression &m_typeOfExpression;
SymbolFinder *m_finder; SymbolFinder *m_finder;
// Determined // Determined
@@ -94,7 +95,7 @@ private:
Class *m_staticClassOfFunctionCallExpression; // Output Class *m_staticClassOfFunctionCallExpression; // Output
}; };
VirtualFunctionHelper::VirtualFunctionHelper(const TypeOfExpression &typeOfExpression, VirtualFunctionHelper::VirtualFunctionHelper(TypeOfExpression &typeOfExpression,
Scope *scope, Scope *scope,
const Document::Ptr &document, const Document::Ptr &document,
const Snapshot &snapshot, const Snapshot &snapshot,
@@ -103,6 +104,7 @@ VirtualFunctionHelper::VirtualFunctionHelper(const TypeOfExpression &typeOfExpre
, m_scope(scope) , m_scope(scope)
, m_document(document) , m_document(document)
, m_snapshot(snapshot) , m_snapshot(snapshot)
, m_typeOfExpression(typeOfExpression)
, m_finder(finder) , m_finder(finder)
, m_baseExpressionAST(0) , m_baseExpressionAST(0)
, m_function(0) , m_function(0)
@@ -144,10 +146,7 @@ bool VirtualFunctionHelper::canLookupVirtualFunctionOverrides(Function *function
if (m_accessTokenKind == T_ARROW) { if (m_accessTokenKind == T_ARROW) {
result = true; result = true;
} else if (m_accessTokenKind == T_DOT) { } else if (m_accessTokenKind == T_DOT) {
TypeOfExpression typeOfExpression; const QList<LookupItem> items = m_typeOfExpression.reference(
typeOfExpression.init(m_document, m_snapshot);
typeOfExpression.setExpandTemplates(true);
const QList<LookupItem> items = typeOfExpression.reference(
memberAccessAST->base_expression, m_document, m_scope); memberAccessAST->base_expression, m_document, m_scope);
if (!items.isEmpty()) { if (!items.isEmpty()) {
const LookupItem item = items.first(); const LookupItem item = items.first();
@@ -181,12 +180,9 @@ Class *VirtualFunctionHelper::staticClassOfFunctionCallExpression_internal() con
} }
} else if (MemberAccessAST *memberAccessAST = m_baseExpressionAST->asMemberAccess()) { } else if (MemberAccessAST *memberAccessAST = m_baseExpressionAST->asMemberAccess()) {
QTC_ASSERT(m_accessTokenKind == T_ARROW || m_accessTokenKind == T_DOT, return result); QTC_ASSERT(m_accessTokenKind == T_ARROW || m_accessTokenKind == T_DOT, return result);
TypeOfExpression typeOfExpression; const QList<LookupItem> items = m_typeOfExpression(memberAccessAST->base_expression,
typeOfExpression.init(m_document, m_snapshot);
typeOfExpression.setExpandTemplates(true);
const QList<LookupItem> items = typeOfExpression(memberAccessAST->base_expression,
m_expressionDocument, m_scope); m_expressionDocument, m_scope);
ResolveExpression resolveExpression(typeOfExpression.context()); ResolveExpression resolveExpression(m_typeOfExpression.context());
LookupScope *binding = resolveExpression.baseExpression(items, m_accessTokenKind); LookupScope *binding = resolveExpression.baseExpression(items, m_accessTokenKind);
if (binding) { if (binding) {
if (Class *klass = binding->rootClass()) { if (Class *klass = binding->rootClass()) {