diff options
| author | Wladimir J. van der Laan <[email protected]> | 2018-07-04 15:26:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2018-07-04 15:34:03 +0200 |
| commit | 79e677950b32f31f06f4a72aeb59997bbeae152c (patch) | |
| tree | 0116ed5bc15c7ac65ef0eb62f1cac6d8b558df82 /src/qt | |
| parent | Merge #13592: Docs: Modify policy to not translate command-line help (diff) | |
| parent | Break circular dependency: init -> * -> init by extracting shutdown.h (diff) | |
| download | discoin-79e677950b32f31f06f4a72aeb59997bbeae152c.tar.xz discoin-79e677950b32f31f06f4a72aeb59997bbeae152c.zip | |
Merge #13235: Break circular dependency: init -> * -> init by extracting shutdown.h
1fabd59e7 Break circular dependency: init -> * -> init by extracting shutdown.h (Ben Woosley)
e62fdfeea Drop unused init.h includes (Ben Woosley)
Pull request description:
Most includers just wanted to react to pending shutdown.
This isolates access to `fRequestShutdown` and limits access to the shutdown api functions, including the new `CancelShutdown` for setting it to `false`.
Tree-SHA512: df42f75dfbba163576710e9a67cf1228531fd99d70a2f187bfba0bcc476d6749cf88180a97e66a81bb5b6c3c7f0917de7402d26039ba7b644cb7509b02f7e267
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoin.cpp | 1 | ||||
| -rw-r--r-- | src/qt/bitcoingui.cpp | 1 | ||||
| -rw-r--r-- | src/qt/bitcoingui.h | 2 | ||||
| -rw-r--r-- | src/qt/signverifymessagedialog.cpp | 1 | ||||
| -rw-r--r-- | src/qt/splashscreen.cpp | 1 | ||||
| -rw-r--r-- | src/qt/winshutdownmonitor.cpp | 2 |
6 files changed, 2 insertions, 6 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index e3d1c746b..3454d3421 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -26,7 +26,6 @@ #include <qt/walletmodel.h> #endif -#include <init.h> #include <interfaces/handler.h> #include <interfaces/node.h> #include <rpc/server.h> diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index df7865237..2438361a5 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -29,7 +29,6 @@ #endif #include <chainparams.h> -#include <init.h> #include <interfaces/handler.h> #include <interfaces/node.h> #include <ui_interface.h> diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 964e04f84..4deeb325b 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -257,7 +257,7 @@ private Q_SLOTS: /** Simply calls showNormalIfMinimized(true) for use in SLOT() macro */ void toggleHidden(); - /** called by a timer to check if fRequestShutdown has been set **/ + /** called by a timer to check if ShutdownRequested() has been set **/ void detectShutdown(); /** Show progress dialog e.g. for verifychain */ diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp index c8e694e65..223b39dc8 100644 --- a/src/qt/signverifymessagedialog.cpp +++ b/src/qt/signverifymessagedialog.cpp @@ -10,7 +10,6 @@ #include <qt/platformstyle.h> #include <qt/walletmodel.h> -#include <init.h> #include <key_io.h> #include <validation.h> // For strMessageMagic #include <wallet/wallet.h> diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 4d972b431..831ef68ca 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -11,7 +11,6 @@ #include <qt/networkstyle.h> #include <clientversion.h> -#include <init.h> #include <interfaces/handler.h> #include <interfaces/node.h> #include <interfaces/wallet.h> diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp index 6190a7459..122d6f0b1 100644 --- a/src/qt/winshutdownmonitor.cpp +++ b/src/qt/winshutdownmonitor.cpp @@ -5,7 +5,7 @@ #include <qt/winshutdownmonitor.h> #if defined(Q_OS_WIN) -#include <init.h> +#include <shutdown.h> #include <util.h> #include <windows.h> |