diff options
| author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-11-19 13:49:26 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-11-19 14:48:38 +0000 |
| commit | 0498fb68ff76adc39c8744ff354d5dcc5ab94da8 (patch) | |
| tree | bc0c26904e3cc144d879e4d522c1ce2bf1bbca7b /src/libs/cplusplus/CppRewriter.h | |
| parent | c2a2883c4a982e52947e73ca97ba646fda54e6e2 (diff) | |
| download | qt-creator-0498fb68ff76adc39c8744ff354d5dcc5ab94da8.tar.gz | |
C++: Revert lookup to 3.4.2
...which was least buggy.
The bugs fixed by the changes we revert here (highlighting/completion
for code involving templates) were minor compared to ones we currently
have. Those bugs will be addressed by the clang code model anyway.
Relevant commits were collected via:
$ cd ${QTC}/src/libs/cplusplus
$ git log \
--no-merges \
--format=oneline \
v3.4.2..HEAD \
-- LookupContext.* ResolveExpression.* TypeResolver.* TypeOfExpression.* \
../../plugins/cpptools/cppcompletion_test.cpp
From this list the following were skipped due to irrelevance:
88c5b47e535d91f3db99882d5b50b263b46f223c # CppTools: Minor cleanup in completion tests
e5255a1f5cac284c4f0d4a85203878c84da86e85 # CppTools: Add a test for ObjC not replacing dot with arrow
5b12c8d63a30e281274cdc267efabead2c736bd8 # CppTools: Support ObjC in member access operator tests
9fef4fb9ca4e65e20ff13b98bcf15e3c6232fdfb # CPlusPlus: Fix warnings about overriding visit(...) methods
There were only minor conflicts while reverting those.
This changes touches so many files because there were quite some
cleanups and renames after the 3.4.2 release.
Task-number: QTCREATORBUG-14889
Task-number: QTCREATORBUG-15211
Task-number: QTCREATORBUG-15213
Task-number: QTCREATORBUG-15257
Task-number: QTCREATORBUG-15264
Task-number: QTCREATORBUG-15291
Task-number: QTCREATORBUG-15329
Change-Id: I01f759f8f35ecb4228928a4f22086e279c1a5435
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Diffstat (limited to 'src/libs/cplusplus/CppRewriter.h')
| -rw-r--r-- | src/libs/cplusplus/CppRewriter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/cplusplus/CppRewriter.h b/src/libs/cplusplus/CppRewriter.h index cb307a9401..cc68f662a5 100644 --- a/src/libs/cplusplus/CppRewriter.h +++ b/src/libs/cplusplus/CppRewriter.h @@ -89,13 +89,13 @@ private: class CPLUSPLUS_EXPORT UseMinimalNames: public Substitution { public: - UseMinimalNames(LookupScope *target); + UseMinimalNames(ClassOrNamespace *target); virtual ~UseMinimalNames(); virtual FullySpecifiedType apply(const Name *name, Rewrite *rewrite) const; private: - LookupScope *_target; + ClassOrNamespace *_target; }; class CPLUSPLUS_EXPORT UseQualifiedNames: public UseMinimalNames |