diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-15 10:21:47 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-15 10:21:47 +0200 |
| commit | 6fb94a7b10216cb03544acfca1ea5e7e121dd50e (patch) | |
| tree | 2e5aba50125b1bda1ccb1739b5a6c39336e6333a /src/libs/cplusplus/LookupContext.h | |
| parent | c6bee7e20eff2cefe3300d2d5a9fc23508402e98 (diff) | |
| parent | 8ca5b55a0bafd744cf62c20de379a7738cb76138 (diff) | |
| download | qt-creator-6fb94a7b10216cb03544acfca1ea5e7e121dd50e.tar.gz | |
Merge branch '2.7'
Conflicts:
doc/src/qtquick/qtquick-components.qdoc
doc/src/qtquick/qtquick-designer.qdoc
qtcreator.pri
qtcreator.qbs
src/plugins/cppeditor/cppinsertdecldef.cpp
src/plugins/qnx/qnxruncontrolfactory.cpp
Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
Diffstat (limited to 'src/libs/cplusplus/LookupContext.h')
| -rw-r--r-- | src/libs/cplusplus/LookupContext.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h index b3b7104154..a372634053 100644 --- a/src/libs/cplusplus/LookupContext.h +++ b/src/libs/cplusplus/LookupContext.h @@ -177,7 +177,7 @@ class CPLUSPLUS_EXPORT CreateBindings: protected SymbolVisitor Q_DISABLE_COPY(CreateBindings) public: - CreateBindings(Document::Ptr thisDocument, const Snapshot &snapshot, QSharedPointer<Control> control); + CreateBindings(Document::Ptr thisDocument, const Snapshot &snapshot); virtual ~CreateBindings(); /// Returns the binding for the global namespace. @@ -191,7 +191,8 @@ public: /// Returns the Control that must be used to create temporary symbols. /// \internal - QSharedPointer<Control> control() const; + QSharedPointer<Control> control() const + { return _control; } bool expandTemplates() const { return _expandTemplates; } @@ -296,8 +297,6 @@ public: /// \internal void setBindings(QSharedPointer<CreateBindings> bindings); - QSharedPointer<Control> control() const; // ### deprecate - static QList<const Name *> fullyQualifiedName(Symbol *symbol); static QList<const Name *> path(Symbol *symbol); @@ -325,8 +324,6 @@ private: // Bindings mutable QSharedPointer<CreateBindings> _bindings; - QSharedPointer<Control> _control; - bool m_expandTemplates; }; |