diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-14 13:59:05 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-15 07:30:23 +0200 |
| commit | d29ec6c2301e593d577126d1ca85b93307b32bf1 (patch) | |
| tree | 4e9690da4c97a9da761147c834412b3057439728 /src/qt/walletview.h | |
| parent | fd5dfda9396968346edcf1f5ddf946d63e797554 (diff) | |
| download | bitcoin-d29ec6c2301e593d577126d1ca85b93307b32bf1.tar.xz | |
qt: define QT_NO_KEYWORDS
QT_NO_KEYWORDS prevents Qt from defining the `foreach`, `signals`,
`slots` and `emit` macros.
Avoid overlap between Qt macros and boost - for example #undef hackiness
in #6421.
Diffstat (limited to 'src/qt/walletview.h')
| -rw-r--r-- | src/qt/walletview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/walletview.h b/src/qt/walletview.h index 1840e21e9c..87c5d7bfbf 100644 --- a/src/qt/walletview.h +++ b/src/qt/walletview.h @@ -65,7 +65,7 @@ private: QProgressDialog *progressDialog; -public slots: +public Q_SLOTS: /** Switch to overview (home) page */ void gotoOverviewPage(); /** Switch to history (transactions) page */ @@ -105,7 +105,7 @@ public slots: /** Show progress dialog e.g. for rescan */ void showProgress(const QString &title, int nProgress); -signals: +Q_SIGNALS: /** Signal that we want to show the main window */ void showNormalIfMinimized(); /** Fired when a message should be reported to the user */ |