aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager/tealeafreader.h
diff options
context:
space:
mode:
authorTobias Hunger <[email protected]>2019-06-07 17:13:49 +0200
committerTobias Hunger <[email protected]>2019-06-13 12:36:44 +0000
commit65658f411bb303f56a589b7f0f1df179dd8eed99 (patch)
treed4b3de2398e4d0e36f83e4b38f5150e420b4e253 /src/plugins/cmakeprojectmanager/tealeafreader.h
parent68bcaeff647f72d1d65aded1fa929360413d71bb (diff)
CMake: Unify error reporting for builddirmanager's information retrieval
Use a dedicated errrorMessage out parameter for error reporting in the builddirmanager methods related to information retrieval. Those are called after the parsing has finished. This frees the errrorOccured signal of the builddirmanager to be used only when the parsing itself has failed. Change-Id: Ieefc32c0386769479177a6bd4bc4a0e77df5db7b Reviewed-by: Cristian Adam <[email protected]> Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/tealeafreader.h')
-rw-r--r--src/plugins/cmakeprojectmanager/tealeafreader.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/cmakeprojectmanager/tealeafreader.h b/src/plugins/cmakeprojectmanager/tealeafreader.h
index a305d0276a3..d1ad3026eb4 100644
--- a/src/plugins/cmakeprojectmanager/tealeafreader.h
+++ b/src/plugins/cmakeprojectmanager/tealeafreader.h
@@ -56,11 +56,12 @@ public:
bool isParsing() const final;
- QList<CMakeBuildTarget> takeBuildTargets() final;
- CMakeConfig takeParsedConfiguration() final;
+ QList<CMakeBuildTarget> takeBuildTargets(QString &errorMessage) final;
+ CMakeConfig takeParsedConfiguration(QString &errorMessage) final;
void generateProjectTree(CMakeProjectNode *root,
- const QList<const ProjectExplorer::FileNode *> &allFiles) final;
- CppTools::RawProjectParts createRawProjectParts() const final;
+ const QList<const ProjectExplorer::FileNode *> &allFiles,
+ QString &errorMessage) final;
+ CppTools::RawProjectParts createRawProjectParts(QString &errorMessage) const final;
private:
void extractData();