fix #101916: undetected conflict with standard keys #2449
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
|
Looks good. Would you mind changing the 3 foreach in and around your code to a C++11 for loop and put a space between for and ( like: And then squash the commits http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html |
| break; | ||
| } | ||
| } | ||
|
|
||
| foreach(const QKeySequence& ks, ss->keys()) { |
There was a problem hiding this comment.
Also this foreach, please change it
syrma
force-pushed
the
101916-conflicts-with-standard-shortcuts
branch
from
5d58264
to
eae3b10
Compare
|
Thank you for the comment! I have updated the commit. Please tell me if there is still anything wrong. |
|
Looks good. Could you sign the CLA https://musescore.org/en/cla |
|
Done. Sorry for the delay! |
|
Thank you and welcome in MuseScore contributor community ! |
lasconic
added a commit
that referenced
this pull request
Mar 17, 2016
…ortcuts fix #101916: undetected conflict with standard keys
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.
Fix for https://musescore.org/en/node/101916 . Setting keys like Ctrl+S or Ctrl+O as shortcuts was possible despite the conflict with the standard shortcuts (save, open, ...) .