diff options
| author | Sjors Provoost <sjors@sprovoost.nl> | 2021-05-13 15:23:19 +0200 |
|---|---|---|
| committer | Sjors Provoost <sjors@sprovoost.nl> | 2021-06-16 10:48:58 +0200 |
| commit | 4455145e266450397b45acd7286686966edd072b (patch) | |
| tree | 4829ded062fa7b872330d876cd981dddfda30a6a /src/qt | |
| parent | 5be90c907eba0a38019c7d9826623d5d5f567c66 (diff) | |
| download | bitcoin-4455145e266450397b45acd7286686966edd072b.tar.xz | |
refactor: reduce #ifdef ENABLE_EXTERNAL_SIGNER usage
In particular this make the node interface independent on whether external signer support is compiled.
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/createwalletdialog.cpp | 2 | ||||
| -rw-r--r-- | src/qt/createwalletdialog.h | 7 | ||||
| -rw-r--r-- | src/qt/walletcontroller.cpp | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/qt/createwalletdialog.cpp b/src/qt/createwalletdialog.cpp index e593697b46..cea41a94ae 100644 --- a/src/qt/createwalletdialog.cpp +++ b/src/qt/createwalletdialog.cpp @@ -112,7 +112,6 @@ CreateWalletDialog::~CreateWalletDialog() delete ui; } -#ifdef ENABLE_EXTERNAL_SIGNER void CreateWalletDialog::setSigners(std::vector<ExternalSigner>& signers) { if (!signers.empty()) { @@ -132,7 +131,6 @@ void CreateWalletDialog::setSigners(std::vector<ExternalSigner>& signers) ui->external_signer_checkbox->setEnabled(false); } } -#endif QString CreateWalletDialog::walletName() const { diff --git a/src/qt/createwalletdialog.h b/src/qt/createwalletdialog.h index 585b1461f7..3f6a32548e 100644 --- a/src/qt/createwalletdialog.h +++ b/src/qt/createwalletdialog.h @@ -7,11 +7,8 @@ #include <QDialog> -class WalletModel; - -#ifdef ENABLE_EXTERNAL_SIGNER class ExternalSigner; -#endif +class WalletModel; namespace Ui { class CreateWalletDialog; @@ -27,9 +24,7 @@ public: explicit CreateWalletDialog(QWidget* parent); virtual ~CreateWalletDialog(); -#ifdef ENABLE_EXTERNAL_SIGNER void setSigners(std::vector<ExternalSigner>& signers); -#endif QString walletName() const; bool isEncryptWalletChecked() const; diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp index 24f73a2ea0..3cceb5ca5a 100644 --- a/src/qt/walletcontroller.cpp +++ b/src/qt/walletcontroller.cpp @@ -296,7 +296,6 @@ void CreateWalletActivity::create() { m_create_wallet_dialog = new CreateWalletDialog(m_parent_widget); -#ifdef ENABLE_EXTERNAL_SIGNER std::vector<ExternalSigner> signers; try { signers = node().externalSigners(); @@ -304,7 +303,6 @@ void CreateWalletActivity::create() QMessageBox::critical(nullptr, tr("Can't list signers"), e.what()); } m_create_wallet_dialog->setSigners(signers); -#endif m_create_wallet_dialog->setWindowModality(Qt::ApplicationModal); m_create_wallet_dialog->show(); |