From 317006708951d047375bd3714d8509604f224c8c Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 27 Oct 2016 15:09:55 +0200 Subject: [PATCH] Make JobResult inheritable and remove obsolete Status enum. --- src/libcalamares/Job.h | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/libcalamares/Job.h b/src/libcalamares/Job.h index e632ec885..b9d3baf85 100644 --- a/src/libcalamares/Job.h +++ b/src/libcalamares/Job.h @@ -29,37 +29,33 @@ namespace Calamares { class DLLEXPORT JobResult { public: - operator bool() const; + virtual ~JobResult() {} - QString message() const; - void setMessage( const QString& message ); + virtual operator bool() const; - QString details() const; - void setDetails( const QString& details ); + virtual QString message() const; + virtual void setMessage( const QString& message ); + + virtual QString details() const; + virtual void setDetails( const QString& details ); static JobResult ok(); static JobResult error( const QString& message, const QString& details = QString() ); +protected: + explicit JobResult( bool ok, const QString& message, const QString& details ); + private: bool m_ok; QString m_message; QString m_details; - - JobResult( bool ok, const QString& message, const QString& details ); }; class DLLEXPORT Job : public QObject { Q_OBJECT public: - enum State - { - Pending = 0, - Running, - Finished - }; - explicit Job( QObject* parent = nullptr ); virtual ~Job();