Merge #14527: qa: Revert "Make qt wallet test compatible with qt4"

fadffae Revert "Make qt wallet test compatible with qt4" (MarcoFalke) Pull request description: This removes the file added in #10098 Tree-SHA512: 4aa887ec02aec943f3d74f469c935acf57e43ddbea6f979bb37d3a14670571fa2276cf578e8978de92b5854d8b462f24e5e0addfb27b92fbedf90726eb5d985e
bitcoin · Oct 20, 2018 · 96c409c · 96c409c
2 parents 6746a89 + fadffae
commit 96c409c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 46 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -122,7 +122,6 @@ 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 \
@@ -168,7 +167,6 @@ BITCOIN_MM = \
 QT_MOC = \
   qt/bitcoin.moc \
   qt/bitcoinamountfield.moc \
-  qt/callback.moc \
   qt/intro.moc \
   qt/overviewpage.moc \
   qt/rpcconsole.moc
@@ -191,7 +189,6 @@ BITCOIN_QT_H = \
   qt/bitcoinamountfield.h \
   qt/bitcoingui.h \
   qt/bitcoinunits.h \
-  qt/callback.h \
   qt/clientmodel.h \
   qt/coincontroldialog.h \
   qt/coincontroltreewidget.h \

diff --git a/src/qt/callback.h b/src/qt/callback.h
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp
@@ -6,15 +6,14 @@
 #include <qt/addressbookpage.h>
 #include <qt/addresstablemodel.h>
 #include <qt/editaddressdialog.h>
-#include <qt/callback.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/qvalidatedlineedit.h>
 #include <qt/walletmodel.h>
 
 #include <key.h>
-#include <pubkey.h>
 #include <key_io.h>
+#include <pubkey.h>
 #include <wallet/wallet.h>
 
 #include <QApplication>

diff --git a/src/qt/test/util.cpp b/src/qt/test/util.cpp
@@ -1,22 +1,19 @@
-#include <qt/callback.h>
-
 #include <QApplication>
 #include <QMessageBox>
-#include <QTimer>
-#include <QString>
 #include <QPushButton>
+#include <QString>
+#include <QTimer>
 #include <QWidget>
 
 void ConfirmMessage(QString* text, int msec)
 {
-    QTimer::singleShot(msec, makeCallback([text](Callback* callback) {
+    QTimer::singleShot(msec, [text]() {
         for (QWidget* widget : QApplication::topLevelWidgets()) {
             if (widget->inherits("QMessageBox")) {
                 QMessageBox* messageBox = qobject_cast<QMessageBox*>(widget);
                 if (text) *text = messageBox->text();
                 messageBox->defaultButton()->click();
             }
         }
-        delete callback;
-    }), &Callback::call);
+    });
 }
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
@@ -3,7 +3,6 @@
 
 #include <interfaces/node.h>
 #include <qt/bitcoinamountfield.h>
-#include <qt/callback.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/qvalidatedlineedit.h>
@@ -39,7 +38,7 @@ namespace
 //! Press "Yes" or "Cancel" buttons in modal send confirmation dialog.
 void ConfirmSend(QString* text = nullptr, bool cancel = false)
 {
-    QTimer::singleShot(0, makeCallback([text, cancel](Callback* callback) {
+    QTimer::singleShot(0, [text, cancel]() {
         for (QWidget* widget : QApplication::topLevelWidgets()) {
             if (widget->inherits("SendConfirmationDialog")) {
                 SendConfirmationDialog* dialog = qobject_cast<SendConfirmationDialog*>(widget);
@@ -49,8 +48,7 @@ void ConfirmSend(QString* text = nullptr, bool cancel = false)
                 button->click();
             }
         }
-        delete callback;
-    }), &Callback::call);
+    });
 }
 
 //! Send coins to address and return txid.