Skip to content

Commit dd455ec

Browse files
author
MarcoFalke
committed
Merge bitcoin-core#349: replace QDateTime::fromTime_t with QDateTime::fromSecsSinceEpoch
3ae503c refactor: replace QDateTime::toTime_t with QDateTime::toSecsSinceEpoch (fanquake) 27257b3 refactor: replace QDateTime::fromTime_t with QDateTime::fromSecsSinceEpoch (fanquake) Pull request description: `QDateTime::fromTime_t` has [been obsoleted](https://doc.qt.io/qt-5.12/qdatetime-obsolete.html#fromTime_t) in favour of [`QDateTime::fromSecsSinceEpoch`](https://doc.qt.io/qt-5.12/qdatetime.html#fromSecsSinceEpoch), which is available from Qt 5.8+. ACKs for top commit: hebasto: ACK 3ae503c Tree-SHA512: 774243bccb4c4bd9e8ceeee0450d4f57b5665bdef8bcec0538d29664922fd354189d48718ca62ca49048b8b90c9b31ed184e1eefd7ff4529c55ba7d2b079e51e
2 parents b20ad0e + 3ae503c commit dd455ec

8 files changed

+15
-11
lines changed

src/qt/bitcoingui.cpp

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

597-
modalOverlay->setKnownBestHeight(tip_info->header_height, QDateTime::fromTime_t(tip_info->header_time));
598-
setNumBlocks(tip_info->block_height, QDateTime::fromTime_t(tip_info->block_time), tip_info->verification_progress, false, SynchronizationState::INIT_DOWNLOAD);
597+
modalOverlay->setKnownBestHeight(tip_info->header_height, QDateTime::fromSecsSinceEpoch(tip_info->header_time));
598+
setNumBlocks(tip_info->block_height, QDateTime::fromSecsSinceEpoch(tip_info->block_time), tip_info->verification_progress, false, SynchronizationState::INIT_DOWNLOAD);
599599
connect(_clientModel, &ClientModel::numBlocksChanged, this, &BitcoinGUI::setNumBlocks);
600600

601601
// 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.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ bool RecentRequestEntryLessThan::operator()(const RecentRequestEntry& left, cons
234234
switch(column)
235235
{
236236
case RecentRequestsTableModel::Date:
237-
return pLeft->date.toTime_t() < pRight->date.toTime_t();
237+
return pLeft->date.toSecsSinceEpoch() < pRight->date.toSecsSinceEpoch();
238238
case RecentRequestsTableModel::Label:
239239
return pLeft->recipient.label < pRight->recipient.label;
240240
case RecentRequestsTableModel::Message:

src/qt/recentrequeststablemodel.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
#include <qt/sendcoinsrecipient.h>
99

10+
#include <string>
11+
1012
#include <QAbstractTableModel>
1113
#include <QStringList>
1214
#include <QDateTime>
@@ -26,9 +28,9 @@ class RecentRequestEntry
2628

2729
SERIALIZE_METHODS(RecentRequestEntry, obj) {
2830
unsigned int date_timet;
29-
SER_WRITE(obj, date_timet = obj.date.toTime_t());
31+
SER_WRITE(obj, date_timet = obj.date.toSecsSinceEpoch());
3032
READWRITE(obj.nVersion, obj.id, date_timet, obj.recipient);
31-
SER_READ(obj, obj.date = QDateTime::fromTime_t(date_timet));
33+
SER_READ(obj, obj.date = QDateTime::fromSecsSinceEpoch(date_timet));
3234
}
3335
};
3436

src/qt/rpcconsole.cpp

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

654-
setNumBlocks(bestblock_height, QDateTime::fromTime_t(bestblock_date), verification_progress, false);
654+
setNumBlocks(bestblock_height, QDateTime::fromSecsSinceEpoch(bestblock_date), verification_progress, false);
655655
connect(model, &ClientModel::numBlocksChanged, this, &RPCConsole::setNumBlocks);
656656

657657
updateNetworkState();

src/qt/transactionfilterproxy.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
#include <qt/transactiontablemodel.h>
88
#include <qt/transactionrecord.h>
99

10+
#include <algorithm>
1011
#include <cstdlib>
12+
#include <optional>
1113

1214
TransactionFilterProxy::TransactionFilterProxy(QObject *parent) :
1315
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)