Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

make transaction amounts and balances signed 64-bit

Browse source
This commit is contained in:
Stephen Birarda 2014-05-23 15:34:34 -07:00
parent 50e812a82b
commit 34eb0f9f43
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
domain-server/src/WalletTransaction.cpp
View file

@ -18,13 +18,13 @@
WalletTransaction::WalletTransaction() : WalletTransaction::WalletTransaction() :
_uuid(), _uuid(),
_destinationUUID(), _destinationUUID(),
_amount(), _amount(0),
_isFinalized(false) _isFinalized(false)
{ {
} }
WalletTransaction::WalletTransaction(const QUuid& destinationUUID, double amount) : WalletTransaction::WalletTransaction(const QUuid& destinationUUID, qint64 amount) :
_uuid(QUuid::createUuid()), _uuid(QUuid::createUuid()),
_destinationUUID(destinationUUID), _destinationUUID(destinationUUID),
_amount(amount), _amount(amount),
@ -63,5 +63,5 @@ void WalletTransaction::loadFromJson(const QJsonObject& jsonObject) {
_uuid = QUuid(transactionObject.value(TRANSACTION_ID_KEY).toString()); _uuid = QUuid(transactionObject.value(TRANSACTION_ID_KEY).toString());
_destinationUUID = QUuid(transactionObject.value(TRANSACTION_DESTINATION_WALLET_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();
} }

10
domain-server/src/WalletTransaction.h
View file

@ -19,16 +19,16 @@
class WalletTransaction : public QObject { class WalletTransaction : public QObject {
public: public:
WalletTransaction(); WalletTransaction();
WalletTransaction(const QUuid& destinationUUID, double amount); WalletTransaction(const QUuid& destinationUUID, qint64 amount);
const QUuid& getUUID() const { return _uuid; } const QUuid& getUUID() const { return _uuid; }
void setDestinationUUID(const QUuid& destinationUUID) { _destinationUUID = destinationUUID; } void setDestinationUUID(const QUuid& destinationUUID) { _destinationUUID = destinationUUID; }
const QUuid& getDestinationUUID() const { return _destinationUUID; } const QUuid& getDestinationUUID() const { return _destinationUUID; }
double getAmount() const { return _amount; } qint64 getAmount() const { return _amount; }
void setAmount(double amount) { _amount = amount; } void setAmount(qint64 amount) { _amount = amount; }
void incrementAmount(double increment) { _amount += increment; } void incrementAmount(qint64 increment) { _amount += increment; }
bool isFinalized() const { return _isFinalized; } bool isFinalized() const { return _isFinalized; }
void setIsFinalized(bool isFinalized) { _isFinalized = isFinalized; } void setIsFinalized(bool isFinalized) { _isFinalized = isFinalized; }
@ -39,7 +39,7 @@ public:
private: private:
QUuid _uuid; QUuid _uuid;
QUuid _destinationUUID; QUuid _destinationUUID;
double _amount; qint64 _amount;
bool _isFinalized; bool _isFinalized;
}; };

2
libraries/networking/src/AccountManager.cpp
View file

@ -98,7 +98,7 @@ void AccountManager::updateBalance() {
} }
} }
void AccountManager::accountInfoBalanceChanged(quint64 newBalance) { void AccountManager::accountInfoBalanceChanged(qint64 newBalance) {
emit balanceChanged(newBalance); emit balanceChanged(newBalance);
} }

4
libraries/networking/src/AccountManager.h
View file

@ -64,7 +64,7 @@ public slots:
void requestError(QNetworkReply::NetworkError error); void requestError(QNetworkReply::NetworkError error);
void logout(); void logout();
void updateBalance(); void updateBalance();
void accountInfoBalanceChanged(quint64 newBalance); void accountInfoBalanceChanged(qint64 newBalance);
signals: signals:
void authRequired(); void authRequired();
void authEndpointChanged(); void authEndpointChanged();
@ -73,7 +73,7 @@ signals:
void loginComplete(const QUrl& authURL); void loginComplete(const QUrl& authURL);
void loginFailed(); void loginFailed();
void logoutComplete(); void logoutComplete();
void balanceChanged(quint64 newBalance); void balanceChanged(qint64 newBalance);
private slots: private slots:
void processReply(); void processReply();
private: private:

2
libraries/networking/src/DataServerAccountInfo.cpp
View file

@ -83,7 +83,7 @@ void DataServerAccountInfo::setDiscourseApiKey(const QString& discourseApiKey) {
} }
} }
void DataServerAccountInfo::setBalance(quint64 balance) { void DataServerAccountInfo::setBalance(qint64 balance) {
if (!_hasBalance || _balance != balance) { if (!_hasBalance || _balance != balance) {
_balance = balance; _balance = balance;
_hasBalance = true; _hasBalance = true;

8
libraries/networking/src/DataServerAccountInfo.h
View file

@ -35,8 +35,8 @@ public:
const QString& getDiscourseApiKey() const { return _discourseApiKey; } const QString& getDiscourseApiKey() const { return _discourseApiKey; }
void setDiscourseApiKey(const QString& discourseApiKey); void setDiscourseApiKey(const QString& discourseApiKey);
quint64 getBalance() const { return _balance; } qint64 getBalance() const { return _balance; }
void setBalance(quint64 balance); void setBalance(qint64 balance);
bool hasBalance() const { return _hasBalance; } bool hasBalance() const { return _hasBalance; }
void setHasBalance(bool hasBalance) { _hasBalance = hasBalance; } void setHasBalance(bool hasBalance) { _hasBalance = hasBalance; }
Q_INVOKABLE void setBalanceFromJSON(const QJsonObject& jsonObject); Q_INVOKABLE void setBalanceFromJSON(const QJsonObject& jsonObject);
@ -44,7 +44,7 @@ public:
friend QDataStream& operator<<(QDataStream &out, const DataServerAccountInfo& info); friend QDataStream& operator<<(QDataStream &out, const DataServerAccountInfo& info);
friend QDataStream& operator>>(QDataStream &in, DataServerAccountInfo& info); friend QDataStream& operator>>(QDataStream &in, DataServerAccountInfo& info);
signals: signals:
quint64 balanceChanged(quint64 newBalance); qint64 balanceChanged(qint64 newBalance);
private: private:
void swap(DataServerAccountInfo& otherInfo); void swap(DataServerAccountInfo& otherInfo);
@ -52,7 +52,7 @@ private:
QString _username; QString _username;
QString _xmppPassword; QString _xmppPassword;
QString _discourseApiKey; QString _discourseApiKey;
quint64 _balance; qint64 _balance;
bool _hasBalance; bool _hasBalance;
}; };