mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-20 03:39:48 +02:00
Merge bitcoin-core/gui#517: refactor, qt: Use std::chrono for parameters of QTimer methods
51250b0906refactor, qt: Use std::chrono for input_filter_delay constant (Hennadii Stepanov)f3bdc143b6refactor, qt: Add SHUTDOWN_POLLING_DELAY constant (Hennadii Stepanov)0e193deb52refactor, qt: Use std::chrono for non-zero arguments in QTimer methods (Hennadii Stepanov)6f0da95811refactor, qt: Use std::chrono in ConfirmMessage parameter (Hennadii Stepanov)33d520ac53refactor, qt: Use std::chrono for MODEL_UPDATE_DELAY constant (Hennadii Stepanov) Pull request description: Since Qt 5.8 `QTimer` methods have overloads that accept `std::chrono::milliseconds` arguments: - [`QTimer::singleShot`](https://doc.qt.io/archives/qt-5.9/qtimer.html#singleShot-8) - [`QTimer::start`](https://doc.qt.io/archives/qt-5.9/qtimer.html#start-2) ACKs for top commit: promag: Code review ACK51250b0906. shaavan: reACK51250b0906Tree-SHA512: aa843bb2322a84c0c2bb113d3b48d7bf02d7f09a770779dcde312c32887f973ef9445cdef42f39edaa599ff0f3d0457454f6153aa130efadd989e413d39c6062
This commit is contained in:
@@ -41,6 +41,7 @@
|
||||
#endif // ENABLE_WALLET
|
||||
|
||||
#include <boost/signals2/connection.hpp>
|
||||
#include <chrono>
|
||||
#include <memory>
|
||||
|
||||
#include <QApplication>
|
||||
@@ -412,10 +413,10 @@ void BitcoinApplication::initializeResult(bool success, interfaces::BlockAndHead
|
||||
connect(paymentServer, &PaymentServer::message, [this](const QString& title, const QString& message, unsigned int style) {
|
||||
window->message(title, message, style);
|
||||
});
|
||||
QTimer::singleShot(100, paymentServer, &PaymentServer::uiReady);
|
||||
QTimer::singleShot(100ms, paymentServer, &PaymentServer::uiReady);
|
||||
}
|
||||
#endif
|
||||
pollShutdownTimer->start(200);
|
||||
pollShutdownTimer->start(SHUTDOWN_POLLING_DELAY);
|
||||
} else {
|
||||
Q_EMIT splashFinished(); // Make sure splash screen doesn't stick around during shutdown
|
||||
requestShutdown();
|
||||
|
||||
Reference in New Issue
Block a user