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

C++: Introduce CreateBindings::Ptr

Browse Source 
typedef for QSharedPointer<CreateBindings>

Change-Id: Idf7a9984bb90da82407abd4b7dec9f40926beac8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-05-18 22:08:14 +03:00
committed by Orgad Shaneh
parent de68ac5407
commit cbc122e2e2
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/cplusplus/LookupContext.cpp
View File

@@ -162,7 +162,7 @@ LookupContext::LookupContext(Document::Ptr thisDocument,
LookupContext::LookupContext(Document::Ptr expressionDocument, LookupContext::LookupContext(Document::Ptr expressionDocument,
Document::Ptr thisDocument, Document::Ptr thisDocument,
const Snapshot &snapshot, const Snapshot &snapshot,
QSharedPointer<CreateBindings> bindings) CreateBindings::Ptr bindings)
: _expressionDocument(expressionDocument) : _expressionDocument(expressionDocument)
, _thisDocument(thisDocument) , _thisDocument(thisDocument)
, _snapshot(snapshot) , _snapshot(snapshot)

8
src/libs/cplusplus/LookupContext.h
View File

@@ -107,6 +107,8 @@ class CPLUSPLUS_EXPORT CreateBindings
Q_DISABLE_COPY(CreateBindings) Q_DISABLE_COPY(CreateBindings)
public: public:
typedef QSharedPointer<CreateBindings> Ptr;
CreateBindings(Document::Ptr thisDocument, const Snapshot &snapshot); CreateBindings(Document::Ptr thisDocument, const Snapshot &snapshot);
virtual ~CreateBindings(); virtual ~CreateBindings();
@@ -214,7 +216,7 @@ public:
LookupContext(Document::Ptr expressionDocument, LookupContext(Document::Ptr expressionDocument,
Document::Ptr thisDocument, Document::Ptr thisDocument,
const Snapshot &snapshot, const Snapshot &snapshot,
QSharedPointer<CreateBindings> bindings = QSharedPointer<CreateBindings>()); CreateBindings::Ptr bindings = CreateBindings::Ptr());
LookupContext(const LookupContext &other); LookupContext(const LookupContext &other);
LookupContext &operator = (const LookupContext &other); LookupContext &operator = (const LookupContext &other);
@@ -236,7 +238,7 @@ public:
LookupScope *lookupParent(Symbol *symbol) const; LookupScope *lookupParent(Symbol *symbol) const;
/// \internal /// \internal
QSharedPointer<CreateBindings> bindings() const CreateBindings::Ptr bindings() const
{ return _bindings; } { return _bindings; }
static QList<const Name *> fullyQualifiedName(Symbol *symbol); static QList<const Name *> fullyQualifiedName(Symbol *symbol);
@@ -264,7 +266,7 @@ private:
Snapshot _snapshot; Snapshot _snapshot;
// Bindings // Bindings
QSharedPointer<CreateBindings> _bindings; CreateBindings::Ptr _bindings;
bool m_expandTemplates; bool m_expandTemplates;
}; };

4
src/libs/cplusplus/TypeOfExpression.cpp
View File

@@ -50,7 +50,7 @@ TypeOfExpression::TypeOfExpression():
} }
void TypeOfExpression::init(Document::Ptr thisDocument, const Snapshot &snapshot, void TypeOfExpression::init(Document::Ptr thisDocument, const Snapshot &snapshot,
QSharedPointer<CreateBindings> bindings, CreateBindings::Ptr bindings,
const QSet<const Declaration *> &autoDeclarationsBeingResolved) const QSet<const Declaration *> &autoDeclarationsBeingResolved)
{ {
m_thisDocument = thisDocument; m_thisDocument = thisDocument;
@@ -62,7 +62,7 @@ void TypeOfExpression::init(Document::Ptr thisDocument, const Snapshot &snapshot
Q_ASSERT(m_bindings.isNull()); Q_ASSERT(m_bindings.isNull());
m_bindings = bindings; m_bindings = bindings;
if (m_bindings.isNull()) if (m_bindings.isNull())
m_bindings = QSharedPointer<CreateBindings>(new CreateBindings(thisDocument, snapshot)); m_bindings = CreateBindings::Ptr(new CreateBindings(thisDocument, snapshot));
m_environment.clear(); m_environment.clear();
m_autoDeclarationsBeingResolved = autoDeclarationsBeingResolved; m_autoDeclarationsBeingResolved = autoDeclarationsBeingResolved;

4
src/libs/cplusplus/TypeOfExpression.h
View File

@@ -62,7 +62,7 @@ public:
*/ */
void init(Document::Ptr thisDocument, void init(Document::Ptr thisDocument,
const Snapshot &snapshot, const Snapshot &snapshot,
QSharedPointer<CreateBindings> bindings = QSharedPointer<CreateBindings>(), CreateBindings::Ptr bindings = CreateBindings::Ptr(),
const QSet<const Declaration *> &autoDeclarationsBeingResolved const QSet<const Declaration *> &autoDeclarationsBeingResolved
= QSet<const Declaration *>()); = QSet<const Declaration *>());
@@ -142,7 +142,7 @@ private:
private: private:
Document::Ptr m_thisDocument; Document::Ptr m_thisDocument;
Snapshot m_snapshot; Snapshot m_snapshot;
QSharedPointer<CreateBindings> m_bindings; CreateBindings::Ptr m_bindings;
ExpressionAST *m_ast; ExpressionAST *m_ast;
Scope *m_scope; Scope *m_scope;
LookupContext m_lookupContext; LookupContext m_lookupContext;