qint64 for MSVC compiler
This commit is contained in:
parent
8e0f816d37
commit
75ef105869
|
@ -15,7 +15,7 @@ class Turnstile;
|
||||||
|
|
||||||
struct TransactionItem {
|
struct TransactionItem {
|
||||||
QString type;
|
QString type;
|
||||||
unsigned long datetime;
|
qint64 datetime;
|
||||||
QString address;
|
QString address;
|
||||||
QString txid;
|
QString txid;
|
||||||
double amount;
|
double amount;
|
||||||
|
|
|
@ -87,7 +87,7 @@ void SentTxStore::addToSentTx(Tx tx, QString txid) {
|
||||||
QJsonObject txItem;
|
QJsonObject txItem;
|
||||||
txItem["type"] = "sent";
|
txItem["type"] = "sent";
|
||||||
txItem["from"] = tx.fromAddr;
|
txItem["from"] = tx.fromAddr;
|
||||||
txItem["datetime"] = QDateTime().currentMSecsSinceEpoch() / 1000;
|
txItem["datetime"] = QDateTime().currentMSecsSinceEpoch() / (qint64)1000;
|
||||||
txItem["address"] = QString(); // The sent address is blank, to be consistent with t-Addr sent behaviour
|
txItem["address"] = QString(); // The sent address is blank, to be consistent with t-Addr sent behaviour
|
||||||
txItem["txid"] = txid;
|
txItem["txid"] = txid;
|
||||||
txItem["amount"] = -totalAmount;
|
txItem["amount"] = -totalAmount;
|
||||||
|
|
|
@ -98,10 +98,7 @@ void TxTableModel::updateAllData() {
|
||||||
else
|
else
|
||||||
return addr;
|
return addr;
|
||||||
}
|
}
|
||||||
case 2: {
|
case 2: return QDateTime::fromMSecsSinceEpoch(modeldata->at(index.row()).datetime * (qint64)1000).toLocalTime().toString();
|
||||||
qDebug() << modeldata->at(index.row()).datetime;
|
|
||||||
return QDateTime::fromMSecsSinceEpoch(modeldata->at(index.row()).datetime * 1000).toLocalTime().toString();
|
|
||||||
}
|
|
||||||
case 3: return Settings::getInstance()->getZECDisplayFormat(modeldata->at(index.row()).amount);
|
case 3: return Settings::getInstance()->getZECDisplayFormat(modeldata->at(index.row()).amount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -117,7 +114,7 @@ void TxTableModel::updateAllData() {
|
||||||
else
|
else
|
||||||
return addr;
|
return addr;
|
||||||
}
|
}
|
||||||
case 2: return QDateTime::fromMSecsSinceEpoch(modeldata->at(index.row()).datetime * 1000).toLocalTime().toString();
|
case 2: return QDateTime::fromMSecsSinceEpoch(modeldata->at(index.row()).datetime * (qint64)1000).toLocalTime().toString();
|
||||||
case 3: return Settings::getInstance()->getUSDFormat(modeldata->at(index.row()).amount);
|
case 3: return Settings::getInstance()->getUSDFormat(modeldata->at(index.row()).amount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue