qt: define QT_NO_KEYWORDS #6433
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
code-review ACK. |
Member
|
Quick glance utACK. Nice fix. IMO it's more readable this way anyway, since it makes it more obvious to the casual reader that signals/slots are just sugary macros and not some c++ functionality they're not aware of. |
Member
|
utACK |
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 bitcoin#6421.
laanwj
force-pushed
the
2015_07_qt_no_keywords
branch
from
27fc6c7 to
d29ec6c
Compare
Member
Author
|
Fixed some unmeant changes of emit in sentences to Q_EMIT in comments (but left the ones where it makes sense) |
laanwj
added a commit
that referenced
this pull request
Jul 15, 2015
d29ec6c qt: define QT_NO_KEYWORDS (Wladimir J. van der Laan)
Member
Author
|
Should be fairly risk-free to do in older major releases as well in case we want to backport #6421 |
Member
Author
|
Cherry-picked to 0.11 as e092f22 |
laanwj
added a commit
that referenced
this pull request
Jul 15, 2015
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: d29ec6c Github-Pull: #6433
laanwj
added a commit
that referenced
this pull request
Jul 15, 2015
maflcko
pushed a commit
to maflcko/bitcoin-core
that referenced
this pull request
Mar 26, 2016
furszy
added a commit
to PIVX-Project/PIVX
that referenced
this pull request
Jan 30, 2020
3c7ec95 [Qt] Define QT_NO_KEYWORDS (Fuzzbawls) Pull request description: QT_NO_KEYWORDS prevents Qt from defining the `foreach`, `signals`, `slots` and `emit` macros. This avoids overlap between Qt macros and boost, and enforces the standard. Marked as [WIP] for the time being so as to not merge and create conflicts with existing open PRs. Can still be reviewed however. Ported mostly from bitcoin#6433 ACKs for top commit: random-zebra: ACK 3c7ec95 furszy: utACK 3c7ec95 Tree-SHA512: 867498a1774ad0d3b1b987e82c5023bead62b2669af8f4343903651e49eab204f3444cbfbc1f9ce54d70546d3d7ea128705d8d46470a8a7bbe01ac82f76cefa9
wqking
pushed a commit
to wqking-temp/Vitae
that referenced
this pull request
Jul 29, 2020
3c7ec95db569fff8c5933632fce5f7e24f4c29ed [Qt] Define QT_NO_KEYWORDS (Fuzzbawls) Pull request description: QT_NO_KEYWORDS prevents Qt from defining the `foreach`, `signals`, `slots` and `emit` macros. This avoids overlap between Qt macros and boost, and enforces the standard. Marked as [WIP] for the time being so as to not merge and create conflicts with existing open PRs. Can still be reviewed however. Ported mostly from bitcoin/bitcoin#6433 ACKs for top commit: random-zebra: ACK 3c7ec95db569fff8c5933632fce5f7e24f4c29ed furszy: utACK 3c7ec95 Tree-SHA512: 867498a1774ad0d3b1b987e82c5023bead62b2669af8f4343903651e49eab204f3444cbfbc1f9ce54d70546d3d7ea128705d8d46470a8a7bbe01ac82f76cefa9 # Conflicts: # src/qt/clientmodel.cpp # src/qt/paymentserver.cpp # src/qt/rpcconsole.cpp # src/qt/transactiondesc.cpp # src/qt/vitae/masternodeswidget.h # src/qt/vitae/masternodewizarddialog.h # src/qt/vitae/mnmodel.cpp # src/qt/vitae/mnrow.h # src/qt/vitae/send.cpp # src/qt/vitae/send.h # src/qt/vitae/settings/settingswalletrepairwidget.cpp # src/qt/vitae/topbar.cpp # src/qt/walletmodel.cpp
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
QT_NO_KEYWORDS prevents Qt from defining the
foreach,signals,slotsandemitmacros.Avoid overlap between Qt macros and boost - for example #undef hackiness in #6421.
The drawback is that all uses of the macros have to be replace by Q_xxx, but at least this is easy to review.
Cc: @sipa @theuni