gui: Remove unused interfaces::Node references

Remove Node references no longer needed after previous commit
bitcoin-core · Jul 14, 2020 · 9139f5b · 9139f5b
1 parent 551c508
commit 9139f5b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 15 deletions.
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -486,7 +486,7 @@ int GuiMain(int argc, char* argv[])
  // 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;
  }
@@ -496,7 +496,7 @@ int GuiMain(int argc, char* argv[])
  bool did_show_intro = false;
  bool prune = false; // Intro dialog prune check box
  // Gracefully exit if the user cancels
- if (!Intro::showIfNeeded(*node, did_show_intro, prune)) return EXIT_SUCCESS;
+ if (!Intro::showIfNeeded(did_show_intro, prune)) return EXIT_SUCCESS;
 
  /// 6. Determine availability of data directory and parse bitcoin.conf
  /// - Do not call GetDataDir(true) before this step finishes
@@ -529,7 +529,7 @@ int GuiMain(int argc, char* argv[])
  }
 #ifdef ENABLE_WALLET
  // Parse URIs on command line -- this can affect Params()
- PaymentServer::ipcParseCommandLine(*node, argc, argv);
+ PaymentServer::ipcParseCommandLine(argc, argv);
 #endif
 
  QScopedPointer<const NetworkStyle> networkStyle(NetworkStyle::instantiate(Params().NetworkIDString()));

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -95,7 +95,7 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
  updateWindowTitle();
 
  rpcConsole = new RPCConsole(node, _platformStyle, nullptr);
- helpMessageDialog = new HelpMessageDialog(node, this, false);
+ helpMessageDialog = new HelpMessageDialog(this, false);
 #ifdef ENABLE_WALLET
  if(enableWallet)
  {
@@ -821,7 +821,7 @@ void BitcoinGUI::aboutClicked()
  if(!clientModel)
  return;
 
- HelpMessageDialog dlg(m_node, this, true);
+ HelpMessageDialog dlg(this, true);
  dlg.exec();
 }
 

diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
@@ -182,7 +182,7 @@ void Intro::setDataDirectory(const QString &dataDir)
  }
 }
 
-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;
 

diff --git a/src/qt/intro.h b/src/qt/intro.h
@@ -47,7 +47,7 @@ class Intro : public QDialog
  * @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);
 
 Q_SIGNALS:
  void requestCheck();

diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
@@ -74,7 +74,7 @@ static QSet<QString> savedPaymentRequests;
 // 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[])
 {
  for (int i = 1; i < argc; i++)
  {

diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h
@@ -61,7 +61,7 @@ class PaymentServer : public QObject
 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

diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
@@ -28,7 +28,7 @@
 #include <QVBoxLayout>
 
 /** "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)
 {

diff --git a/src/qt/utilitydialog.h b/src/qt/utilitydialog.h
@@ -12,10 +12,6 @@ QT_BEGIN_NAMESPACE
 class QMainWindow;
 QT_END_NAMESPACE
 
-namespace interfaces {
- class Node;
-}
-
 namespace Ui {
  class HelpMessageDialog;
 }
@@ -26,7 +22,7 @@ class HelpMessageDialog : public QDialog
  Q_OBJECT
 
 public:
- explicit HelpMessageDialog(interfaces::Node& node, QWidget *parent, bool about);
+ explicit HelpMessageDialog(QWidget *parent, bool about);
  ~HelpMessageDialog();
 
  void printToConsole();