diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-09-07 09:20:55 -0700 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-09-07 09:21:04 -0700 |
| commit | ea729d55b4dbd17a53ced474a8457d4759cfb5a5 (patch) | |
| tree | 2efe97d55ff48f1ab18010ffa011cb369a59b07c /src/qt/splashscreen.h | |
| parent | 9c8f3655cc68f038b4739e95879ea65a1d476227 (diff) | |
| parent | ee4d1493e2a871b26201580c5a990a1df7a5e3f7 (diff) | |
| download | bitcoin-ea729d55b4dbd17a53ced474a8457d4759cfb5a5.tar.xz | |
Merge #10770: Drop upgrade-cancel callback registration for a generic "cancelable"
ee4d1493e Drop upgrade-cancel callback registration for a generic "resumeable" (Matt Corallo)
Pull request description:
Instead of passing a StartShutdown reference all the way up from
txdb, give ShowProgress a "cancelable" boolean, as StartShutdown
is pretty much always what you'll want to use to cancel. Use the
same boolean to allow cancel during initial block verification.
Tree-SHA512: 515817aaa4b9e3e856200e00be9c2d44ecfa2d4f288fe3e02116105fe85de2650c13076ee7e45396ec1ce6ab45e53b0477cddda7cfdee5b3bd0589cb81a4c346
Diffstat (limited to 'src/qt/splashscreen.h')
| -rw-r--r-- | src/qt/splashscreen.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/qt/splashscreen.h b/src/qt/splashscreen.h index a88ebb98a8..c6cfd503f7 100644 --- a/src/qt/splashscreen.h +++ b/src/qt/splashscreen.h @@ -36,8 +36,6 @@ public Q_SLOTS: /** Show message and progress */ void showMessage(const QString &message, int alignment, const QColor &color); - /** Sets the break action */ - void setBreakAction(const std::function<void(void)> &action); protected: bool eventFilter(QObject * obj, QEvent * ev); @@ -55,8 +53,6 @@ private: int curAlignment; QList<CWallet*> connectedWallets; - - std::function<void(void)> breakAction; }; #endif // BITCOIN_QT_SPLASHSCREEN_H |