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

ClangRefactoring: Fix progress counter

Browse Source 
We use threads now and the code had to be adapted.

Task-number: QTCREATORBUG-21950
Change-Id: Ie96c5bea1fa045588d0c5a8b18bfd1ccb5d9fdd9
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Marco Bubke
2019-02-07 15:54:24 +01:00
parent 97ec6b9ad2
commit 44d5e10185
3 changed files with 76 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/tools/clangrefactoringbackend/clangrefactoringbackendmain.cpp
View File

@@ -51,6 +51,48 @@ using ClangBackEnd::RefactoringDatabaseInitializer;
using ClangBackEnd::ConnectionServer;
using ClangBackEnd::SymbolIndexing;
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
template<typename CallableType>
class CallableEvent : public QEvent
{
public:
using Callable = std::decay_t<CallableType>;
CallableEvent(Callable &&callable)
: QEvent(QEvent::None)
, callable(std::move(callable))
{}
CallableEvent(const Callable &callable)
: QEvent(QEvent::None)
, callable(callable)
{}
~CallableEvent() { callable(); }
public:
Callable callable;
};
template<typename Callable>
void executeInLoop(Callable &&callable, QObject *object = QCoreApplication::instance())
{
if (QThread *thread = qobject_cast<QThread *>(object))
object = QAbstractEventDispatcher::instance(thread);
QCoreApplication::postEvent(object,
new CallableEvent<Callable>(std::forward<Callable>(callable)),
Qt::HighEventPriority);
}
#else
template<typename Callable>
void executeInLoop(Callable &&callable, QObject *object = QCoreApplication::instance())
{
if (QThread *thread = qobject_cast<QThread *>(object))
object = QAbstractEventDispatcher::instance(thread);
QMetaObject::invokeMethod(object, std::forward<Callable>(callable));
}
#endif
QStringList processArguments(QCoreApplication &application)
{
QCommandLineParser parser;
@@ -95,7 +137,14 @@ struct Data // because we have a cycle dependency
FilePathCaching filePathCache{database};
GeneratedFiles generatedFiles;
RefactoringServer clangCodeModelServer{symbolIndexing, filePathCache, generatedFiles};
SymbolIndexing symbolIndexing{database, filePathCache, generatedFiles, [&] (int progress, int total) { clangCodeModelServer.setProgress(progress, total); }};
SymbolIndexing symbolIndexing{database,
filePathCache,
generatedFiles,
[&](int progress, int total) {
executeInLoop([&] {
clangCodeModelServer.setProgress(progress, total);
});
}};
};
#ifdef Q_OS_WIN