-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
317098 musicxml white space master #8833
Merged
RomanPudashkin
merged 2 commits into
musescore:master
from
lvinken:317098-musicxml-white-space-master
Aug 26, 2021
Merged
317098 musicxml white space master #8833
RomanPudashkin
merged 2 commits into
musescore:master
from
lvinken:317098-musicxml-white-space-master
Aug 26, 2021
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
lvinken
force-pushed
the
317098-musicxml-white-space-master
branch
from
August 12, 2021 05:39
ecd3d00
to
00a5da5
Compare
Used "push -f" to fix failed code style check. |
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 12, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 12, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 12, 2021
musescore#8763, part 2 and one of the 2 commits of the backport of musescore#8833
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 13, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 13, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 13, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 13, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 19, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 19, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 19, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 19, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
RomanPudashkin
approved these changes
Aug 25, 2021
rebase needed |
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by ASSERT_IF_FAILED macros.
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.
lvinken
force-pushed
the
317098-musicxml-white-space-master
branch
from
August 26, 2021 18:22
00a5da5
to
bc7284b
Compare
Rebased |
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 30, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 30, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 1, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 1, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 2, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 2, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 2, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 9, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 9, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 10, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 10, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 23, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 23, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 26, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 26, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 29, 2021
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 29, 2021
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
May 12, 2022
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
May 12, 2022
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Mar 5, 2023
…orting The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync. For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash MuseScore when triggered. These assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer. Other Q_ASSERTS have been replaced by `if` statements. Backport of musescore#8833, part 1
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Mar 5, 2023
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element. This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls are replaced by QXmlStreamReader::skipCurrentElement(), which will always work. Backport of musescore#8833, part 2
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.
Resolves:
https://musescore.org/en/node/317098
https://musescore.org/en/node/317099
#317098:
The MusicXML importer (incorrectly) uses QXmlStreamReader::readNext() to skip to the end of an element.
This works correctly only if the element is emtpy, which cannot always be guaranteed. The readNext() calls
are replaced by QXmlStreamReader::skipCurrentElement(), which will always work.
#317099:
The MusicXML parser contains several assertions checking start and end elements to verify the parser is still in sync.
For end users they have no effect (resulting in incomplete import without any error), for a debug build they crash
MuseScore when triggered.
The assertions have been replaced by a dialog providing meaningful information (expected element name and type versus actual) to the end user and the developer.
Other Q_ASSERTS have been replaced by ASSERT_IF_FAILED macros.