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

CMake: Disable switching between different readers

Browse Source 
Remove the code that switches between different types of
readers based on what the different CMake binaries support.

This is no longer needed since only file-api is supported now.

Change-Id: Ia86d143f5e2cecc2bcd68ab7d62503915a32d223
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Tobias Hunger
2020-04-03 11:43:29 +02:00
parent 2a664afaa1
commit 902b1c3b9e
9 changed files with 50 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/cmakeprojectmanager/fileapireader.h
View File

@@ -25,13 +25,17 @@
#pragma once
#include "builddirreader.h"
#include "fileapiparser.h"
#include "cmakebuildtarget.h"
#include "cmakeprocess.h"
#include "cmakeprojectnodes.h"
#include "fileapiparser.h"
#include <projectexplorer/rawprojectpart.h>
#include <utils/optional.h>
#include <QFuture>
#include <QObject>
#include <memory>
@@ -44,29 +48,34 @@ namespace Internal {
class FileApiQtcData;
class FileApiReader final : public BuildDirReader
class FileApiReader final : public QObject
{
Q_OBJECT
public:
FileApiReader();
~FileApiReader() final;
~FileApiReader();
void setParameters(const BuildDirParameters &p) final;
void setParameters(const BuildDirParameters &p);
bool isCompatible(const BuildDirParameters &p) final;
void resetData() final;
void parse(bool forceCMakeRun, bool forceConfiguration) final;
void stop() final;
void resetData();
void parse(bool forceCMakeRun, bool forceConfiguration);
void stop();
bool isParsing() const final;
bool isParsing() const;
QSet<Utils::FilePath> projectFilesToWatch() const final;
QList<CMakeBuildTarget> takeBuildTargets(QString &errorMessage) final;
CMakeConfig takeParsedConfiguration(QString &errorMessage) final;
QSet<Utils::FilePath> projectFilesToWatch() const;
QList<CMakeBuildTarget> takeBuildTargets(QString &errorMessage);
CMakeConfig takeParsedConfiguration(QString &errorMessage);
std::unique_ptr<CMakeProjectNode> generateProjectTree(
const QList<const ProjectExplorer::FileNode *> &allFiles, QString &errorMessage) final;
ProjectExplorer::RawProjectParts createRawProjectParts(QString &errorMessage) final;
const QList<const ProjectExplorer::FileNode *> &allFiles, QString &errorMessage);
ProjectExplorer::RawProjectParts createRawProjectParts(QString &errorMessage);
signals:
void configurationStarted() const;
void dataAvailable() const;
void dirty() const;
void errorOccurred(const QString &message) const;
private:
void startState();
@@ -90,6 +99,8 @@ private:
bool m_isParsing = false;
std::unique_ptr<FileApiParser> m_fileApi;
BuildDirParameters m_parameters;
};
} // namespace Internal