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

CompilationDb: Make use of BuildSystem base class parsing infrastructure

Browse Source 
Change-Id: I928e173b35b87c0fcb8fc97785ddfa4a2414740d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-03-12 12:09:54 +01:00
parent c679a3ac72
commit 1b9804693d
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
View File

@@ -52,7 +52,6 @@
#include <utils/runextensions.h> #include <utils/runextensions.h>
#include <QFileDialog> #include <QFileDialog>
#include <QTimer>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <Windows.h> #include <Windows.h>
@@ -339,20 +338,15 @@ void createTree(std::unique_ptr<ProjectNode> &root,
CompilationDatabaseBuildSystem::CompilationDatabaseBuildSystem(Target *target) CompilationDatabaseBuildSystem::CompilationDatabaseBuildSystem(Target *target)
: BuildSystem(target) : BuildSystem(target)
, m_cppCodeModelUpdater(std::make_unique<CppTools::CppProjectUpdater>()) , m_cppCodeModelUpdater(std::make_unique<CppTools::CppProjectUpdater>())
, m_parseDelay(new QTimer(this))
, m_deployFileWatcher(new FileSystemWatcher(this)) , m_deployFileWatcher(new FileSystemWatcher(this))
{ {
connect(target->project(), &CompilationDatabaseProject::rootProjectDirectoryChanged, connect(target->project(), &CompilationDatabaseProject::rootProjectDirectoryChanged,
this, [this] { this, [this] {
m_projectFileHash.clear(); m_projectFileHash.clear();
m_parseDelay->start(); requestDelayedParse();
}); });
connect(m_parseDelay, &QTimer::timeout, this, &CompilationDatabaseBuildSystem::reparseProject); requestDelayedParse();
m_parseDelay->setSingleShot(true);
m_parseDelay->setInterval(1000);
m_parseDelay->start();
connect(project(), &Project::projectFileIsDirty, this, &CompilationDatabaseBuildSystem::reparseProject); connect(project(), &Project::projectFileIsDirty, this, &CompilationDatabaseBuildSystem::reparseProject);

5
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h
View File

@@ -37,10 +37,6 @@
#include <QFutureWatcher> #include <QFutureWatcher>
QT_BEGIN_NAMESPACE
class QTimer;
QT_END_NAMESPACE
namespace CppTools { class CppProjectUpdater; } namespace CppTools { class CppProjectUpdater; }
namespace ProjectExplorer { class Kit; } namespace ProjectExplorer { class Kit; }
namespace Utils { class FileSystemWatcher; } namespace Utils { class FileSystemWatcher; }
@@ -77,7 +73,6 @@ public:
std::unique_ptr<CppTools::CppProjectUpdater> m_cppCodeModelUpdater; std::unique_ptr<CppTools::CppProjectUpdater> m_cppCodeModelUpdater;
MimeBinaryCache m_mimeBinaryCache; MimeBinaryCache m_mimeBinaryCache;
QByteArray m_projectFileHash; QByteArray m_projectFileHash;
QTimer * const m_parseDelay;
CompilationDbParser *m_parser = nullptr; CompilationDbParser *m_parser = nullptr;
Utils::FileSystemWatcher * const m_deployFileWatcher; Utils::FileSystemWatcher * const m_deployFileWatcher;
}; };