Mercurial > hg > svcore
diff data/model/Model.h @ 1450:a12fd0456f0c streaming-csv-writer
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 17 Apr 2018 10:35:42 +0100 |
parents | 48e9f538e6e9 |
children | b40f67578976 |
line wrap: on
line diff
--- a/data/model/Model.h Tue Apr 17 10:03:51 2018 +0100 +++ b/data/model/Model.h Tue Apr 17 10:35:42 2018 +0100 @@ -33,7 +33,7 @@ */ class Model : public QObject, - public XmlExportable, + public XmlExportable, public Playable { Q_OBJECT @@ -125,9 +125,9 @@ * getCompletion(). */ virtual bool isReady(int *completion = 0) const { - bool ok = isOK(); - if (completion) *completion = (ok ? 100 : 0); - return ok; + bool ok = isOK(); + if (completion) *completion = (ok ? 100 : 0); + return ok; } static const int COMPLETION_UNKNOWN;