Skip to content

Commit 4f5e9fe

Browse files
fanquakefanquake
committed
refactor: replace QDateTime::fromTime_t with QDateTime::fromSecsSinceEpoch
1 parent 260b1d7 commit 4f5e9fe

File tree

7 files changed

+12
-11
lines changed

7 files changed

+12
-11
lines changed

‎src/qt/bitcoingui.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,8 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH
596596
connect(_clientModel, &ClientModel::numConnectionsChanged, this, &BitcoinGUI::setNumConnections);
597597
connect(_clientModel, &ClientModel::networkActiveChanged, this, &BitcoinGUI::setNetworkActive);
598598

599-
modalOverlay->setKnownBestHeight(tip_info->header_height, QDateTime::fromTime_t(tip_info->header_time));
600-
setNumBlocks(tip_info->block_height, QDateTime::fromTime_t(tip_info->block_time), tip_info->verification_progress, false, SynchronizationState::INIT_DOWNLOAD);
599+
modalOverlay->setKnownBestHeight(tip_info->header_height, QDateTime::fromSecsSinceEpoch(tip_info->header_time));
600+
setNumBlocks(tip_info->block_height, QDateTime::fromSecsSinceEpoch(tip_info->block_time), tip_info->verification_progress, false, SynchronizationState::INIT_DOWNLOAD);
601601
connect(_clientModel, &ClientModel::numBlocksChanged, this, &BitcoinGUI::setNumBlocks);
602602

603603
// Receive and report messages from client model

‎src/qt/clientmodel.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ bool ClientModel::isReleaseVersion() const
216216

217217
QString ClientModel::formatClientStartupTime() const
218218
{
219-
return QDateTime::fromTime_t(GetStartupTime()).toString();
219+
return QDateTime::fromSecsSinceEpoch(GetStartupTime()).toString();
220220
}
221221

222222
QString ClientModel::dataDir() const
@@ -294,7 +294,7 @@ static void BlockTipChanged(ClientModel* clientmodel, SynchronizationState sync_
294294

295295
bool invoked = QMetaObject::invokeMethod(clientmodel, "numBlocksChanged", Qt::QueuedConnection,
296296
Q_ARG(int, tip.block_height),
297-
Q_ARG(QDateTime, QDateTime::fromTime_t(tip.block_time)),
297+
Q_ARG(QDateTime, QDateTime::fromSecsSinceEpoch(tip.block_time)),
298298
Q_ARG(double, verificationProgress),
299299
Q_ARG(bool, fHeader),
300300
Q_ARG(SynchronizationState, sync_state));

‎src/qt/guiutil.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ QString dateTimeStr(const QDateTime &date)
8181

8282
QString dateTimeStr(qint64 nTime)
8383
{
84-
return dateTimeStr(QDateTime::fromTime_t((qint32)nTime));
84+
return dateTimeStr(QDateTime::fromSecsSinceEpoch(nTime));
8585
}
8686

8787
QFont fixedPitchFont(bool use_embedded_font)

‎src/qt/recentrequeststablemodel.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class RecentRequestEntry
2828
unsigned int date_timet;
2929
SER_WRITE(obj, date_timet = obj.date.toTime_t());
3030
READWRITE(obj.nVersion, obj.id, date_timet, obj.recipient);
31-
SER_READ(obj, obj.date = QDateTime::fromTime_t(date_timet));
31+
SER_READ(obj, obj.date = QDateTime::fromSecsSinceEpoch(date_timet));
3232
}
3333
};
3434

‎src/qt/rpcconsole.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_
646646
setNumConnections(model->getNumConnections());
647647
connect(model, &ClientModel::numConnectionsChanged, this, &RPCConsole::setNumConnections);
648648

649-
setNumBlocks(bestblock_height, QDateTime::fromTime_t(bestblock_date), verification_progress, false);
649+
setNumBlocks(bestblock_height, QDateTime::fromSecsSinceEpoch(bestblock_date), verification_progress, false);
650650
connect(model, &ClientModel::numBlocksChanged, this, &RPCConsole::setNumBlocks);
651651

652652
updateNetworkState();

‎src/qt/transactionfilterproxy.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
#include <qt/transactionrecord.h>
99

1010
#include <cstdlib>
11+
#include <limits>
1112

1213
// Earliest date that can be represented (far in the past)
13-
const QDateTime TransactionFilterProxy::MIN_DATE = QDateTime::fromTime_t(0);
14+
const QDateTime TransactionFilterProxy::MIN_DATE = QDateTime::fromSecsSinceEpoch(0);
1415
// Last date that can be represented (far in the future)
15-
const QDateTime TransactionFilterProxy::MAX_DATE = QDateTime::fromTime_t(0xFFFFFFFF);
16+
const QDateTime TransactionFilterProxy::MAX_DATE = QDateTime::fromSecsSinceEpoch(std::numeric_limits<qint64>::max());
1617

1718
TransactionFilterProxy::TransactionFilterProxy(QObject *parent) :
1819
QSortFilterProxyModel(parent),

‎src/qt/transactiontablemodel.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
610610
case TypeRole:
611611
return rec->type;
612612
case DateRole:
613-
return QDateTime::fromTime_t(static_cast<uint>(rec->time));
613+
return QDateTime::fromSecsSinceEpoch(rec->time);
614614
case WatchonlyRole:
615615
return rec->involvesWatchAddress;
616616
case WatchonlyDecorationRole:
@@ -630,7 +630,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
630630
case TxPlainTextRole:
631631
{
632632
QString details;
633-
QDateTime date = QDateTime::fromTime_t(static_cast<uint>(rec->time));
633+
QDateTime date = QDateTime::fromSecsSinceEpoch(rec->time);
634634
QString txLabel = walletModel->getAddressTableModel()->labelForAddress(QString::fromStdString(rec->address));
635635

636636
details.append(date.toString("M/d/yy HH:mm"));

0 commit comments

Comments
 (0)