Qt6: QTextStream compatibility #120
Merged
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
This provides compatibility with the removal of the global ::endl for use with QTextStream; Qt6 requires Qt::endl. It also includes Qt6 specific changes necessary to deal with the replacement of QTextCodec by QStringConverter and the slight changes to the default setup of QTextStream (to UTF-8 with auto-detect of UTF-16). Signed-off-by: John Bowler <[email protected]>
Should be constexpr Signed-off-by: John Bowler <[email protected]>
mrbean-bremen
approved these changes
Oct 5, 2023
usiems
reviewed
Oct 6, 2023
| # if QT_VERSION < QT_VERSION_CHECK(6,0,0) | ||
| stream.setCodec(QTextCodec::codecForName("UTF-8")); | ||
| /* Note required in Qt6: see the same call in asttoxml.cpp */ | ||
| # endif | ||
| QByteArray contents = stream.readAll().toUtf8(); |
There was a problem hiding this comment.
Why is a QTextStream used here anyway, if the read content is converted back to UTF-8 immediately?
It seems to me the content of the file could be read without the intermediate decoding/encoding step.
There was a problem hiding this comment.
Maybe to remove the BOM which would probably mess up the resultant byte array? It also handles UTF-16 correctly in Qt6.
| * is almost certainly the correct behavior because the BOM isn't valid in | ||
| * a text stream otherwise. | ||
| */ | ||
| #endif | ||
| QByteArray contents = stream.readAll().toUtf8(); |
mrbean-bremen
pushed a commit
to mrbean-bremen/pythonqt
that referenced
this pull request
Oct 29, 2023
- provides compatibility with the removal of the global ::endl for use with QTextStream; Qt6 requires Qt::endl - includes Qt6 specific changes necessary to deal with the replacement of QTextCodec by QStringConverter and the slight changes to the default setup of QTextStream (to UTF-8 with auto-detect of UTF-16) --------- Signed-off-by: John Bowler <[email protected]>
mrbean-bremen
pushed a commit
that referenced
this pull request
Oct 29, 2023
- provides compatibility with the removal of the global ::endl for use with QTextStream; Qt6 requires Qt::endl - includes Qt6 specific changes necessary to deal with the replacement of QTextCodec by QStringConverter and the slight changes to the default setup of QTextStream (to UTF-8 with auto-detect of UTF-16) --------- Signed-off-by: John Bowler <[email protected]>
mrbean-bremen
pushed a commit
that referenced
this pull request
Nov 1, 2023
- provides compatibility with the removal of the global ::endl for use with QTextStream; Qt6 requires Qt::endl - includes Qt6 specific changes necessary to deal with the replacement of QTextCodec by QStringConverter and the slight changes to the default setup of QTextStream (to UTF-8 with auto-detect of UTF-16) --------- Signed-off-by: John Bowler <[email protected]>
mrbean-bremen
pushed a commit
that referenced
this pull request
Nov 2, 2023
- provides compatibility with the removal of the global ::endl for use with QTextStream; Qt6 requires Qt::endl - includes Qt6 specific changes necessary to deal with the replacement of QTextCodec by QStringConverter and the slight changes to the default setup of QTextStream (to UTF-8 with auto-detect of UTF-16) --------- Signed-off-by: John Bowler <[email protected]>
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.
This provides compatibility with the removal of the global ::endl for use with QTextStream; Qt6 requires Qt::endl.
It also includes Qt6 specific changes necessary to deal with the replacement of QTextCodec by QStringConverter and the slight changes to the default setup of QTextStream (to UTF-8 with auto-detect of UTF-16).