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 10:24:49 +0200 |
| commit | e092f22951d391a62871ab58abf9c397a656cf03 (patch) | |
| tree | bebc4542126fa840f2e6380c01747c1f8a062a21 /src/qt/rpcconsole.h | |
| parent | d7101a6d31966ee2009db752a6bb223f751c164f (diff) | |
| download | bitcoin-e092f22951d391a62871ab58abf9c397a656cf03.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.
Conflicts:
src/qt/addressbookpage.cpp
src/qt/peertablemodel.cpp
src/qt/receivecoinsdialog.cpp
src/qt/rpcconsole.cpp
Rebased-From: d29ec6c2301e593d577126d1ca85b93307b32bf1
Github-Pull: #6433
Diffstat (limited to 'src/qt/rpcconsole.h')
| -rw-r--r-- | src/qt/rpcconsole.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h index 8737be35d1..e93a61e9b4 100644 --- a/src/qt/rpcconsole.h +++ b/src/qt/rpcconsole.h @@ -45,7 +45,7 @@ protected: virtual bool eventFilter(QObject* obj, QEvent *event); void keyPressEvent(QKeyEvent *); -private slots: +private Q_SLOTS: void on_lineEdit_returnPressed(); void on_tabWidget_currentChanged(int index); /** open the debug.log from the current datadir */ @@ -58,7 +58,7 @@ private slots: void showEvent(QShowEvent *event); void hideEvent(QHideEvent *event); -public slots: +public Q_SLOTS: void clear(); void message(int category, const QString &message, bool html = false); /** Set number of connections shown in the UI */ @@ -74,7 +74,7 @@ public slots: /** Handle updated peer information */ void peerLayoutChanged(); -signals: +Q_SIGNALS: // For RPC command executor void stopExecutor(); void cmdRequest(const QString &command); |