CMake: Simplify CMake Build System states a bit

Merge handleParsingSucceeded and handleParsingSuccess as well as
handleParsingFailed and handleParsingError.

Change-Id: If4f84bdfa2f59cfa0037a941372a1929996be3bd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Tobias Hunger
2020-04-23 18:29:27 +02:00
parent 60064620c8
commit 0b9513f273
3 changed files with 26 additions and 39 deletions

View File

@@ -63,35 +63,38 @@ public:
QStringList filesGeneratedFrom(const QString &sourceFile) const final;
// Actions:
void runCMake();
void runCMakeAndScanProjectTree();
// Context menu actions:
void buildCMakeTarget(const QString &buildTarget);
// Treescanner states:
void handleTreeScanningFinished();
bool persistCMakeState();
void clearCMakeCache();
// Parser states:
void handleParsingSuccess();
void handleParsingError();
CMakeBuildConfiguration *cmakeBuildConfiguration() const;
// Context menu actions:
void buildCMakeTarget(const QString &buildTarget);
// Queries:
const QList<ProjectExplorer::BuildTargetInfo> appTargets() const;
QStringList buildTargetTitles() const;
const QList<CMakeBuildTarget> &buildTargets() const;
ProjectExplorer::DeploymentData deploymentData() const;
CMakeBuildConfiguration *cmakeBuildConfiguration() const;
private:
std::unique_ptr<CMakeProjectNode> generateProjectTree(
const QList<const ProjectExplorer::FileNode *> &allFiles);
// Parser states:
void handleParsingSuccess();
void handleParsingError();
// Treescanner states:
void handleTreeScanningFinished();
// Combining Treescanner and Parser states:
void combineScanAndParse();
std::unique_ptr<CMakeProjectNode> generateProjectTree(
const QList<const ProjectExplorer::FileNode *> &allFiles);
void checkAndReportError(QString &errorMessage);
void updateProjectData();