highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 06:28:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

gui: Drop ShutdownWindow dependency to BitcoinGUI

Browse Source
This commit is contained in:
João Barbosa
2020-01-31 00:50:23 +00:00
parent 61eb058cc1
commit 3aee10b80b
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/utilitydialog.cpp
View File

@@ -10,8 +10,6 @@
#include <qt/forms/ui_helpmessagedialog.h> #include <qt/forms/ui_helpmessagedialog.h>
#include <qt/bitcoingui.h>
#include <clientversion.h> #include <clientversion.h>
#include <init.h> #include <init.h>
#include <util/system.h> #include <util/system.h>
@@ -21,9 +19,10 @@
#include <QCloseEvent> #include <QCloseEvent>
#include <QLabel> #include <QLabel>
#include <QMainWindow>
#include <QRegExp> #include <QRegExp>
#include <QTextTable>
#include <QTextCursor> #include <QTextCursor>
#include <QTextTable>
#include <QVBoxLayout> #include <QVBoxLayout>
/** "Help message" or "About" dialog box */ /** "Help message" or "About" dialog box */
@@ -144,10 +143,9 @@ ShutdownWindow::ShutdownWindow(QWidget *parent, Qt::WindowFlags f):
setLayout(layout); setLayout(layout);
} }
QWidget *ShutdownWindow::showShutdownWindow(BitcoinGUI *window) QWidget* ShutdownWindow::showShutdownWindow(QMainWindow* window)
{ {
if (!window) assert(window != nullptr);
return nullptr;
// Show a simple window indicating shutdown status // Show a simple window indicating shutdown status
QWidget *shutdownWindow = new ShutdownWindow(); QWidget *shutdownWindow = new ShutdownWindow();

8
src/qt/utilitydialog.h
View File

@@ -6,9 +6,11 @@
#define BITCOIN_QT_UTILITYDIALOG_H #define BITCOIN_QT_UTILITYDIALOG_H
#include <QDialog> #include <QDialog>
#include <QObject> #include <QWidget>
class BitcoinGUI; QT_BEGIN_NAMESPACE
class QMainWindow;
QT_END_NAMESPACE
namespace interfaces { namespace interfaces {
class Node; class Node;
@@ -46,7 +48,7 @@ class ShutdownWindow : public QWidget
public: public:
explicit ShutdownWindow(QWidget *parent=nullptr, Qt::WindowFlags f=Qt::Widget); explicit ShutdownWindow(QWidget *parent=nullptr, Qt::WindowFlags f=Qt::Widget);
static QWidget *showShutdownWindow(BitcoinGUI *window); static QWidget* showShutdownWindow(QMainWindow* window);
protected: protected:
void closeEvent(QCloseEvent *event); void closeEvent(QCloseEvent *event);

1
test/lint/lint-circular-dependencies.sh
View File

@@ -13,7 +13,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"index/txindex -> validation -> index/txindex" "index/txindex -> validation -> index/txindex"
"policy/fees -> txmempool -> policy/fees" "policy/fees -> txmempool -> policy/fees"
"qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel" "qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel"
"qt/bitcoingui -> qt/utilitydialog -> qt/bitcoingui"
"qt/bitcoingui -> qt/walletframe -> qt/bitcoingui" "qt/bitcoingui -> qt/walletframe -> qt/bitcoingui"
"qt/bitcoingui -> qt/walletview -> qt/bitcoingui" "qt/bitcoingui -> qt/walletview -> qt/bitcoingui"
"qt/clientmodel -> qt/peertablemodel -> qt/clientmodel" "qt/clientmodel -> qt/peertablemodel -> qt/clientmodel"