From c1dca21057dd81c66bf1e164f401b161c2d883ea Mon Sep 17 00:00:00 2001 From: Renaud G Date: Mon, 28 Mar 2022 23:23:30 +0200 Subject: update to new cmake --- diceroller.h | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'diceroller.h') diff --git a/diceroller.h b/diceroller.h index 4b13c3d..02d8e3e 100644 --- a/diceroller.h +++ b/diceroller.h @@ -26,23 +26,23 @@ class DiceRoller : public QObject { Q_OBJECT - Q_PROPERTY(qreal result READ getResult NOTIFY resultChanged) - Q_PROPERTY(QString dicelist READ getDiceList NOTIFY diceListChanged) - Q_PROPERTY(QString resultStr READ getResultStr NOTIFY resultStrChanged) - Q_PROPERTY(QString command READ getCommand WRITE setCommand NOTIFY commandChanged) - Q_PROPERTY(QString error READ getError WRITE setError NOTIFY errorOccurs) + Q_PROPERTY(qreal result READ result NOTIFY resultChanged) + Q_PROPERTY(QString dicelist READ diceList NOTIFY diceListChanged) + Q_PROPERTY(QString resultStr READ resultStr NOTIFY resultStrChanged) + Q_PROPERTY(QString command READ command WRITE setCommand NOTIFY commandChanged) + Q_PROPERTY(QString error READ error WRITE setError NOTIFY errorOccurs) public: - DiceRoller(); + DiceRoller(QObject* parent= nullptr); - QString getDiceList() const; - QString getResultStr() const; - QString getCommand() const; - qreal getResult() const; - void setCommand(const QString& cmd); + QString diceList() const; + QString resultStr() const; + QString command() const; + qreal result() const; + QString error() const; + QList* aliases() const; - QString getError() const; - void setError(const QString& error); + DiceParser* parser(); signals: void resultChanged(); @@ -53,9 +53,12 @@ signals: public slots: void start(); + void readErrorAndWarning(); + void setCommand(const QString& cmd); + void setError(const QString& error); -protected: - QString diceToText(QList& diceList); + /*protected: + QString diceToText(QList& diceList);*/ private: DiceParser m_diceparser; -- cgit v1.2.3-70-g09d2