diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-07-14 13:59:05 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-07-15 07:30:23 +0200 |
| commit | d29ec6c2301e593d577126d1ca85b93307b32bf1 (patch) | |
| tree | 4e9690da4c97a9da761147c834412b3057439728 /src/qt/clientmodel.h | |
| parent | Merge pull request #6388 (diff) | |
| download | discoin-d29ec6c2301e593d577126d1ca85b93307b32bf1.tar.xz discoin-d29ec6c2301e593d577126d1ca85b93307b32bf1.zip | |
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/clientmodel.h')
| -rw-r--r-- | src/qt/clientmodel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index 214701810..68434f404 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -82,7 +82,7 @@ private: void subscribeToCoreSignals(); void unsubscribeFromCoreSignals(); -signals: +Q_SIGNALS: void numConnectionsChanged(int count); void numBlocksChanged(int count, const QDateTime& blockDate); void alertsChanged(const QString &warnings); @@ -94,7 +94,7 @@ signals: // Show progress dialog e.g. for verifychain void showProgress(const QString &title, int nProgress); -public slots: +public Q_SLOTS: void updateTimer(); void updateNumConnections(int numConnections); void updateAlert(const QString &hash, int status); |