diff --git a/domain-server/src/WalletTransaction.cpp b/domain-server/src/WalletTransaction.cpp index 6ff57f063c..9c8226a908 100644 --- a/domain-server/src/WalletTransaction.cpp +++ b/domain-server/src/WalletTransaction.cpp @@ -18,13 +18,13 @@ WalletTransaction::WalletTransaction() : _uuid(), _destinationUUID(), - _amount(), + _amount(0), _isFinalized(false) { } -WalletTransaction::WalletTransaction(const QUuid& destinationUUID, double amount) : +WalletTransaction::WalletTransaction(const QUuid& destinationUUID, qint64 amount) : _uuid(QUuid::createUuid()), _destinationUUID(destinationUUID), _amount(amount), @@ -63,5 +63,5 @@ void WalletTransaction::loadFromJson(const QJsonObject& jsonObject) { _uuid = QUuid(transactionObject.value(TRANSACTION_ID_KEY).toString()); _destinationUUID = QUuid(transactionObject.value(TRANSACTION_DESTINATION_WALLET_ID_KEY).toString()); - _amount = transactionObject.value(TRANSACTION_AMOUNT_KEY).toDouble(); + _amount = transactionObject.value(TRANSACTION_AMOUNT_KEY).toInt(); } \ No newline at end of file diff --git a/domain-server/src/WalletTransaction.h b/domain-server/src/WalletTransaction.h index 8f36d10302..5e05f9f549 100644 --- a/domain-server/src/WalletTransaction.h +++ b/domain-server/src/WalletTransaction.h @@ -19,16 +19,16 @@ class WalletTransaction : public QObject { public: WalletTransaction(); - WalletTransaction(const QUuid& destinationUUID, double amount); + WalletTransaction(const QUuid& destinationUUID, qint64 amount); const QUuid& getUUID() const { return _uuid; } void setDestinationUUID(const QUuid& destinationUUID) { _destinationUUID = destinationUUID; } const QUuid& getDestinationUUID() const { return _destinationUUID; } - double getAmount() const { return _amount; } - void setAmount(double amount) { _amount = amount; } - void incrementAmount(double increment) { _amount += increment; } + qint64 getAmount() const { return _amount; } + void setAmount(qint64 amount) { _amount = amount; } + void incrementAmount(qint64 increment) { _amount += increment; } bool isFinalized() const { return _isFinalized; } void setIsFinalized(bool isFinalized) { _isFinalized = isFinalized; } @@ -39,7 +39,7 @@ public: private: QUuid _uuid; QUuid _destinationUUID; - double _amount; + qint64 _amount; bool _isFinalized; }; diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index 96292d7baf..7d27332a57 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -98,7 +98,7 @@ void AccountManager::updateBalance() { } } -void AccountManager::accountInfoBalanceChanged(quint64 newBalance) { +void AccountManager::accountInfoBalanceChanged(qint64 newBalance) { emit balanceChanged(newBalance); } diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index b761b50610..628b084ea8 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -64,7 +64,7 @@ public slots: void requestError(QNetworkReply::NetworkError error); void logout(); void updateBalance(); - void accountInfoBalanceChanged(quint64 newBalance); + void accountInfoBalanceChanged(qint64 newBalance); signals: void authRequired(); void authEndpointChanged(); @@ -73,7 +73,7 @@ signals: void loginComplete(const QUrl& authURL); void loginFailed(); void logoutComplete(); - void balanceChanged(quint64 newBalance); + void balanceChanged(qint64 newBalance); private slots: void processReply(); private: diff --git a/libraries/networking/src/DataServerAccountInfo.cpp b/libraries/networking/src/DataServerAccountInfo.cpp index b3607200fe..809f083e35 100644 --- a/libraries/networking/src/DataServerAccountInfo.cpp +++ b/libraries/networking/src/DataServerAccountInfo.cpp @@ -83,7 +83,7 @@ void DataServerAccountInfo::setDiscourseApiKey(const QString& discourseApiKey) { } } -void DataServerAccountInfo::setBalance(quint64 balance) { +void DataServerAccountInfo::setBalance(qint64 balance) { if (!_hasBalance || _balance != balance) { _balance = balance; _hasBalance = true; diff --git a/libraries/networking/src/DataServerAccountInfo.h b/libraries/networking/src/DataServerAccountInfo.h index 2777bec4be..9bc4fbb37c 100644 --- a/libraries/networking/src/DataServerAccountInfo.h +++ b/libraries/networking/src/DataServerAccountInfo.h @@ -35,8 +35,8 @@ public: const QString& getDiscourseApiKey() const { return _discourseApiKey; } void setDiscourseApiKey(const QString& discourseApiKey); - quint64 getBalance() const { return _balance; } - void setBalance(quint64 balance); + qint64 getBalance() const { return _balance; } + void setBalance(qint64 balance); bool hasBalance() const { return _hasBalance; } void setHasBalance(bool hasBalance) { _hasBalance = hasBalance; } Q_INVOKABLE void setBalanceFromJSON(const QJsonObject& jsonObject); @@ -44,7 +44,7 @@ public: friend QDataStream& operator<<(QDataStream &out, const DataServerAccountInfo& info); friend QDataStream& operator>>(QDataStream &in, DataServerAccountInfo& info); signals: - quint64 balanceChanged(quint64 newBalance); + qint64 balanceChanged(qint64 newBalance); private: void swap(DataServerAccountInfo& otherInfo); @@ -52,7 +52,7 @@ private: QString _username; QString _xmppPassword; QString _discourseApiKey; - quint64 _balance; + qint64 _balance; bool _hasBalance; };