Skip to content

Commit f2a673f

Browse files
committed
Merge #137: refactor: Replace deprecated Qt::SystemLocale{Short,Long}Date
86b1ab6 refactor: Replace deprecated Qt::SystemLocale{Short,Long}Date (Hennadii Stepanov) Pull request description: As all deprecated warning in Qt 5.15.0 were eliminated in #46, Qt 5.15.1 introduced another one that is fixed in this PR. Required for bitcoin/bitcoin#20182. Details in Qt docs: - https://doc.qt.io/qt-5/qdatetime.html#toString-1 - https://doc.qt.io/qt-5/qdate.html#toString-1 ACKs for top commit: jarolrod: Tested ACK 86b1ab6 on MacOS 10.15.7 and Arch Linux both with Qt 5.15.1 jonasschnelli: Tested ACK 86b1ab6 Tree-SHA512: 1dbba8ee70c895bf58317172a9901cdbe5503b1d6258f51caaae88d88d332d9fbd4697c995192d31e3618ddfd532c5f5881289b3af1184422e5a9263a1224115
2 parents cd72033 + 86b1ab6 commit f2a673f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/qt/bantablemodel.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include <QDateTime>
1313
#include <QList>
14+
#include <QLocale>
1415
#include <QModelIndex>
1516
#include <QVariant>
1617

@@ -122,7 +123,7 @@ QVariant BanTableModel::data(const QModelIndex &index, int role) const
122123
case Bantime:
123124
QDateTime date = QDateTime::fromMSecsSinceEpoch(0);
124125
date = date.addSecs(rec->banEntry.nBanUntil);
125-
return date.toString(Qt::SystemLocaleLongDate);
126+
return QLocale::system().toString(date, QLocale::LongFormat);
126127
}
127128
}
128129

src/qt/guiutil.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include <QKeyEvent>
4444
#include <QLineEdit>
4545
#include <QList>
46+
#include <QLocale>
4647
#include <QMenu>
4748
#include <QMouseEvent>
4849
#include <QProgressDialog>
@@ -67,7 +68,7 @@ namespace GUIUtil {
6768

6869
QString dateTimeStr(const QDateTime &date)
6970
{
70-
return date.date().toString(Qt::SystemLocaleShortDate) + QString(" ") + date.toString("hh:mm");
71+
return QLocale::system().toString(date.date(), QLocale::ShortFormat) + QString(" ") + date.toString("hh:mm");
7172
}
7273

7374
QString dateTimeStr(qint64 nTime)

0 commit comments

Comments
 (0)