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

Use Utils::FutureSynchronizer instead of QFutureSynchronizer

Browse Source 
Change-Id: Iecfa676f58e5ca82be7c9c94233dcc8d3654c2d7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2021-05-12 15:12:48 +02:00
parent 3823b0af5f
commit 91f136ef3a
16 changed files with 36 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,9 +31,9 @@
#include <cpptools/builtineditordocumentprocessor.h>
#include <cpptools/semantichighlighter.h>
#include <utils/futuresynchronizer.h>
#include <utils/id.h>
#include <QFutureSynchronizer>
#include <QFutureWatcher>
#include <QTimer>
@@ -146,7 +146,7 @@ private:
QVector<ClangBackEnd::TokenInfoContainer> m_tokenInfos;
CppTools::SemanticHighlighter m_semanticHighlighter;
CppTools::BuiltinEditorDocumentProcessor m_builtinProcessor;
QFutureSynchronizer<void> m_parserSynchronizer;
Utils::FutureSynchronizer m_parserSynchronizer;
};
} // namespace Internal

2
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
View File

@@ -327,7 +327,7 @@ void ClangModelManagerSupport::updateLanguageClient(ProjectExplorer::Project *pr
auto future = Utils::runAsync(&Internal::generateCompilationDB, projectInfo,
CompilationDbPurpose::CodeModel);
generatorWatcher->setFuture(future);
m_generatorSynchronizer.addFuture(QFuture<void>(future));
m_generatorSynchronizer.addFuture(future);
}
ClangdClient *ClangModelManagerSupport::clientForProject(

4
src/plugins/clangcodemodel/clangmodelmanagersupport.h
View File

@@ -30,9 +30,9 @@
#include <cpptools/cppmodelmanagersupport.h>
#include <utils/futuresynchronizer.h>
#include <utils/id.h>
#include <QFutureSynchronizer>
#include <QObject>
#include <memory>
@@ -135,7 +135,7 @@ private:
std::unique_ptr<CppTools::RefactoringEngineInterface> m_refactoringEngine;
QHash<ProjectExplorer::Project *, ClangProjectSettings *> m_projectSettings;
QFutureSynchronizer<void> m_generatorSynchronizer;
Utils::FutureSynchronizer m_generatorSynchronizer;
};
class ClangModelManagerSupportProvider : public CppTools::ModelManagerSupportProvider