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

Clang: Minor renaming

Browse Source 
This completes

    commit f01fbcb789
    Clang: Clean up some IPC names

Change-Id: Ic747ca4a01e5c693bd59626eef516ae4a42bf9fc
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-06-05 11:40:01 +02:00
parent c91dde79d5
commit b30926cea4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -85,9 +85,9 @@ ClangEditorDocumentProcessor::ClangEditorDocumentProcessor(
, m_semanticHighlighter(document) , m_semanticHighlighter(document)
, m_builtinProcessor(document, /*enableSemanticHighlighter=*/ false) , m_builtinProcessor(document, /*enableSemanticHighlighter=*/ false)
{ {
m_updateTranslationUnitTimer.setSingleShot(true); m_updateBackendDocumentTimer.setSingleShot(true);
m_updateTranslationUnitTimer.setInterval(350); m_updateBackendDocumentTimer.setInterval(350);
connect(&m_updateTranslationUnitTimer, &QTimer::timeout, connect(&m_updateBackendDocumentTimer, &QTimer::timeout,
this, &ClangEditorDocumentProcessor::updateBackendDocumentIfProjectPartExists); this, &ClangEditorDocumentProcessor::updateBackendDocumentIfProjectPartExists);
connect(m_parser.data(), &ClangEditorDocumentParser::projectPartInfoUpdated, connect(m_parser.data(), &ClangEditorDocumentParser::projectPartInfoUpdated,
@@ -103,7 +103,7 @@ ClangEditorDocumentProcessor::ClangEditorDocumentProcessor(
ClangEditorDocumentProcessor::~ClangEditorDocumentProcessor() ClangEditorDocumentProcessor::~ClangEditorDocumentProcessor()
{ {
m_updateTranslationUnitTimer.stop(); m_updateBackendDocumentTimer.stop();
m_parserWatcher.cancel(); m_parserWatcher.cancel();
m_parserWatcher.waitForFinished(); m_parserWatcher.waitForFinished();
@@ -115,7 +115,7 @@ ClangEditorDocumentProcessor::~ClangEditorDocumentProcessor()
void ClangEditorDocumentProcessor::runImpl( void ClangEditorDocumentProcessor::runImpl(
const CppTools::BaseEditorDocumentParser::UpdateParams &updateParams) const CppTools::BaseEditorDocumentParser::UpdateParams &updateParams)
{ {
m_updateTranslationUnitTimer.start(); m_updateBackendDocumentTimer.start();
// Run clang parser // Run clang parser
disconnect(&m_parserWatcher, &QFutureWatcher<void>::finished, disconnect(&m_parserWatcher, &QFutureWatcher<void>::finished,
@@ -317,7 +317,7 @@ void ClangEditorDocumentProcessor::addDiagnosticToolTipToLayout(uint line,
void ClangEditorDocumentProcessor::editorDocumentTimerRestarted() void ClangEditorDocumentProcessor::editorDocumentTimerRestarted()
{ {
m_updateTranslationUnitTimer.stop(); // Wait for the next call to run(). m_updateBackendDocumentTimer.stop(); // Wait for the next call to run().
} }
void ClangEditorDocumentProcessor::invalidateDiagnostics() void ClangEditorDocumentProcessor::invalidateDiagnostics()

2
src/plugins/clangcodemodel/clangeditordocumentprocessor.h
View File

@@ -136,7 +136,7 @@ private:
Core::Id m_diagnosticConfigId; Core::Id m_diagnosticConfigId;
bool m_isProjectFile = false; bool m_isProjectFile = false;
QFutureWatcher<void> m_parserWatcher; QFutureWatcher<void> m_parserWatcher;
QTimer m_updateTranslationUnitTimer; QTimer m_updateBackendDocumentTimer;
unsigned m_parserRevision; unsigned m_parserRevision;
QVector<ClangBackEnd::TokenInfoContainer> m_tokenInfos; QVector<ClangBackEnd::TokenInfoContainer> m_tokenInfos;