Merge #10098: Make qt wallet test compatible with qt4
e9a6461
Make qt wallet test compatible with qt4 (Russell Yanofsky)
Tree-SHA512: a3e4598986cb3c5c20aaa1d440abc886d84fcc69a6ee4079787cfc8e3a2dce655060ff95612cb15ce8b5a9b8911e4afe2281345b59a4353ec32edf3771338381
This commit is contained in:
commit
2b477e6aa1
3 changed files with 37 additions and 5 deletions
|
@ -122,6 +122,7 @@ QT_MOC_CPP = \
|
|||
qt/moc_bitcoinamountfield.cpp \
|
||||
qt/moc_bitcoingui.cpp \
|
||||
qt/moc_bitcoinunits.cpp \
|
||||
qt/moc_callback.cpp \
|
||||
qt/moc_clientmodel.cpp \
|
||||
qt/moc_coincontroldialog.cpp \
|
||||
qt/moc_coincontroltreewidget.cpp \
|
||||
|
@ -167,6 +168,7 @@ BITCOIN_MM = \
|
|||
QT_MOC = \
|
||||
qt/bitcoin.moc \
|
||||
qt/bitcoinamountfield.moc \
|
||||
qt/callback.moc \
|
||||
qt/intro.moc \
|
||||
qt/overviewpage.moc \
|
||||
qt/rpcconsole.moc
|
||||
|
@ -189,6 +191,7 @@ BITCOIN_QT_H = \
|
|||
qt/bitcoinamountfield.h \
|
||||
qt/bitcoingui.h \
|
||||
qt/bitcoinunits.h \
|
||||
qt/callback.h \
|
||||
qt/clientmodel.h \
|
||||
qt/coincontroldialog.h \
|
||||
qt/coincontroltreewidget.h \
|
||||
|
|
30
src/qt/callback.h
Normal file
30
src/qt/callback.h
Normal file
|
@ -0,0 +1,30 @@
|
|||
#ifndef BITCOIN_QT_CALLBACK_H
|
||||
#define BITCOIN_QT_CALLBACK_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
class Callback : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public Q_SLOTS:
|
||||
virtual void call() = 0;
|
||||
};
|
||||
|
||||
template <typename F>
|
||||
class FunctionCallback : public Callback
|
||||
{
|
||||
F f;
|
||||
|
||||
public:
|
||||
FunctionCallback(F f_) : f(std::move(f_)) {}
|
||||
~FunctionCallback() override {}
|
||||
void call() override { f(this); }
|
||||
};
|
||||
|
||||
template <typename F>
|
||||
FunctionCallback<F>* makeCallback(F f)
|
||||
{
|
||||
return new FunctionCallback<F>(std::move(f));
|
||||
}
|
||||
|
||||
#endif // BITCOIN_QT_CALLBACK_H
|
|
@ -1,6 +1,7 @@
|
|||
#include "wallettests.h"
|
||||
|
||||
#include "qt/bitcoinamountfield.h"
|
||||
#include "qt/callback.h"
|
||||
#include "qt/optionsmodel.h"
|
||||
#include "qt/platformstyle.h"
|
||||
#include "qt/qvalidatedlineedit.h"
|
||||
|
@ -22,9 +23,7 @@ namespace
|
|||
//! Press "Yes" button in modal send confirmation dialog.
|
||||
void ConfirmSend()
|
||||
{
|
||||
QTimer* timer = new QTimer;
|
||||
timer->setSingleShot(true);
|
||||
QObject::connect(timer, &QTimer::timeout, []() {
|
||||
QTimer::singleShot(0, makeCallback([](Callback* callback) {
|
||||
for (QWidget* widget : QApplication::topLevelWidgets()) {
|
||||
if (widget->inherits("SendConfirmationDialog")) {
|
||||
SendConfirmationDialog* dialog = qobject_cast<SendConfirmationDialog*>(widget);
|
||||
|
@ -33,8 +32,8 @@ void ConfirmSend()
|
|||
button->click();
|
||||
}
|
||||
}
|
||||
});
|
||||
timer->start(0);
|
||||
delete callback;
|
||||
}), SLOT(call()));
|
||||
}
|
||||
|
||||
//! Send coins to address and return txid.
|
||||
|
|
Loading…
Reference in a new issue