Skip to content

Commit 91aced7

Browse files
committed
gui: Remove unused interfaces::Node references
Remove Node references no longer needed after previous commit
1 parent e133631 commit 91aced7

File tree

8 files changed

+11
-15
lines changed

8 files changed

+11
-15
lines changed

src/qt/bitcoin.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ int GuiMain(int argc, char* argv[])
490490
// Show help message immediately after parsing command-line options (for "-lang") and setting locale,
491491
// but before showing splash screen.
492492
if (HelpRequested(gArgs) || gArgs.IsArgSet("-version")) {
493-
HelpMessageDialog help(*node, nullptr, gArgs.IsArgSet("-version"));
493+
HelpMessageDialog help(nullptr, gArgs.IsArgSet("-version"));
494494
help.showOrPrint();
495495
return EXIT_SUCCESS;
496496
}
@@ -500,7 +500,7 @@ int GuiMain(int argc, char* argv[])
500500
bool did_show_intro = false;
501501
bool prune = false; // Intro dialog prune check box
502502
// Gracefully exit if the user cancels
503-
if (!Intro::showIfNeeded(*node, did_show_intro, prune)) return EXIT_SUCCESS;
503+
if (!Intro::showIfNeeded(did_show_intro, prune)) return EXIT_SUCCESS;
504504

505505
/// 6. Determine availability of data directory and parse bitcoin.conf
506506
/// - Do not call GetDataDir(true) before this step finishes
@@ -533,7 +533,7 @@ int GuiMain(int argc, char* argv[])
533533
}
534534
#ifdef ENABLE_WALLET
535535
// Parse URIs on command line -- this can affect Params()
536-
PaymentServer::ipcParseCommandLine(*node, argc, argv);
536+
PaymentServer::ipcParseCommandLine(argc, argv);
537537
#endif
538538
if (!gArgs.InitSettings(error)) {
539539
InitError(Untranslated(error));

src/qt/bitcoingui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
9595
updateWindowTitle();
9696

9797
rpcConsole = new RPCConsole(node, _platformStyle, nullptr);
98-
helpMessageDialog = new HelpMessageDialog(node, this, false);
98+
helpMessageDialog = new HelpMessageDialog(this, false);
9999
#ifdef ENABLE_WALLET
100100
if(enableWallet)
101101
{
@@ -821,7 +821,7 @@ void BitcoinGUI::aboutClicked()
821821
if(!clientModel)
822822
return;
823823

824-
HelpMessageDialog dlg(m_node, this, true);
824+
HelpMessageDialog dlg(this, true);
825825
dlg.exec();
826826
}
827827

src/qt/intro.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ void Intro::setDataDirectory(const QString &dataDir)
182182
}
183183
}
184184

185-
bool Intro::showIfNeeded(interfaces::Node& node, bool& did_show_intro, bool& prune)
185+
bool Intro::showIfNeeded(bool& did_show_intro, bool& prune)
186186
{
187187
did_show_intro = false;
188188

src/qt/intro.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class Intro : public QDialog
4747
* @note do NOT call global GetDataDir() before calling this function, this
4848
* will cause the wrong path to be cached.
4949
*/
50-
static bool showIfNeeded(interfaces::Node& node, bool& did_show_intro, bool& prune);
50+
static bool showIfNeeded(bool& did_show_intro, bool& prune);
5151

5252
Q_SIGNALS:
5353
void requestCheck();

src/qt/paymentserver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static QSet<QString> savedPaymentRequests;
7474
// Warning: ipcSendCommandLine() is called early in init,
7575
// so don't use "Q_EMIT message()", but "QMessageBox::"!
7676
//
77-
void PaymentServer::ipcParseCommandLine(interfaces::Node& node, int argc, char* argv[])
77+
void PaymentServer::ipcParseCommandLine(int argc, char* argv[])
7878
{
7979
for (int i = 1; i < argc; i++)
8080
{

src/qt/paymentserver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class PaymentServer : public QObject
6161
public:
6262
// Parse URIs on command line
6363
// Returns false on error
64-
static void ipcParseCommandLine(interfaces::Node& node, int argc, char *argv[]);
64+
static void ipcParseCommandLine(int argc, char *argv[]);
6565

6666
// Returns true if there were URIs on the command line
6767
// which were successfully sent to an already-running

src/qt/utilitydialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <QVBoxLayout>
2929

3030
/** "Help message" or "About" dialog box */
31-
HelpMessageDialog::HelpMessageDialog(interfaces::Node& node, QWidget *parent, bool about) :
31+
HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
3232
QDialog(parent),
3333
ui(new Ui::HelpMessageDialog)
3434
{

src/qt/utilitydialog.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ QT_BEGIN_NAMESPACE
1212
class QMainWindow;
1313
QT_END_NAMESPACE
1414

15-
namespace interfaces {
16-
class Node;
17-
}
18-
1915
namespace Ui {
2016
class HelpMessageDialog;
2117
}
@@ -26,7 +22,7 @@ class HelpMessageDialog : public QDialog
2622
Q_OBJECT
2723

2824
public:
29-
explicit HelpMessageDialog(interfaces::Node& node, QWidget *parent, bool about);
25+
explicit HelpMessageDialog(QWidget *parent, bool about);
3026
~HelpMessageDialog();
3127

3228
void printToConsole();

0 commit comments

Comments
 (0)