Skip to content

Commit 6f0da95

Browse files
committed
refactor, qt: Use std::chrono in ConfirmMessage parameter
1 parent 33d520a commit 6f0da95

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

src/qt/test/addressbooktests.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
#include <wallet/wallet.h>
2121
#include <walletinitinterface.h>
2222

23+
#include <chrono>
24+
2325
#include <QApplication>
2426
#include <QTimer>
2527
#include <QMessageBox>
@@ -40,7 +42,7 @@ void EditAddressAndSubmit(
4042
dialog->findChild<QLineEdit*>("labelEdit")->setText(label);
4143
dialog->findChild<QValidatedLineEdit*>("addressEdit")->setText(address);
4244

43-
ConfirmMessage(&warning_text, 5);
45+
ConfirmMessage(&warning_text, 5ms);
4446
dialog->accept();
4547
QCOMPARE(warning_text, expected_msg);
4648
}

src/qt/test/util.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5+
#include <chrono>
6+
57
#include <QApplication>
68
#include <QMessageBox>
79
#include <QPushButton>
810
#include <QString>
911
#include <QTimer>
1012
#include <QWidget>
1113

12-
void ConfirmMessage(QString* text, int msec)
14+
void ConfirmMessage(QString* text, std::chrono::milliseconds msec)
1315
{
1416
QTimer::singleShot(msec, [text]() {
1517
for (QWidget* widget : QApplication::topLevelWidgets()) {

src/qt/test/util.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@
55
#ifndef BITCOIN_QT_TEST_UTIL_H
66
#define BITCOIN_QT_TEST_UTIL_H
77

8-
#include <QString>
8+
#include <chrono>
9+
10+
QT_BEGIN_NAMESPACE
11+
class QString;
12+
QT_END_NAMESPACE
913

1014
/**
1115
* Press "Ok" button in message box dialog.
1216
*
1317
* @param text - Optionally store dialog text.
1418
* @param msec - Number of milliseconds to pause before triggering the callback.
1519
*/
16-
void ConfirmMessage(QString* text = nullptr, int msec = 0);
20+
void ConfirmMessage(QString* text, std::chrono::milliseconds msec);
1721

1822
#endif // BITCOIN_QT_TEST_UTIL_H

src/qt/test/wallettests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <qt/recentrequeststablemodel.h>
2727
#include <qt/receiverequestdialog.h>
2828

29+
#include <chrono>
2930
#include <memory>
3031

3132
#include <QAbstractButton>
@@ -112,7 +113,7 @@ void BumpFee(TransactionView& view, const uint256& txid, bool expectDisabled, st
112113
if (expectError.empty()) {
113114
ConfirmSend(&text, cancel);
114115
} else {
115-
ConfirmMessage(&text);
116+
ConfirmMessage(&text, 0ms);
116117
}
117118
action->trigger();
118119
QVERIFY(text.indexOf(QString::fromStdString(expectError)) != -1);

0 commit comments

Comments
 (0)