diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-21 10:54:43 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-21 11:30:13 +0200 |
| commit | af4fa72fac092480a2ae6cdd608e0b982c80f592 (patch) | |
| tree | cd704fc12c8131d8a378ec53a5b4e616b492c849 /src/qt/bitcoingui.h | |
| parent | 8aa9badf5ea3ea98980f50d924e88e46c4d5ee38 (diff) | |
| parent | 3567b247f43decb6fc102d5b0989d1746fce0441 (diff) | |
Merge #13529: Use new Qt5 connect syntax
3567b247f43decb6fc102d5b0989d1746fce0441 test: Add lint to prevent SIGNAL/SLOT connect style (João Barbosa)
f78558f1e39198779bdb17e2b0e256fb99ad4b28 qt: Use new Qt5 connect syntax (João Barbosa)
Pull request description:
Pros&cons in https://wiki.qt.io/New_Signal_Slot_Syntax.
Note that connecting to/from overloaded slot/signal is ugly before qt 5.7 (see https://stackoverflow.com/a/16795664).
Tree-SHA512: ab81f035099fecd34be546f7091bc29595349f2fd0fea26f6414242702955fca27faa4fe19ebfe105c01217908b51db762cb5a9f6ce25bc5e8e6f64c77428c22
Diffstat (limited to 'src/qt/bitcoingui.h')
| -rw-r--r-- | src/qt/bitcoingui.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 3a8ef3ad8c..61cd6f76cc 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -49,6 +49,7 @@ QT_END_NAMESPACE namespace GUIUtil { class ClickableLabel; +class ClickableProgressBar; } /** @@ -101,9 +102,9 @@ private: QLabel* labelWalletHDStatusIcon = nullptr; GUIUtil::ClickableLabel* labelProxyIcon = nullptr; GUIUtil::ClickableLabel* connectionsControl = nullptr; - QLabel* labelBlocksIcon = nullptr; + GUIUtil::ClickableLabel* labelBlocksIcon = nullptr; QLabel* progressBarLabel = nullptr; - QProgressBar* progressBar = nullptr; + GUIUtil::ClickableProgressBar* progressBar = nullptr; QProgressDialog* progressDialog = nullptr; QMenuBar* appMenuBar = nullptr; @@ -227,7 +228,7 @@ private: /** Set the proxy-enabled icon as shown in the UI. */ void updateProxyIcon(); -private Q_SLOTS: +public Q_SLOTS: #ifdef ENABLE_WALLET /** Switch to overview (home) page */ void gotoOverviewPage(); @@ -262,7 +263,8 @@ private Q_SLOTS: #endif /** Show window if hidden, unminimize when minimized, rise when obscured or show if hidden and fToggleHidden is true */ - void showNormalIfMinimized(bool fToggleHidden = false); + void showNormalIfMinimized() { showNormalIfMinimized(false); } + void showNormalIfMinimized(bool fToggleHidden); /** Simply calls showNormalIfMinimized(true) for use in SLOT() macro */ void toggleHidden(); |