diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -620,7 +620,7 @@ // Show help message immediately after parsing command-line options (for // "-lang") and setting locale, but before showing splash screen. if (HelpRequested(gArgs) || gArgs.IsArgSet("-version")) { - HelpMessageDialog help(*node, nullptr, gArgs.IsArgSet("-version")); + HelpMessageDialog help(nullptr, gArgs.IsArgSet("-version")); help.showOrPrint(); return EXIT_SUCCESS; } @@ -631,7 +631,7 @@ // Intro dialog prune check box bool prune = false; // Gracefully exit if the user cancels - if (!Intro::showIfNeeded(*node, did_show_intro, prune)) { + if (!Intro::showIfNeeded(did_show_intro, prune)) { return EXIT_SUCCESS; } @@ -679,7 +679,7 @@ } #ifdef ENABLE_WALLET // Parse URIs on command line -- this can affect Params() - PaymentServer::ipcParseCommandLine(*node, argc, argv); + PaymentServer::ipcParseCommandLine(argc, argv); #endif if (!gArgs.InitSettings(error)) { InitError(Untranslated(error)); diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -93,7 +93,7 @@ updateWindowTitle(); rpcConsole = new RPCConsole(node, _platformStyle, nullptr); - helpMessageDialog = new HelpMessageDialog(node, this, false); + helpMessageDialog = new HelpMessageDialog(this, false); #ifdef ENABLE_WALLET if (enableWallet) { /** Create wallet frame and make it the central widget */ @@ -923,7 +923,7 @@ return; } - HelpMessageDialog dlg(m_node, this, true); + HelpMessageDialog dlg(this, true); dlg.exec(); } diff --git a/src/qt/intro.h b/src/qt/intro.h --- a/src/qt/intro.h +++ b/src/qt/intro.h @@ -48,8 +48,7 @@ * @note do NOT call global GetDataDir() before calling this function, this * will cause the wrong path to be cached. */ - static bool showIfNeeded(interfaces::Node &node, bool &did_show_intro, - bool &prune); + static bool showIfNeeded(bool &did_show_intro, bool &prune); /** * Determine default data directory for operating system. diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -186,8 +186,7 @@ return GUIUtil::boostPathToQString(GetDefaultDataDir()); } -bool Intro::showIfNeeded(interfaces::Node &node, bool &did_show_intro, - bool &prune) { +bool Intro::showIfNeeded(bool &did_show_intro, bool &prune) { did_show_intro = false; QSettings settings; diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -66,8 +66,7 @@ public: // Parse URIs on command line // Returns false on error - static void ipcParseCommandLine(interfaces::Node &node, int argc, - char *argv[]); + static void ipcParseCommandLine(int argc, char *argv[]); // Returns true if there were URIs on the command line which were // successfully sent to an already-running process. diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -116,8 +116,7 @@ // Warning: ipcSendCommandLine() is called early in init, so don't use "Q_EMIT // message()", but "QMessageBox::"! // -void PaymentServer::ipcParseCommandLine(interfaces::Node &node, int argc, - char *argv[]) { +void PaymentServer::ipcParseCommandLine(int argc, char *argv[]) { std::array networks = { {&CBaseChainParams::MAIN, &CBaseChainParams::TESTNET, &CBaseChainParams::REGTEST}}; diff --git a/src/qt/utilitydialog.h b/src/qt/utilitydialog.h --- a/src/qt/utilitydialog.h +++ b/src/qt/utilitydialog.h @@ -10,10 +10,6 @@ class BitcoinGUI; -namespace interfaces { -class Node; -} - namespace Ui { class HelpMessageDialog; } @@ -23,8 +19,7 @@ Q_OBJECT public: - explicit HelpMessageDialog(interfaces::Node &node, QWidget *parent, - bool about); + explicit HelpMessageDialog(QWidget *parent, bool about); ~HelpMessageDialog(); void printToConsole(); diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -29,8 +29,7 @@ #include /** "Help message" or "About" dialog box */ -HelpMessageDialog::HelpMessageDialog(interfaces::Node &node, QWidget *parent, - bool about) +HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : QDialog(parent), ui(new Ui::HelpMessageDialog) { ui->setupUi(this);