diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-08-19 15:53:15 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-08-20 11:13:51 +0200 |
| commit | 7c21f2ec69af31bfa76ac0160877adf3f355b7e3 (patch) | |
| tree | 29067f591095f84aab5e310f37a760accc88889d /src/plugins/cpptools/cpptoolseditorsupport.cpp | |
| parent | 7d35212f60c7b6f0b71ec53177e52d1a71f1282e (diff) | |
| download | qt-creator-7c21f2ec69af31bfa76ac0160877adf3f355b7e3.tar.gz | |
CppTools: Denoise with BuiltinEditorDocumentParser::Ptr
Change-Id: I1d572e8cc3e76ef6bbae720e3c3482292aab9609
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolseditorsupport.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index 2342a5b695..b3650711d9 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -259,11 +259,11 @@ CppCompletionAssistProvider *CppEditorSupport::completionAssistProvider() const return m_completionAssistProvider; } -QSharedPointer<BuiltinEditorDocumentParser> CppEditorSupport::documentParser() +BuiltinEditorDocumentParser::Ptr CppEditorSupport::documentParser() { - QSharedPointer<BuiltinEditorDocumentParser> updater = documentParser_internal(); + BuiltinEditorDocumentParser::Ptr updater = documentParser_internal(); if (!updater || updater->filePath() != fileName()) { - updater = QSharedPointer<BuiltinEditorDocumentParser>(new BuiltinEditorDocumentParser(fileName())); + updater = BuiltinEditorDocumentParser::Ptr(new BuiltinEditorDocumentParser(fileName())); setDocumentParser_internal(updater); QSharedPointer<CppCodeModelSettings> cms = CppToolsPlugin::instance()->codeModelSettings(); @@ -282,7 +282,7 @@ void CppEditorSupport::updateDocument() m_updateDocumentTimer->start(m_updateDocumentInterval); } -static void parse(QFutureInterface<void> &future, QSharedPointer<BuiltinEditorDocumentParser> updater, +static void parse(QFutureInterface<void> &future, BuiltinEditorDocumentParser::Ptr updater, WorkingCopy workingCopy) { future.setProgressRange(0, 1); @@ -524,8 +524,7 @@ SemanticInfo CppEditorSupport::recalculateSemanticInfoNow(const SemanticInfo::So // Otherwise reprocess document } else { - const QSharedPointer<BuiltinEditorDocumentParser> documentParser - = documentParser_internal(); + const BuiltinEditorDocumentParser::Ptr documentParser = documentParser_internal(); QTC_ASSERT(documentParser, return newSemanticInfo); newSemanticInfo.snapshot = documentParser->snapshot(); if (!newSemanticInfo.snapshot.contains(source.fileName)) @@ -584,14 +583,13 @@ void CppEditorSupport::setSemanticInfo(const SemanticInfo &semanticInfo, bool em emit semanticInfoUpdated(semanticInfo); } -QSharedPointer<BuiltinEditorDocumentParser> CppEditorSupport::documentParser_internal() const +BuiltinEditorDocumentParser::Ptr CppEditorSupport::documentParser_internal() const { QMutexLocker locker(&m_documentParserLock); return m_documentParser; } -void CppEditorSupport::setDocumentParser_internal( - const QSharedPointer<BuiltinEditorDocumentParser> &updater) +void CppEditorSupport::setDocumentParser_internal(const BuiltinEditorDocumentParser::Ptr &updater) { QMutexLocker locker(&m_documentParserLock); m_documentParser = updater; |