From db7790570355f12e2c39a559b35f9ec9e0330efb Mon Sep 17 00:00:00 2001
From: Odysseas Gabrielides <odysseas.gabrielides@gmail.com>
Date: Tue, 26 Oct 2021 21:22:54 +0300
Subject: [PATCH] Merge #14527: qa: Revert "Make qt wallet test compatible with
 qt4" (#4547)

fadffae17f31507a3d79a7b7f1cef71660767e0d Revert "Make qt wallet test compatible with qt4" (MarcoFalke)

Pull request description:

  This removes the file added in #10098

Tree-SHA512: 4aa887ec02aec943f3d74f469c935acf57e43ddbea6f979bb37d3a14670571fa2276cf578e8978de92b5854d8b462f24e5e0addfb27b92fbedf90726eb5d985e

Co-authored-by: Wladimir J. van der Laan <laanwj@gmail.com>
---
 src/Makefile.qt.include          |  3 ---
 src/qt/callback.h                | 30 ------------------------------
 src/qt/test/addressbooktests.cpp |  3 +--
 src/qt/test/util.cpp             | 11 ++++-------
 src/qt/test/wallettests.cpp      |  6 ++----
 5 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 src/qt/callback.h

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 6464055d14..21456e11c3 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -62,7 +62,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 \
@@ -112,7 +111,6 @@ BITCOIN_MM = \
 
 QT_MOC = \
   qt/bitcoinamountfield.moc \
-  qt/callback.moc \
   qt/intro.moc \
   qt/overviewpage.moc \
   qt/rpcconsole.moc
@@ -142,7 +140,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
deleted file mode 100644
index da6b0c4c2e..0000000000
--- a/src/qt/callback.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#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:
-    explicit 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
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp
index 9ce13fdbdc..00045b9e37 100644
--- a/src/qt/test/addressbooktests.cpp
+++ b/src/qt/test/addressbooktests.cpp
@@ -7,14 +7,13 @@
 #include <qt/addressbookpage.h>
 #include <qt/addresstablemodel.h>
 #include <qt/editaddressdialog.h>
-#include <qt/callback.h>
 #include <qt/optionsmodel.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
index 0bd719326e..ae2fb93bf7 100644
--- a/src/qt/test/util.cpp
+++ b/src/qt/test/util.cpp
@@ -1,15 +1,13 @@
-#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);
@@ -17,6 +15,5 @@ void ConfirmMessage(QString* text, int msec)
                 messageBox->defaultButton()->click();
             }
         }
-        delete callback;
-    }), &Callback::call);
+    });
 }
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
index 5be25560fb..48c0bb0222 100644
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -6,7 +6,6 @@
 #include <interfaces/node.h>
 #include <base58.h>
 #include <qt/bitcoinamountfield.h>
-#include <qt/callback.h>
 #include <qt/clientmodel.h>
 #include <qt/optionsmodel.h>
 #include <qt/qvalidatedlineedit.h>
@@ -42,7 +41,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);
@@ -52,8 +51,7 @@ void ConfirmSend(QString* text = nullptr, bool cancel = false)
                 button->click();
             }
         }
-        delete callback;
-    }), &Callback::call);
+    });
 }
 
 //! Send coins to address and return txid.