gui: Remove unused interfaces::Node references

Remove Node references no longer needed after previous commit
This commit is contained in:
Russell Yanofsky 2018-08-23 13:42:31 -04:00
parent e133631625
commit 91aced7c7e
8 changed files with 11 additions and 15 deletions

View File

@ -490,7 +490,7 @@ int GuiMain(int argc, char* argv[])
// Show help message immediately after parsing command-line options (for "-lang") and setting locale, // Show help message immediately after parsing command-line options (for "-lang") and setting locale,
// but before showing splash screen. // but before showing splash screen.
if (HelpRequested(gArgs) || gArgs.IsArgSet("-version")) { if (HelpRequested(gArgs) || gArgs.IsArgSet("-version")) {
HelpMessageDialog help(*node, nullptr, gArgs.IsArgSet("-version")); HelpMessageDialog help(nullptr, gArgs.IsArgSet("-version"));
help.showOrPrint(); help.showOrPrint();
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
@ -500,7 +500,7 @@ int GuiMain(int argc, char* argv[])
bool did_show_intro = false; bool did_show_intro = false;
bool prune = false; // Intro dialog prune check box bool prune = false; // Intro dialog prune check box
// Gracefully exit if the user cancels // 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 /// 6. Determine availability of data directory and parse bitcoin.conf
/// - Do not call GetDataDir(true) before this step finishes /// - Do not call GetDataDir(true) before this step finishes
@ -533,7 +533,7 @@ int GuiMain(int argc, char* argv[])
} }
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
// Parse URIs on command line -- this can affect Params() // Parse URIs on command line -- this can affect Params()
PaymentServer::ipcParseCommandLine(*node, argc, argv); PaymentServer::ipcParseCommandLine(argc, argv);
#endif #endif
if (!gArgs.InitSettings(error)) { if (!gArgs.InitSettings(error)) {
InitError(Untranslated(error)); InitError(Untranslated(error));

View File

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

View File

@ -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; did_show_intro = false;

View File

@ -47,7 +47,7 @@ public:
* @note do NOT call global GetDataDir() before calling this function, this * @note do NOT call global GetDataDir() before calling this function, this
* will cause the wrong path to be cached. * 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: Q_SIGNALS:
void requestCheck(); void requestCheck();

View File

@ -74,7 +74,7 @@ static QSet<QString> savedPaymentRequests;
// Warning: ipcSendCommandLine() is called early in init, // Warning: ipcSendCommandLine() is called early in init,
// so don't use "Q_EMIT message()", but "QMessageBox::"! // 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++) for (int i = 1; i < argc; i++)
{ {

View File

@ -61,7 +61,7 @@ class PaymentServer : public QObject
public: public:
// Parse URIs on command line // Parse URIs on command line
// Returns false on error // 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 // Returns true if there were URIs on the command line
// which were successfully sent to an already-running // which were successfully sent to an already-running

View File

@ -28,7 +28,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
/** "Help message" or "About" dialog box */ /** "Help message" or "About" dialog box */
HelpMessageDialog::HelpMessageDialog(interfaces::Node& node, QWidget *parent, bool about) : HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
QDialog(parent), QDialog(parent),
ui(new Ui::HelpMessageDialog) ui(new Ui::HelpMessageDialog)
{ {

View File

@ -12,10 +12,6 @@ QT_BEGIN_NAMESPACE
class QMainWindow; class QMainWindow;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace interfaces {
class Node;
}
namespace Ui { namespace Ui {
class HelpMessageDialog; class HelpMessageDialog;
} }
@ -26,7 +22,7 @@ class HelpMessageDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit HelpMessageDialog(interfaces::Node& node, QWidget *parent, bool about); explicit HelpMessageDialog(QWidget *parent, bool about);
~HelpMessageDialog(); ~HelpMessageDialog();
void printToConsole(); void printToConsole();