Replace Q_NULLPTR by nullptr #6614
Closed
Conversation
This file contains 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
The former is a compatibility macro for code not allowed to use C++11.
| @@ -5352,7 +5352,7 @@ | |||
| <define name="Q_INTERFACES(X)" value=""/> | |||
| <define name="Q_LIKELY(expr)" value="expr"/> | |||
| <define name="Q_NAMESPACE" value=""/> | |||
| <define name="Q_NULLPTR" value="NULL"/> | |||
There was a problem hiding this comment.
Why was this changed?
There was a problem hiding this comment.
It should have been removed completely, right?
There was a problem hiding this comment.
I would say leave it as it was, since we want to handle Q_NULLPTR in code that still uses it. The changes in the tests in qt.cpp should also be reverted. But then there are pretty much no functional changes left.
There was a problem hiding this comment.
Ah, I see, you want to test these old macros. Then it is better to leave everything as it is.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The former is a compatibility macro for code not allowed to use C++11.