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/paymentserver.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/paymentserver.h')
| -rw-r--r-- | src/qt/paymentserver.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index 32ed27983..5df0a14cf 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -98,7 +98,7 @@ public: // Verify the payment request amount is valid static bool verifyAmount(const CAmount& requestAmount); -signals: +Q_SIGNALS: // Fired when a valid payment request is received void receivedPaymentRequest(SendCoinsRecipient); @@ -108,7 +108,7 @@ signals: // Fired when a message should be reported to the user void message(const QString &title, const QString &message, unsigned int style); -public slots: +public Q_SLOTS: // Signal this when the main window's UI is ready // to display payment requests to the user void uiReady(); @@ -119,7 +119,7 @@ public slots: // Handle an incoming URI, URI with local file scheme or file void handleURIOrFile(const QString& s); -private slots: +private Q_SLOTS: void handleURIConnection(); void netRequestFinished(QNetworkReply*); void reportSslErrors(QNetworkReply*, const QList<QSslError> &); |