diff --git a/CMakeLists.txt b/CMakeLists.txt
index e45453f0d8..9172914c97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,8 +191,8 @@ if (BUILD_UNIT_TESTS)
message(STATUS "Enabled testing")
define_property(TARGET PROPERTY OUTPUT_XML
- BRIEF_DOCS "List XML files outputed by google test."
- FULL_DOCS "List XML files outputed by google test."
+ BRIEF_DOCS "List XML files outputted by google test."
+ FULL_DOCS "List XML files outputted by google test."
)
add_subdirectory(thirdparty/googletest)
diff --git a/Doxyfile.plugins b/Doxyfile.plugins
index 660178ac2d..6bc62aeb1a 100644
--- a/Doxyfile.plugins
+++ b/Doxyfile.plugins
@@ -278,7 +278,7 @@ OPTIMIZE_OUTPUT_VHDL = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
# Fortran. In the later case the parser tries to guess whether the code is fixed
@@ -1527,7 +1527,7 @@ EXT_LINKS_IN_WINDOW = NO
FORMULA_FONTSIZE = 10
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
# generated for formulas are transparent PNGs. Transparent PNGs are not
# supported properly for IE 6.0, but are supported on all modern browsers.
#
@@ -1539,7 +1539,7 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
+# http://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1609,7 +1609,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/build.cmake b/build.cmake
index 47793df96b..1766d3c97f 100755
--- a/build.cmake
+++ b/build.cmake
@@ -196,7 +196,7 @@ endif()
# Clean - delete an existing build directory.
#
# We usually avoid this because performing a clean build takes much longer
-# than an incremental build, but it is occassionally necessary. If you
+# than an incremental build, but it is occasionally necessary. If you
# encounter errors during a build then you should try doing a clean build.
if(ARG_CLEAN)
@@ -272,7 +272,7 @@ endif()
# The working directory is unchanged. Use build_override.cmake to set the
# CMake variable RUN_ARGS to contain a list of arguments to pass to MuseScore
# on the command line. In addition, script arguments after "run" will be
-# appened to this list, but note that certain arguments cannot be passed this
+# appended to this list, but note that certain arguments cannot be passed this
# way (e.g. --help, --version) because they cancel CMake script processing.
if(ARG_RUN)
diff --git a/build/Linux+BSD/org.musescore.MuseScore.appdata.xml.in b/build/Linux+BSD/org.musescore.MuseScore.appdata.xml.in
index 1f4a528a14..35aeb3ac21 100644
--- a/build/Linux+BSD/org.musescore.MuseScore.appdata.xml.in
+++ b/build/Linux+BSD/org.musescore.MuseScore.appdata.xml.in
@@ -325,7 +325,7 @@
Zerberus:
- - Fix #222031: remove ties and spanners when removing induvidual notes within a chord
+ - Fix #222031: remove ties and spanners when removing individual notes within a chord
- Fix #271718: clicking noise fix
- Fix #271719: sound accumulation on noteOff
- Fix #271722: long release samples do not play in their entirety
diff --git a/build/Packaging.cmake b/build/Packaging.cmake
index 362d3e8473..6c608dd01c 100644
--- a/build/Packaging.cmake
+++ b/build/Packaging.cmake
@@ -40,7 +40,7 @@ IF(MINGW OR MSVC)
SET(MSCORE_EXECUTABLE_NAME ${MUSESCORE_NAME}${MUSESCORE_VERSION_MAJOR})
# There is a bug in NSI that does not handle full unix paths properly. Make
- # sure there is at least one set of four (4) backlasshes.
+ # sure there is at least one set of four (4) backslashes.
SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/build/packaging\\\\installer_head_nsis.bmp")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\${MSCORE_EXECUTABLE_NAME}.exe,0")
SET(CPACK_NSIS_DISPLAY_NAME "${MUSESCORE_NAME} ${MUSESCORE_VERSION_FULL}")
diff --git a/build/cmake/GetUtilsFunctions.cmake b/build/cmake/GetUtilsFunctions.cmake
index 4f3e20e17c..42d5b8c20c 100644
--- a/build/cmake/GetUtilsFunctions.cmake
+++ b/build/cmake/GetUtilsFunctions.cmake
@@ -33,7 +33,7 @@ function(fn__set_default
endfunction()
# Set a variable to value of an option from a list of command line arguments.
-# The variable will only recieve a value if the relevant option was provided.
+# The variable will only receive a value if the relevant option was provided.
function(fn__get_option
VAR_NAME # Name of the variable to set.
OPT_NAME # Name of the option to search for (e.g. "-foo").
diff --git a/build/module.cmake b/build/module.cmake
index 45c2914464..66ae259d75 100644
--- a/build/module.cmake
+++ b/build/module.cmake
@@ -1,36 +1,37 @@
-#=============================================================================
-# MuseScore
-# Music Composition & Notation
+# SPDX-License-Identifier: GPL-3.0-only
+# MuseScore-CLA-applies
#
-# Copyright (C) 2020 MuseScore BVBA and others
+# MuseScore
+# Music Composition & Notation
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2.
+# Copyright (C) 2022 MuseScore BVBA and others
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#=============================================================================
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
## Setup
-# set(MODULE somename) - set module (target) name
-# set(MODULE_INCLUDE ...) - set include (by default see below include_directories)
-# set(MODULE_DEF ...) - set definitions
-# set(MODULE_SRC ...) - set sources and headers files
-# set(MODULE_LINK ...) - set libraries for link
-# set(MODULE_NOT_LINK_GLOBAL ON) - set for not link global lib
-# set(MODULE_QRC somename.qrc) - set resource (qrc) file
-# set(MODULE_BIG_QRC somename.qrc) - set big resource (qrc) file
-# set(MODULE_UI ...) - set ui headers
-# set(MODULE_QML_IMPORT ...) - set Qml import for QtCreator (so that there is code highlighting, jump, etc.)
-# set(MODULE_USE_PCH_NONE ON) - set for disable PCH for module
-# set(MODULE_USE_UNITY_NONE ON) - set for disable UNITY BUILD for module
-# set(MODULE_OVERRIDEN_PCH ...) - set additional precompiled headers required for module
+# set(MODULE somename) - set module (target) name
+# set(MODULE_INCLUDE ...) - set include (by default see below include_directories)
+# set(MODULE_DEF ...) - set definitions
+# set(MODULE_SRC ...) - set sources and headers files
+# set(MODULE_LINK ...) - set libraries for link
+# set(MODULE_NOT_LINK_GLOBAL ON) - set for not link global lib
+# set(MODULE_QRC somename.qrc) - set resource (qrc) file
+# set(MODULE_BIG_QRC somename.qrc) - set big resource (qrc) file
+# set(MODULE_UI ...) - set ui headers
+# set(MODULE_QML_IMPORT ...) - set Qml import for QtCreator (so that there is code highlighting, jump, etc.)
+# set(MODULE_USE_PCH_NONE ON) - set for disable PCH for module
+# set(MODULE_USE_UNITY_NONE ON) - set for disable UNITY BUILD for module
+# set(MODULE_OVERRIDDEN_PCH ...) - set additional precompiled headers required for module
# set(PROJECT_ROOT_DIR ${PROJECT_SOURCE_DIR}) - set root dir for module
# After all the settings you need to do:
@@ -78,11 +79,11 @@ if (BUILD_PCH)
# disabled pch for current module
else()
if (NOT ${MODULE} MATCHES global)
- if (NOT DEFINED MODULE_OVERRIDEN_PCH)
+ if (NOT DEFINED MODULE_OVERRIDDEN_PCH)
target_precompile_headers(${MODULE} REUSE_FROM global)
target_compile_definitions(${MODULE} PRIVATE global_EXPORTS=1)
else()
- target_precompile_headers(${MODULE} PRIVATE ${MODULE_OVERRIDEN_PCH})
+ target_precompile_headers(${MODULE} PRIVATE ${MODULE_OVERRIDDEN_PCH})
endif()
if (MODULE_NOT_LINK_GLOBAL)
set(MODULE_NOT_LINK_GLOBAL OFF)
diff --git a/build/packaging/NSIS.template.in b/build/packaging/NSIS.template.in
index 847ef51977..fa85baed29 100644
--- a/build/packaging/NSIS.template.in
+++ b/build/packaging/NSIS.template.in
@@ -373,7 +373,7 @@ Function un.RemoveFromPath
FunctionEnd
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
+; Uninstall stuff
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
###########################################
@@ -477,15 +477,15 @@ Done:
Exch $R1
FunctionEnd
-Function ConditionalAddToRegisty
+Function ConditionalAddToRegistry
Pop $0
Pop $1
- StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
+ StrCmp "$0" "" ConditionalAddToRegistry_EmptyString
WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" \
"$1" "$0"
;MessageBox MB_OK "Set Registry: '$1' to '$0'"
DetailPrint "Set install registry entry: '$1' to '$0'"
- ConditionalAddToRegisty_EmptyString:
+ ConditionalAddToRegistry_EmptyString:
FunctionEnd
;--------------------------------
@@ -675,44 +675,44 @@ Section "-Core installation"
WriteUninstaller "$INSTDIR\Uninstall.exe"
Push "DisplayName"
Push "@CPACK_NSIS_DISPLAY_NAME@"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
Push "DisplayVersion"
Push "@CPACK_PACKAGE_VERSION@"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
Push "Publisher"
Push "@CPACK_PACKAGE_VENDOR@"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
Push "UninstallString"
Push "$INSTDIR\Uninstall.exe"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
Push "NoRepair"
Push "1"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
!ifdef CPACK_NSIS_ADD_REMOVE
;Create add/remove functionality
Push "ModifyPath"
Push "$INSTDIR\AddRemove.exe"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
!else
Push "NoModify"
Push "1"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
!endif
; Optional registration
Push "DisplayIcon"
Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
Push "HelpLink"
Push "@CPACK_NSIS_HELP_LINK@"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
Push "URLInfoAbout"
Push "@CPACK_NSIS_URL_INFO_ABOUT@"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
Push "Contact"
Push "@CPACK_NSIS_CONTACT@"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
!insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
@@ -725,19 +725,19 @@ Section "-Core installation"
; Write special uninstall registry entries
Push "StartMenu"
Push "$STARTMENU_FOLDER"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
Push "DoNotAddToPath"
Push "$DO_NOT_ADD_TO_PATH"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
Push "AddToPathAllUsers"
Push "$ADD_TO_PATH_ALL_USERS"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
Push "AddToPathCurrentUser"
Push "$ADD_TO_PATH_CURRENT_USER"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
Push "InstallToDesktop"
Push "$INSTALL_DESKTOP"
- Call ConditionalAddToRegisty
+ Call ConditionalAddToRegistry
@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
@@ -879,7 +879,7 @@ Section "Uninstall"
@CPACK_NSIS_DELETE_ICONS@
@CPACK_NSIS_DELETE_ICONS_EXTRA@
- ;Delete empty start menu parent diretories
+ ;Delete empty start menu parent directories
StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
startMenuDeleteLoop:
@@ -892,13 +892,13 @@ Section "Uninstall"
StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
startMenuDeleteLoopDone:
- ; If the user changed the shortcut, then untinstall may not work. This should
+ ; If the user changed the shortcut, then uninstall may not work. This should
; try to fix it.
StrCpy $MUI_TEMP "$START_MENU"
Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
@CPACK_NSIS_DELETE_ICONS_EXTRA@
- ;Delete empty start menu parent diretories
+ ;Delete empty start menu parent directories
StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
secondStartMenuDeleteLoop:
diff --git a/mscore3.txt b/mscore3.txt
index 037d1d3d4a..57b416c41f 100644
--- a/mscore3.txt
+++ b/mscore3.txt
@@ -97,7 +97,7 @@ Palette handling
Lyrics
-------------------------------
- lyrics can be placed above a staff by changing the Placement property to "Above".
- Verse numbers are counted from top to bottom. If you change for example the placment
+ Verse numbers are counted from top to bottom. If you change for example the placement
of a lyric in verse 3 to Above then all lyrics in verse 1-3 are placed above, verse 4+
will stay below.
- 'x' (flip) changes the placement of a lyric.
@@ -173,7 +173,7 @@ Lyrics
TODO: check if they can be removed in system mode
* path separator
- Don't use QDir::separtor(), but "/", see https://doc.qt.io/qt-5/qdir.html#separator
+ Don't use QDir::separator(), but "/", see https://doc.qt.io/qt-5/qdir.html#separator
and http://agateau.com/2015/qdir-separator-considered-harmful/
@@ -213,7 +213,7 @@ paint() method in Element
====================================================================
Measure layout
- A measure is layouted in four different contexts:
+ A measure is laid out in four different contexts:
- first measure in a system
- the measure is prepended by a system header
diff --git a/mtest/musicxml/visual/testTitleFrameBottom.xml b/mtest/musicxml/visual/testTitleFrameBottom.xml
index eef74bbf79..889fd688ad 100644
--- a/mtest/musicxml/visual/testTitleFrameBottom.xml
+++ b/mtest/musicxml/visual/testTitleFrameBottom.xml
@@ -5,7 +5,7 @@
Meta title
- Meta conposer
+ Meta composer
Meta lyricist
Meta copyright
@@ -49,7 +49,7 @@
Subtitle
- Conposer
+ Composer
Lyricist
diff --git a/mtest/musicxml/visual/testTitleFrameBottomCopyrightTop.xml b/mtest/musicxml/visual/testTitleFrameBottomCopyrightTop.xml
index fe867fdf2f..34578b40fd 100644
--- a/mtest/musicxml/visual/testTitleFrameBottomCopyrightTop.xml
+++ b/mtest/musicxml/visual/testTitleFrameBottomCopyrightTop.xml
@@ -5,7 +5,7 @@
Meta title
- Meta conposer
+ Meta composer
Meta lyricist
Meta copyright
@@ -52,7 +52,7 @@
Subtitle
- Conposer
+ Composer
Lyricist
diff --git a/mtest/musicxml/visual/testTitleFrameTopCopyrightBottom.xml b/mtest/musicxml/visual/testTitleFrameTopCopyrightBottom.xml
index 1353a032c6..9b3b40f578 100644
--- a/mtest/musicxml/visual/testTitleFrameTopCopyrightBottom.xml
+++ b/mtest/musicxml/visual/testTitleFrameTopCopyrightBottom.xml
@@ -5,7 +5,7 @@
Meta title
- Meta conposer
+ Meta composer
Meta lyricist
Meta copyright
@@ -49,7 +49,7 @@
Subtitle
- Conposer
+ Composer
Lyricist
diff --git a/mtest/testoves/structure/tst_ove_structure.cpp b/mtest/testoves/structure/tst_ove_structure.cpp
index 8a29ab945a..67ae2c578d 100644
--- a/mtest/testoves/structure/tst_ove_structure.cpp
+++ b/mtest/testoves/structure/tst_ove_structure.cpp
@@ -59,7 +59,7 @@ private slots:
//void oveRepeatDCFineTest() { oveReadTest("cond - repeat - dc al fine"); }
//void oveRepeatDSCodaTest() { oveReadTest("cond - repeat - ds al coda_segno"); }
//void oveRepeatDSCodaToCodaTest() { oveReadTest("cond - repeat - ds al coda_segno_to coda"); }
- //void oveRepepatDSFineTest() { oveReadTest("cond - repeat - ds al fine_segno"); }
+ //void oveRepeatDSFineTest() { oveReadTest("cond - repeat - ds al fine_segno"); }
//void oveRepeatNumericEndingTest() { oveReadTest("cond - repeat - numeric ending"); }
//void oveRepeatTheMomentTest() { oveReadTest("cond - repeat - the moment"); }
//void oveRepeatToCodaCodaTest() { oveReadTest("cond - repeat - to coda_coda"); }
diff --git a/mtest/testscript/scripts/paste_excceed_scoreLen_MMrest.mscx b/mtest/testscript/scripts/paste_exceed_scoreLen_MMrest.mscx
similarity index 100%
rename from mtest/testscript/scripts/paste_excceed_scoreLen_MMrest.mscx
rename to mtest/testscript/scripts/paste_exceed_scoreLen_MMrest.mscx
diff --git a/mtest/testscript/scripts/paste_excceed_scoreLen_MMrest2.script b/mtest/testscript/scripts/paste_exceed_scoreLen_MMrest2.script
similarity index 88%
rename from mtest/testscript/scripts/paste_excceed_scoreLen_MMrest2.script
rename to mtest/testscript/scripts/paste_exceed_scoreLen_MMrest2.script
index 439af3c9ce..591d451004 100644
--- a/mtest/testscript/scripts/paste_excceed_scoreLen_MMrest2.script
+++ b/mtest/testscript/scripts/paste_exceed_scoreLen_MMrest2.script
@@ -15,4 +15,4 @@ cmd select-next-chord
cmd copy
cmd next-chord
cmd paste
-test score paste_excceed_scoreLen_MMrest.mscx
+test score paste_exceed_scoreLen_MMrest.mscx
diff --git a/share/autobotscripts/steps/Navigation.js b/share/autobotscripts/steps/Navigation.js
index dbc5a8274c..2fc33d435e 100644
--- a/share/autobotscripts/steps/Navigation.js
+++ b/share/autobotscripts/steps/Navigation.js
@@ -20,7 +20,7 @@
* along with this program. If not, see .
*/
-function doCkeckControlIsActive(action)
+function doCheckControlIsActive(action)
{
if (api.navigation.activeControl() === "") {
api.autobot.error("navigation error: no control after call: " + action)
@@ -31,42 +31,42 @@ module.exports = {
nextPanel: function()
{
api.navigation.nextPanel()
- doCkeckControlIsActive("nextPanel")
+ doCheckControlIsActive("nextPanel")
},
prevPanel: function()
{
api.navigation.prevPanel()
- doCkeckControlIsActive("prevPanel")
+ doCheckControlIsActive("prevPanel")
},
right: function()
{
api.navigation.right()
- doCkeckControlIsActive("right")
+ doCheckControlIsActive("right")
},
left: function()
{
api.navigation.left()
- doCkeckControlIsActive("left")
+ doCheckControlIsActive("left")
},
up: function()
{
api.navigation.up()
- doCkeckControlIsActive("up")
+ doCheckControlIsActive("up")
},
down: function()
{
api.navigation.down()
- doCkeckControlIsActive("down")
+ doCheckControlIsActive("down")
},
escape: function()
{
api.navigation.down()
- doCkeckControlIsActive("escape")
+ doCheckControlIsActive("escape")
},
- goToControl: function(section, panel, contolNameOrIndex)
+ goToControl: function(section, panel, controlNameOrIndex)
{
- if (!api.navigation.goToControl(section, panel, contolNameOrIndex)) {
- api.autobot.error("navigation error: not found control: " + contolNameOrIndex)
+ if (!api.navigation.goToControl(section, panel, controlNameOrIndex)) {
+ api.autobot.error("navigation error: not found control: " + controlNameOrIndex)
}
},
trigger: function()
@@ -77,10 +77,10 @@ module.exports = {
}
api.navigation.trigger()
},
- triggerControl: function(section, panel, contolNameOrIndex)
+ triggerControl: function(section, panel, controlNameOrIndex)
{
- if (!api.navigation.triggerControl(section, panel, contolNameOrIndex)) {
- api.autobot.error("navigation error: not found control: " + contolNameOrIndex)
+ if (!api.navigation.triggerControl(section, panel, controlNameOrIndex)) {
+ api.autobot.error("navigation error: not found control: " + controlNameOrIndex)
}
},
activeSection: api.navigation.activeSection,
diff --git a/share/instruments/instruments.xml b/share/instruments/instruments.xml
index 3820d7a58e..9f7cf5f2e9 100644
--- a/share/instruments/instruments.xml
+++ b/share/instruments/instruments.xml
@@ -5274,7 +5274,7 @@
Kuhlohorn
Kuhlohorn
Klhn.
- Small flugelhorn in B♭, played using a deel bowled mouthpiece.
+ Small flugelhorn in B♭, played using a deep bowled mouthpiece.
brass.kuhlohorn
G
1
diff --git a/share/instruments/instrumentsxml.h b/share/instruments/instrumentsxml.h
index 717a0bf947..bb41a053e0 100644
--- a/share/instruments/instrumentsxml.h
+++ b/share/instruments/instrumentsxml.h
@@ -1790,7 +1790,7 @@ QT_TRANSLATE_NOOP3("InstrumentsXML", "Flghn.", "flugelhorn|shortName"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "open", "flugelhorn|channel"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "mute", "flugelhorn|channel"),
-QT_TRANSLATE_NOOP3("InstrumentsXML", "Small flugelhorn in B♭, played using a deel bowled mouthpiece.", "kuhlohorn|description"),
+QT_TRANSLATE_NOOP3("InstrumentsXML", "Small flugelhorn in B♭, played using a deep bowled mouthpiece.", "kuhlohorn|description"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Kuhlohorn", "kuhlohorn|trackName"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Kuhlohorn", "kuhlohorn|longName"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Klhn.", "kuhlohorn|shortName"),
diff --git a/share/sound/FluidR3MonoChangeLog.txt b/share/sound/FluidR3MonoChangeLog.txt
index 1a628cae3d..51c3ddb922 100644
--- a/share/sound/FluidR3MonoChangeLog.txt
+++ b/share/sound/FluidR3MonoChangeLog.txt
@@ -56,7 +56,7 @@
. 000-057: Trombone -- Fixed short release.
. 000-058: Tuba -- Release was too short for notes at low velocities.
. 000-061: Brass Section -- There was some strange programming in this one that caused two voices to be used up per note for no real benefit. Both voices were playing the same sample, one panned hard right and the other hard left with the only difference being slightly different filter settings. This resulted in notes that seemed to pan toward the left at lighter velocities. I fixed this to only use one voice per note and also removed the useless "Key on velocity -> initialFilterQ" modulator that had been added (it was attempting to subtract up to 47 dB from the filter Q, but nowhere was the filter Q greater than 0).
- . 000-069: English Horn -- Tamed the crazy volume swell that occured on most notes. Unfortunately, this instrument ends up being a bit quieter than the other woodwinds. It would be necessary to edit the samples to remedy this.
+ . 000-069: English Horn -- Tamed the crazy volume swell that occurred on most notes. Unfortunately, this instrument ends up being a bit quieter than the other woodwinds. It would be necessary to edit the samples to remedy this.
. 000-071: Clarinet -- EQ'd the samples and added a bit of release for better realism. The original samples were incredibly nasally and cut off too abruptly on note release.
. 000-074: Recorder -- Duplicate samples were panned hard left and right for no discernable reason, which was causing twice the polyphony to be used. I fixed this to use single, center-panned samples instead. I also improved the tuning and countered the pitch bend at the beginning of some notes.
. 000-089: Warm Pad -- Reprogrammed using the strings samples to avoid needing dedicated samples for this preset.
diff --git a/share/sound/MuseScore_General_Changelog.txt b/share/sound/MuseScore_General_Changelog.txt
index d8abd0bb85..5b113db5f7 100644
--- a/share/sound/MuseScore_General_Changelog.txt
+++ b/share/sound/MuseScore_General_Changelog.txt
@@ -183,7 +183,7 @@
- **000-057: Trombone** -- Fixed short release.
- **000-058: Tuba** -- Release was too short for notes at low velocities.
- **000-061: Brass Section** -- There was some strange programming in this one that caused two voices to be used up per note for no real benefit. Both voices were playing the same sample, one panned hard right and the other hard left with the only difference being slightly different filter settings. This resulted in notes that seemed to pan toward the left at lighter velocities. I fixed this to only use one voice per note and also removed the useless "Key on velocity -> initialFilterQ" modulator that had been added (it was attempting to subtract up to 47 dB from the filter Q, but nowhere was the filter Q greater than 0).
- - **000-069: English Horn** -- Tamed the crazy volume swell that occured on most notes. Unfortunately, this instrument ends up being a bit quieter than the other woodwinds. It would be necessary to edit the samples to remedy this.
+ - **000-069: English Horn** -- Tamed the crazy volume swell that occurred on most notes. Unfortunately, this instrument ends up being a bit quieter than the other woodwinds. It would be necessary to edit the samples to remedy this.
- **000-071: Clarinet** -- EQ'd the samples and added a bit of release for better realism. The original samples were incredibly nasally and cut off too abruptly on note release.
- **000-074: Recorder** -- Duplicate samples were panned hard left and right for no discernable reason, which was causing twice the polyphony to be used. I fixed this to use single, center-panned samples instead. I also improved the tuning and countered the pitch bend at the beginning of some notes.
- **000-089: Warm Pad** -- Reprogrammed using the strings samples to avoid needing dedicated samples for this preset.
diff --git a/share/styles/chords_std.xml b/share/styles/chords_std.xml
index 1361f8be3a..5dc2f6cfbc 100644
--- a/share/styles/chords_std.xml
+++ b/share/styles/chords_std.xml
@@ -50,7 +50,7 @@
-
+
diff --git a/src/appshell/commandlinecontroller.cpp b/src/appshell/commandlinecontroller.cpp
index 4f69236d0b..7361a10fa7 100644
--- a/src/appshell/commandlinecontroller.cpp
+++ b/src/appshell/commandlinecontroller.cpp
@@ -165,7 +165,7 @@ void CommandLineController::apply()
}
}
- notationConfiguration()->setTemplateModeEnalbed(m_parser.isSet("template-mode"));
+ notationConfiguration()->setTemplateModeEnabled(m_parser.isSet("template-mode"));
notationConfiguration()->setTestModeEnabled(m_parser.isSet("t"));
QString modeType;
diff --git a/src/appshell/qml/Preferences/IOPreferencesPage.qml b/src/appshell/qml/Preferences/IOPreferencesPage.qml
index 2105df0d8f..b60c5cd3e6 100644
--- a/src/appshell/qml/Preferences/IOPreferencesPage.qml
+++ b/src/appshell/qml/Preferences/IOPreferencesPage.qml
@@ -71,7 +71,7 @@ PreferencesPage {
ioModel.currentMidiInputDeviceIndex = newIndex
}
- onCurrentOuputDeviceIndexChangeRequested: function(newIndex) {
+ onCurrentOutputDeviceIndexChangeRequested: function(newIndex) {
ioModel.currentMidiOutputDeviceIndex = newIndex
}
}
diff --git a/src/appshell/qml/Preferences/NoteInputPreferencesPage.qml b/src/appshell/qml/Preferences/NoteInputPreferencesPage.qml
index 3a0638d378..4c71498215 100644
--- a/src/appshell/qml/Preferences/NoteInputPreferencesPage.qml
+++ b/src/appshell/qml/Preferences/NoteInputPreferencesPage.qml
@@ -40,7 +40,7 @@ PreferencesPage {
NoteInputSection {
advanceToNextNote: noteInputModel.advanceToNextNoteOnKeyRelease
- colorNotes: noteInputModel.colorNotesOusideOfUsablePitchRange
+ colorNotes: noteInputModel.colorNotesOutsideOfUsablePitchRange
delayBetweenNotes: noteInputModel.delayBetweenNotesInRealTimeModeMilliseconds
navigation.section: root.navigationSection
@@ -51,7 +51,7 @@ PreferencesPage {
}
onColorNotesChangeRequested: function(color) {
- noteInputModel.colorNotesOusideOfUsablePitchRange = color
+ noteInputModel.colorNotesOutsideOfUsablePitchRange = color
}
onDelayBetweenNotesChangeRequested: function(delay) {
diff --git a/src/appshell/qml/Preferences/internal/FoldersSection.qml b/src/appshell/qml/Preferences/internal/FoldersSection.qml
index 5354a099a9..f33ec50c24 100644
--- a/src/appshell/qml/Preferences/internal/FoldersSection.qml
+++ b/src/appshell/qml/Preferences/internal/FoldersSection.qml
@@ -59,7 +59,7 @@ BaseSection {
FilePicker {
Layout.fillWidth: true
- pickerType: model.isMutliDirectories ? FilePicker.PickerType.MultipleDirectories : FilePicker.PickerType.Directory
+ pickerType: model.isMultiDirectories ? FilePicker.PickerType.MultipleDirectories : FilePicker.PickerType.Directory
dialogTitle: qsTrc("appshell", "Choose %1 folder").arg(model.title)
dir: model.dir
diff --git a/src/appshell/qml/Preferences/internal/MidiDevicesSection.qml b/src/appshell/qml/Preferences/internal/MidiDevicesSection.qml
index eb37316947..66b52b5579 100644
--- a/src/appshell/qml/Preferences/internal/MidiDevicesSection.qml
+++ b/src/appshell/qml/Preferences/internal/MidiDevicesSection.qml
@@ -33,7 +33,7 @@ BaseSection {
property alias outputDevices: outputDevicesBox.model
signal currentInputDeviceIndexChangeRequested(int newIndex)
- signal currentOuputDeviceIndexChangeRequested(int newIndex)
+ signal currentOutputDeviceIndexChangeRequested(int newIndex)
title: qsTrc("appshell", "MIDI")
@@ -63,7 +63,7 @@ BaseSection {
navigation.row: 2
onValueEdited: function(newIndex, newValue) {
- root.currentOuputDeviceIndexChangeRequested(newIndex)
+ root.currentOutputDeviceIndexChangeRequested(newIndex)
}
}
}
diff --git a/src/appshell/qml/Preferences/internal/ZoomSection.qml b/src/appshell/qml/Preferences/internal/ZoomSection.qml
index bf41bb97e1..a8f42040b3 100644
--- a/src/appshell/qml/Preferences/internal/ZoomSection.qml
+++ b/src/appshell/qml/Preferences/internal/ZoomSection.qml
@@ -99,7 +99,7 @@ BaseSection {
minValue: 1
maxValue: 16
- navigation.name: "MouseZoomPercisionControl"
+ navigation.name: "MouseZoomPrecisionControl"
navigation.panel: root.navigation
navigation.row: 1
navigation.column: 0
diff --git a/src/appshell/qml/PublishPage/PublishPage.qml b/src/appshell/qml/PublishPage/PublishPage.qml
index 59537e66b7..8f7207c0de 100644
--- a/src/appshell/qml/PublishPage/PublishPage.qml
+++ b/src/appshell/qml/PublishPage/PublishPage.qml
@@ -42,7 +42,7 @@ DockPage {
property NavigationSection publishToolBarKeyNavSec: NavigationSection {
id: keynavSec
- name: "PublushToolBarSection"
+ name: "PublishToolBarSection"
order: 2
}
diff --git a/src/appshell/qml/dockwindow/DockPage.qml b/src/appshell/qml/dockwindow/DockPage.qml
index 4cc6e868d2..4157a048f8 100644
--- a/src/appshell/qml/dockwindow/DockPage.qml
+++ b/src/appshell/qml/dockwindow/DockPage.qml
@@ -38,9 +38,9 @@ DockPageView {
property var panelTopDropDestination: { "dock": panelTopDockingHolder, "dropLocation": Location.Left }
property var panelBottomDropDestination: { "dock": panelBottomDockingHolder, "dropLocation": Location.Left }
- property bool complited: false
- Component.onCompleted: root.complited = true
- Component.onDestruction: root.complited = false
+ property bool completed: false
+ Component.onCompleted: root.completed = true
+ Component.onDestruction: root.completed = false
centralDock: DockCentralView {
objectName: root.objectName + "_central"
@@ -48,7 +48,7 @@ DockPageView {
Loader {
id: central
anchors.fill: parent
- sourceComponent: (root.complited && root.visible) ? root.central : null
+ sourceComponent: (root.completed && root.visible) ? root.central : null
}
}
diff --git a/src/appshell/view/dockwindow/dockpanelview.cpp b/src/appshell/view/dockwindow/dockpanelview.cpp
index d49d7462f0..65f0f835a5 100644
--- a/src/appshell/view/dockwindow/dockpanelview.cpp
+++ b/src/appshell/view/dockwindow/dockpanelview.cpp
@@ -160,7 +160,7 @@ DockPanelView::~DockPanelView()
return;
}
- dockWidget->setProperty(DOCK_PANEL_PROPERY, QVariant::fromValue(nullptr));
+ dockWidget->setProperty(DOCK_PANEL_PROPERTY, QVariant::fromValue(nullptr));
dockWidget->setProperty(CONTEXT_MENU_MODEL_PROPERTY, QVariant::fromValue(nullptr));
}
@@ -190,7 +190,7 @@ void DockPanelView::componentComplete()
m_menuModel->load();
- dockWidget->setProperty(DOCK_PANEL_PROPERY, QVariant::fromValue(this));
+ dockWidget->setProperty(DOCK_PANEL_PROPERTY, QVariant::fromValue(this));
dockWidget->setProperty(CONTEXT_MENU_MODEL_PROPERTY, QVariant::fromValue(m_menuModel));
connect(m_menuModel, &AbstractMenuModel::itemsChanged, [dockWidget, this]() {
diff --git a/src/appshell/view/dockwindow/docktypes.h b/src/appshell/view/dockwindow/docktypes.h
index d3373491f9..85d347a0e4 100644
--- a/src/appshell/view/dockwindow/docktypes.h
+++ b/src/appshell/view/dockwindow/docktypes.h
@@ -28,7 +28,7 @@
namespace mu::dock {
inline const char* CONTEXT_MENU_MODEL_PROPERTY("contextMenuModel");
-inline const char* DOCK_PANEL_PROPERY("dockPanel");
+inline const char* DOCK_PANEL_PROPERTY("dockPanel");
//! NOTE: need to be synchronized with Window shadow(see DockFloatingWindow margins)
inline constexpr int DOCK_WINDOW_SHADOW(8);
diff --git a/src/appshell/view/dockwindow/dockwindow.cpp b/src/appshell/view/dockwindow/dockwindow.cpp
index 07f0803ea2..9b824ab297 100644
--- a/src/appshell/view/dockwindow/dockwindow.cpp
+++ b/src/appshell/view/dockwindow/dockwindow.cpp
@@ -384,7 +384,7 @@ void DockWindow::alignToolBars(const DockPageView* page)
int centralToolBarsWidth = 0;
int rightToolBarsWidth = 0;
- int separatorThicnkess = KDDockWidgets::Config::self().separatorThickness();
+ int separatorThickness = KDDockWidgets::Config::self().separatorThickness();
for (DockToolBarView* toolBar : topToolBars) {
if (toolBar->floating() || !toolBar->isVisible()) {
@@ -398,10 +398,10 @@ void DockWindow::alignToolBars(const DockPageView* page)
break;
case DockToolBarAlignment::Center:
lastCentralToolBar = toolBar;
- centralToolBarsWidth += (toolBar->contentWidth() + separatorThicnkess);
+ centralToolBarsWidth += (toolBar->contentWidth() + separatorThickness);
break;
case DockToolBarAlignment::Right:
- rightToolBarsWidth += (toolBar->contentWidth() + separatorThicnkess);
+ rightToolBarsWidth += (toolBar->contentWidth() + separatorThickness);
break;
}
}
diff --git a/src/appshell/view/dockwindow/internal/dockbase.cpp b/src/appshell/view/dockwindow/internal/dockbase.cpp
index 56371b2350..0a947a3e19 100644
--- a/src/appshell/view/dockwindow/internal/dockbase.cpp
+++ b/src/appshell/view/dockwindow/internal/dockbase.cpp
@@ -33,7 +33,7 @@
#include "thirdparty/KDDockWidgets/src/private/FloatingWindow_p.h"
namespace mu::dock {
-static QSize adjustSizeByContraints(const QSize& size, const QSize& min, const QSize& max)
+static QSize adjustSizeByConstraints(const QSize& size, const QSize& min, const QSize& max)
{
return size.expandedTo(min).boundedTo(max);
}
@@ -541,7 +541,7 @@ void DockBase::applySizeConstraints()
window->setMinimumSize(minimumSize);
window->setMaximumSize(maximumSize);
- QSize winSize = adjustSizeByContraints(window->frameGeometry().size(), minimumSize, maximumSize);
+ QSize winSize = adjustSizeByConstraints(window->frameGeometry().size(), minimumSize, maximumSize);
QRect winRect(window->dragRect().topLeft(), winSize);
window->setGeometry(winRect);
diff --git a/src/appshell/view/dockwindow/internal/dockframemodel.cpp b/src/appshell/view/dockwindow/internal/dockframemodel.cpp
index 2a0cdd4571..7dd9f34df3 100644
--- a/src/appshell/view/dockwindow/internal/dockframemodel.cpp
+++ b/src/appshell/view/dockwindow/internal/dockframemodel.cpp
@@ -175,7 +175,7 @@ void DockFrameModel::setIsHorizontalPanel(bool is)
QObject* DockFrameModel::currentNavigationSection() const
{
- auto dockPanel = currentDockProperty(DOCK_PANEL_PROPERY).value();
+ auto dockPanel = currentDockProperty(DOCK_PANEL_PROPERTY).value();
return dockPanel ? dockPanel->navigationSection() : nullptr;
}
diff --git a/src/appshell/view/preferences/advancedpreferencesmodel.cpp b/src/appshell/view/preferences/advancedpreferencesmodel.cpp
index 05b2c36f56..f7befa64ea 100644
--- a/src/appshell/view/preferences/advancedpreferencesmodel.cpp
+++ b/src/appshell/view/preferences/advancedpreferencesmodel.cpp
@@ -87,7 +87,7 @@ void AdvancedPreferencesModel::load()
Settings::Items items = settings()->items();
for (auto it = items.cbegin(); it != items.cend(); ++it) {
- if (it->second.canBeMannualyEdited) {
+ if (it->second.canBeManuallyEdited) {
m_items << it->second;
}
}
diff --git a/src/appshell/view/preferences/folderspreferencesmodel.cpp b/src/appshell/view/preferences/folderspreferencesmodel.cpp
index d11b3af895..e018dd3a5c 100644
--- a/src/appshell/view/preferences/folderspreferencesmodel.cpp
+++ b/src/appshell/view/preferences/folderspreferencesmodel.cpp
@@ -43,7 +43,7 @@ QVariant FoldersPreferencesModel::data(const QModelIndex& index, int role) const
case TitleRole: return folder.title;
case PathRole: return folder.value;
case DirRole: return folder.dir;
- case IsMutliDirectoriesRole: return folder.valueType == FolderValueType::MultiDirectories;
+ case IsMultiDirectoriesRole: return folder.valueType == FolderValueType::MultiDirectories;
}
return QVariant();
@@ -74,7 +74,7 @@ QHash FoldersPreferencesModel::roleNames() const
{ TitleRole, "title" },
{ PathRole, "path" },
{ DirRole, "dir" },
- { IsMutliDirectoriesRole, "isMutliDirectories" }
+ { IsMultiDirectoriesRole, "isMultiDirectories" }
};
return roles;
diff --git a/src/appshell/view/preferences/folderspreferencesmodel.h b/src/appshell/view/preferences/folderspreferencesmodel.h
index e589391716..e9aca25405 100644
--- a/src/appshell/view/preferences/folderspreferencesmodel.h
+++ b/src/appshell/view/preferences/folderspreferencesmodel.h
@@ -62,7 +62,7 @@ private:
TitleRole = Qt::UserRole + 1,
PathRole,
DirRole,
- IsMutliDirectoriesRole
+ IsMultiDirectoriesRole
};
enum class FolderType {
diff --git a/src/appshell/view/preferences/noteinputpreferencesmodel.cpp b/src/appshell/view/preferences/noteinputpreferencesmodel.cpp
index 1b971bd0d0..945ad771ed 100644
--- a/src/appshell/view/preferences/noteinputpreferencesmodel.cpp
+++ b/src/appshell/view/preferences/noteinputpreferencesmodel.cpp
@@ -36,9 +36,9 @@ bool NoteInputPreferencesModel::advanceToNextNoteOnKeyRelease() const
return shortcutsConfiguration()->advanceToNextNoteOnKeyRelease();
}
-bool NoteInputPreferencesModel::colorNotesOusideOfUsablePitchRange() const
+bool NoteInputPreferencesModel::colorNotesOutsideOfUsablePitchRange() const
{
- return notationConfiguration()->colorNotesOusideOfUsablePitchRange();
+ return notationConfiguration()->colorNotesOutsideOfUsablePitchRange();
}
int NoteInputPreferencesModel::delayBetweenNotesInRealTimeModeMilliseconds() const
@@ -76,14 +76,14 @@ void NoteInputPreferencesModel::setAdvanceToNextNoteOnKeyRelease(bool value)
emit advanceToNextNoteOnKeyReleaseChanged(value);
}
-void NoteInputPreferencesModel::setColorNotesOusideOfUsablePitchRange(bool value)
+void NoteInputPreferencesModel::setColorNotesOutsideOfUsablePitchRange(bool value)
{
- if (value == colorNotesOusideOfUsablePitchRange()) {
+ if (value == colorNotesOutsideOfUsablePitchRange()) {
return;
}
- notationConfiguration()->setColorNotesOusideOfUsablePitchRange(value);
- emit colorNotesOusideOfUsablePitchRangeChanged(value);
+ notationConfiguration()->setColorNotesOutsideOfUsablePitchRange(value);
+ emit colorNotesOutsideOfUsablePitchRangeChanged(value);
}
void NoteInputPreferencesModel::setDelayBetweenNotesInRealTimeModeMilliseconds(int delay)
diff --git a/src/appshell/view/preferences/noteinputpreferencesmodel.h b/src/appshell/view/preferences/noteinputpreferencesmodel.h
index 4f4e3d444f..a298cd3e8d 100644
--- a/src/appshell/view/preferences/noteinputpreferencesmodel.h
+++ b/src/appshell/view/preferences/noteinputpreferencesmodel.h
@@ -41,7 +41,7 @@ class NoteInputPreferencesModel : public QObject
Q_PROPERTY(
bool advanceToNextNoteOnKeyRelease READ advanceToNextNoteOnKeyRelease WRITE setAdvanceToNextNoteOnKeyRelease NOTIFY advanceToNextNoteOnKeyReleaseChanged)
Q_PROPERTY(
- bool colorNotesOusideOfUsablePitchRange READ colorNotesOusideOfUsablePitchRange WRITE setColorNotesOusideOfUsablePitchRange NOTIFY colorNotesOusideOfUsablePitchRangeChanged)
+ bool colorNotesOutsideOfUsablePitchRange READ colorNotesOutsideOfUsablePitchRange WRITE setColorNotesOutsideOfUsablePitchRange NOTIFY colorNotesOutsideOfUsablePitchRangeChanged)
Q_PROPERTY(
int delayBetweenNotesInRealTimeModeMilliseconds READ delayBetweenNotesInRealTimeModeMilliseconds WRITE setDelayBetweenNotesInRealTimeModeMilliseconds NOTIFY delayBetweenNotesInRealTimeModeMillisecondsChanged)
@@ -56,7 +56,7 @@ public:
explicit NoteInputPreferencesModel(QObject* parent = nullptr);
bool advanceToNextNoteOnKeyRelease() const;
- bool colorNotesOusideOfUsablePitchRange() const;
+ bool colorNotesOutsideOfUsablePitchRange() const;
int delayBetweenNotesInRealTimeModeMilliseconds() const;
bool playNotesWhenEditing() const;
@@ -66,7 +66,7 @@ public:
public slots:
void setAdvanceToNextNoteOnKeyRelease(bool value);
- void setColorNotesOusideOfUsablePitchRange(bool value);
+ void setColorNotesOutsideOfUsablePitchRange(bool value);
void setDelayBetweenNotesInRealTimeModeMilliseconds(int delay);
void setPlayNotesWhenEditing(bool value);
void setNotePlayDurationMilliseconds(int duration);
@@ -75,7 +75,7 @@ public slots:
signals:
void advanceToNextNoteOnKeyReleaseChanged(bool value);
- void colorNotesOusideOfUsablePitchRangeChanged(bool value);
+ void colorNotesOutsideOfUsablePitchRangeChanged(bool value);
void delayBetweenNotesInRealTimeModeMillisecondsChanged(int delay);
void playNotesWhenEditingChanged(bool value);
void notePlayDurationMillisecondsChanged(int duration);
diff --git a/src/autobot/CMakeLists.txt b/src/autobot/CMakeLists.txt
index 8638ffa23f..9628d9e915 100644
--- a/src/autobot/CMakeLists.txt
+++ b/src/autobot/CMakeLists.txt
@@ -18,10 +18,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# This is module for convert mscz files to various formats (image, pdf, audio and etc).
-# Main goal - determine what need to do and call necceasers functions.
-# Usually use from command line.
-
set(MODULE autobot)
set(MODULE_QRC autobot.qrc)
diff --git a/src/autobot/internal/api/navigationapi.cpp b/src/autobot/internal/api/navigationapi.cpp
index f358b2600d..4093364605 100644
--- a/src/autobot/internal/api/navigationapi.cpp
+++ b/src/autobot/internal/api/navigationapi.cpp
@@ -70,23 +70,23 @@ void NavigationApi::escape()
dispatcher()->dispatch("nav-escape");
}
-bool NavigationApi::goToControl(const QString& section, const QString& panel, const QJSValue& contolNameOrIndex)
+bool NavigationApi::goToControl(const QString& section, const QString& panel, const QJSValue& controlNameOrIndex)
{
bool ok = false;
- if (contolNameOrIndex.isString()) {
- ok = navigation()->requestActivateByName(section.toStdString(), panel.toStdString(), contolNameOrIndex.toString().toStdString());
- } else if (contolNameOrIndex.isArray()) {
- if (contolNameOrIndex.property("length").toInt() == 2) {
+ if (controlNameOrIndex.isString()) {
+ ok = navigation()->requestActivateByName(section.toStdString(), panel.toStdString(), controlNameOrIndex.toString().toStdString());
+ } else if (controlNameOrIndex.isArray()) {
+ if (controlNameOrIndex.property("length").toInt() == 2) {
INavigation::Index idx;
- idx.row = contolNameOrIndex.property(0).toInt();
- idx.column = contolNameOrIndex.property(1).toInt();
+ idx.row = controlNameOrIndex.property(0).toInt();
+ idx.column = controlNameOrIndex.property(1).toInt();
ok = navigation()->requestActivateByIndex(section.toStdString(), panel.toStdString(), idx);
} else {
- LOGE() << "bad argument `control`: " << contolNameOrIndex.toString();
+ LOGE() << "bad argument `control`: " << controlNameOrIndex.toString();
ok = false;
}
} else {
- LOGE() << "bad argument `control`: " << contolNameOrIndex.toString();
+ LOGE() << "bad argument `control`: " << controlNameOrIndex.toString();
ok = false;
}
@@ -98,9 +98,9 @@ void NavigationApi::trigger()
dispatcher()->dispatch("nav-trigger-control");
}
-bool NavigationApi::triggerControl(const QString& section, const QString& panel, const QJSValue& contolNameOrIndex)
+bool NavigationApi::triggerControl(const QString& section, const QString& panel, const QJSValue& controlNameOrIndex)
{
- bool ok = goToControl(section, panel, contolNameOrIndex);
+ bool ok = goToControl(section, panel, controlNameOrIndex);
if (ok) {
trigger();
}
diff --git a/src/autobot/internal/api/navigationapi.h b/src/autobot/internal/api/navigationapi.h
index f5374c15c0..1d505bf5fe 100644
--- a/src/autobot/internal/api/navigationapi.h
+++ b/src/autobot/internal/api/navigationapi.h
@@ -49,9 +49,9 @@ public:
Q_INVOKABLE void up();
Q_INVOKABLE void down();
Q_INVOKABLE void escape();
- Q_INVOKABLE bool goToControl(const QString& section, const QString& panel, const QJSValue& contolNameOrIndex);
+ Q_INVOKABLE bool goToControl(const QString& section, const QString& panel, const QJSValue& controlNameOrIndex);
Q_INVOKABLE void trigger();
- Q_INVOKABLE bool triggerControl(const QString& section, const QString& panel, const QJSValue& contolNameOrIndex);
+ Q_INVOKABLE bool triggerControl(const QString& section, const QString& panel, const QJSValue& controlNameOrIndex);
Q_INVOKABLE QString activeSection() const;
Q_INVOKABLE QString activePanel() const;
diff --git a/src/autobot/internal/autobotinteractive.cpp b/src/autobot/internal/autobotinteractive.cpp
index 138042b9f3..ae6899db4c 100644
--- a/src/autobot/internal/autobotinteractive.cpp
+++ b/src/autobot/internal/autobotinteractive.cpp
@@ -104,9 +104,9 @@ io::path AutobotInteractive::selectDirectory(const QString& title, const io::pat
return m_real->selectDirectory(title, dir);
}
-io::paths AutobotInteractive::selectMultipleDirectories(const QString& title, const io::path& dir, const io::paths& initialyDirectories)
+io::paths AutobotInteractive::selectMultipleDirectories(const QString& title, const io::path& dir, const io::paths& initialDirectories)
{
- return m_real->selectMultipleDirectories(title, dir, initialyDirectories);
+ return m_real->selectMultipleDirectories(title, dir, initialDirectories);
}
RetVal AutobotInteractive::open(const std::string& uri) const
diff --git a/src/autobot/internal/autobotinteractive.h b/src/autobot/internal/autobotinteractive.h
index c5fae3a32c..2981e96b93 100644
--- a/src/autobot/internal/autobotinteractive.h
+++ b/src/autobot/internal/autobotinteractive.h
@@ -67,7 +67,7 @@ public:
// dirs
io::path selectDirectory(const QString& title, const io::path& dir) override;
- io::paths selectMultipleDirectories(const QString& title, const io::path& dir, const io::paths& initialyDirectories) override;
+ io::paths selectMultipleDirectories(const QString& title, const io::path& dir, const io::paths& initialDirectories) override;
// custom
RetVal open(const std::string& uri) const override;
diff --git a/src/converter/CMakeLists.txt b/src/converter/CMakeLists.txt
index e74f7e2b9d..e81ffff3e2 100644
--- a/src/converter/CMakeLists.txt
+++ b/src/converter/CMakeLists.txt
@@ -19,7 +19,7 @@
# along with this program. If not, see .
# This is module for convert mscz files to various formats (image, pdf, audio and etc).
-# Main goal - determine what need to do and call necceasers functions.
+# Main goal - determine what need to do and call necessary functions.
# Usually use from command line.
set(MODULE converter)
diff --git a/src/converter/internal/compat/notationmeta.cpp b/src/converter/internal/compat/notationmeta.cpp
index 4181cfb7c0..a31b229601 100644
--- a/src/converter/internal/compat/notationmeta.cpp
+++ b/src/converter/internal/compat/notationmeta.cpp
@@ -177,9 +177,9 @@ std::pair NotationMeta::tempo(const Ms::Score* score)
QString tempoText;
for (const Ms::Segment* segment = score->firstSegmentMM(Ms::SegmentType::All); segment; segment = segment->next1MM()) {
auto annotations = segment->annotations();
- for (const Ms::EngravingItem* anotation : annotations) {
- if (anotation && anotation->isTempoText()) {
- const Ms::TempoText* tt = toTempoText(anotation);
+ for (const Ms::EngravingItem* annotation : annotations) {
+ if (annotation && annotation->isTempoText()) {
+ const Ms::TempoText* tt = toTempoText(annotation);
tempo = round(tt->tempo().toBPM().val);
tempoText = tt->xmlText();
}
diff --git a/src/diagnostics/internal/diagnosticsactionscontroller.cpp b/src/diagnostics/internal/diagnosticsactionscontroller.cpp
index 922d845c11..543e7ebc15 100644
--- a/src/diagnostics/internal/diagnosticsactionscontroller.cpp
+++ b/src/diagnostics/internal/diagnosticsactionscontroller.cpp
@@ -28,7 +28,7 @@
using namespace mu::diagnostics;
using namespace mu::accessibility;
-static const mu::UriQuery SYSTEN_PATHS_URI("musescore://diagnostics/system/paths?sync=false&modal=false&floating=true");
+static const mu::UriQuery SYSTEM_PATHS_URI("musescore://diagnostics/system/paths?sync=false&modal=false&floating=true");
static const mu::UriQuery PROFILER_URI("musescore://diagnostics/system/profiler?sync=false&modal=false&floating=true");
static const mu::UriQuery NAVIGATION_TREE_URI("musescore://diagnostics/navigation/tree?sync=false&modal=false&floating=true");
static const mu::UriQuery ACCESSIBLE_TREE_URI("musescore://diagnostics/accessible/tree?sync=false&modal=false&floating=true");
@@ -36,7 +36,7 @@ static const mu::UriQuery ENGRAVING_ELEMENTS_URI("musescore://diagnostics/engrav
void DiagnosticsActionsController::init()
{
- dispatcher()->reg(this, "diagnostic-show-paths", [this]() { openUri(SYSTEN_PATHS_URI); });
+ dispatcher()->reg(this, "diagnostic-show-paths", [this]() { openUri(SYSTEM_PATHS_URI); });
dispatcher()->reg(this, "diagnostic-show-profiler", [this]() { openUri(PROFILER_URI); });
dispatcher()->reg(this, "diagnostic-show-navigation-tree", [this]() { openUri(NAVIGATION_TREE_URI); });
dispatcher()->reg(this, "diagnostic-show-accessible-tree", [this]() { openUri(ACCESSIBLE_TREE_URI); });
diff --git a/src/diagnostics/internal/engravingelementsprovider.h b/src/diagnostics/internal/engravingelementsprovider.h
index e5ce5342e5..50d3414bef 100644
--- a/src/diagnostics/internal/engravingelementsprovider.h
+++ b/src/diagnostics/internal/engravingelementsprovider.h
@@ -42,7 +42,7 @@ public:
void clearStatistic() override;
void printStatistic(const std::string& title) override;
- // registr
+ // register
void reg(const Ms::EngravingObject* e) override;
void unreg(const Ms::EngravingObject* e) override;
const EngravingObjectList& elements() const override;
diff --git a/src/diagnostics/qml/MuseScore/Diagnostics/EngravingElementsPanel.qml b/src/diagnostics/qml/MuseScore/Diagnostics/EngravingElementsPanel.qml
index 26a53640f2..25fb7958e5 100644
--- a/src/diagnostics/qml/MuseScore/Diagnostics/EngravingElementsPanel.qml
+++ b/src/diagnostics/qml/MuseScore/Diagnostics/EngravingElementsPanel.qml
@@ -74,12 +74,12 @@ Rectangle {
FlatButton {
id: moreBtn
anchors.right: parent.right
- text: infoLable.visible ? "Less" : "More"
- onClicked: infoLable.visible = !infoLable.visible
+ text: infoLabel.visible ? "Less" : "More"
+ onClicked: infoLabel.visible = !infoLabel.visible
}
StyledTextLabel {
- id: infoLable
+ id: infoLabel
anchors.top: reloadBtn.bottom
anchors.left: parent.left
anchors.right: parent.right
diff --git a/src/engraving/compat/writescorehook.cpp b/src/engraving/compat/writescorehook.cpp
index 25d7944959..264728791f 100644
--- a/src/engraving/compat/writescorehook.cpp
+++ b/src/engraving/compat/writescorehook.cpp
@@ -48,7 +48,7 @@ void WriteScoreHook::onWriteStyle302(Ms::Score* score, Ms::XmlWriter& xml)
}
if (isWriteStyle) {
- score->style().save(xml, true); // save only differences to buildin style (logic from 3.)
+ score->style().save(xml, true); // save only differences to builtin style (logic from 3.)
}
}
diff --git a/src/engraving/infrastructure/draw/geometry.h b/src/engraving/infrastructure/draw/geometry.h
index b1ee051008..6e3cd56122 100644
--- a/src/engraving/infrastructure/draw/geometry.h
+++ b/src/engraving/infrastructure/draw/geometry.h
@@ -441,7 +441,7 @@ public:
using PolygonF = PolygonX;
using Polygon = PolygonX;
-// Impelemtation ==========================================
+// Implementation ==========================================
template
RectX RectX::united(const RectX& r) const
{
diff --git a/src/engraving/infrastructure/internal/engravingconfiguration.cpp b/src/engraving/infrastructure/internal/engravingconfiguration.cpp
index 640c34f4b9..78b51f8060 100644
--- a/src/engraving/infrastructure/internal/engravingconfiguration.cpp
+++ b/src/engraving/infrastructure/internal/engravingconfiguration.cpp
@@ -61,7 +61,7 @@ void EngravingConfiguration::init()
Settings::Key key("engraving", "engraving/colors/voice" + std::to_string(voice + 1));
settings()->setDefaultValue(key, Val(defaultVoiceColors[voice].toQColor()));
- settings()->setCanBeMannualyEdited(key, true);
+ settings()->setCanBeManuallyEdited(key, true);
settings()->valueChanged(key).onReceive(this, [this, voice](const Val& val) {
Color color = val.toQColor();
voiceColorKeys[voice].color = color;
diff --git a/src/engraving/infrastructure/io/mscwriter.cpp b/src/engraving/infrastructure/io/mscwriter.cpp
index 664649ecbd..f9e8008730 100644
--- a/src/engraving/infrastructure/io/mscwriter.cpp
+++ b/src/engraving/infrastructure/io/mscwriter.cpp
@@ -182,13 +182,13 @@ void MscWriter::writeViewSettingsJsonFile(const QByteArray& data)
void MscWriter::writeMeta()
{
- if (m_meta.isWrited) {
+ if (m_meta.isWritten) {
return;
}
writeContainer(m_meta.files);
- m_meta.isWrited = true;
+ m_meta.isWritten = true;
}
void MscWriter::writeContainer(const std::vector& paths)
diff --git a/src/engraving/infrastructure/io/mscwriter.h b/src/engraving/infrastructure/io/mscwriter.h
index 900948a606..9bd176a2a7 100644
--- a/src/engraving/infrastructure/io/mscwriter.h
+++ b/src/engraving/infrastructure/io/mscwriter.h
@@ -115,7 +115,7 @@ private:
struct Meta {
std::vector files;
- bool isWrited = false;
+ bool isWritten = false;
bool contains(const QString& file) const;
void addFile(const QString& file);
diff --git a/src/engraving/layout/layoutharmonies.cpp b/src/engraving/layout/layoutharmonies.cpp
index 27d94e9d25..16c63fcfe2 100644
--- a/src/engraving/layout/layoutharmonies.cpp
+++ b/src/engraving/layout/layoutharmonies.cpp
@@ -205,7 +205,7 @@ void LayoutHarmonies::alignHarmonies(const System* system, const std::vectorsectionBreakElement();
ctx.firstSystem = measure->sectionBreak() && !options.isMode(LayoutMode::FLOAT);
- ctx.firstSystemIndent = ctx.firstSystem && options.firstSystemIndent && layoutBreak->firstSystemIdentation();
+ ctx.firstSystemIndent = ctx.firstSystem && options.firstSystemIndent && layoutBreak->firstSystemIndentation();
ctx.startWithLongNames = ctx.firstSystem && layoutBreak->startWithLongNames();
}
@@ -178,7 +178,7 @@ System* LayoutSystem::collectSystem(const LayoutOptions& options, LayoutContext&
static constexpr double squeezability = 0.3; // We may consider exposing in Style settings (M.S.)
double acceptanceRange = squeezability * system->squeezableSpace();
bool doBreak = (system->measures().size() > 1) && ((curSysWidth + ww) > systemWidth + acceptanceRange);
- /* acceptanceRange allows some systems to be inizially slightly larger than the margins and be
+ /* acceptanceRange allows some systems to be initially slightly larger than the margins and be
* justified by squeezing instead of stretching. Allows to make much better choices of how many
* measures to fit per system. */
if (doBreak) {
@@ -472,7 +472,7 @@ System* LayoutSystem::collectSystem(const LayoutOptions& options, LayoutContext&
if (measure) {
const LayoutBreak* layoutBreak = measure->sectionBreakElement();
ctx.firstSystem = measure->sectionBreak() && !options.isMode(LayoutMode::FLOAT);
- ctx.firstSystemIndent = ctx.firstSystem && options.firstSystemIndent && layoutBreak->firstSystemIdentation();
+ ctx.firstSystemIndent = ctx.firstSystem && options.firstSystemIndent && layoutBreak->firstSystemIndentation();
ctx.startWithLongNames = ctx.firstSystem && layoutBreak->startWithLongNames();
}
@@ -964,7 +964,7 @@ void LayoutSystem::layoutSystemElements(const LayoutOptions& options, LayoutCont
//-------------------------------------------------------------
// layout SpannerSegments for current system
- // ottavas, pedals, voltas are collected here, but layouted later
+ // ottavas, pedals, voltas are collected here, but laid out later
//-------------------------------------------------------------
spanner.clear();
diff --git a/src/engraving/libmscore/accidental.cpp b/src/engraving/libmscore/accidental.cpp
index 2b68304bf9..9654f3b920 100644
--- a/src/engraving/libmscore/accidental.cpp
+++ b/src/engraving/libmscore/accidental.cpp
@@ -52,7 +52,7 @@ struct Acc {
: offset(o), centOffset(o2), sym(s) {}
};
-// NOTE: keep this in sync with with AccidentalType enum in types.h, watch out for isMicrotonal()
+// NOTE: keep this in sync with AccidentalType enum in types.h, watch out for isMicrotonal()
static Acc accList[] = {
Acc(AccidentalVal::NATURAL, 0, SymId::noSym), // NONE
Acc(AccidentalVal::FLAT, 0, SymId::accidentalFlat), // FLAT
diff --git a/src/engraving/libmscore/ambitus.cpp b/src/engraving/libmscore/ambitus.cpp
index b4e6e26a11..e3b6d8627c 100644
--- a/src/engraving/libmscore/ambitus.cpp
+++ b/src/engraving/libmscore/ambitus.cpp
@@ -366,7 +366,7 @@ void Ambitus::layout()
//
// NOTEHEADS Y POS
//
- // if pitch == INVALID_PITCH oor tpc == INALID_TPC, set to some default:
+ // if pitch == INVALID_PITCH or tpc == Tpc::TPC_INVALID, set to some default:
// for use in palettes and when actual range cannot be calculated (new ambitus or no notes in staff)
//
qreal xAccidOffTop = 0;
diff --git a/src/engraving/libmscore/barline.cpp b/src/engraving/libmscore/barline.cpp
index b799ebf8e8..5ade8fd3f6 100644
--- a/src/engraving/libmscore/barline.cpp
+++ b/src/engraving/libmscore/barline.cpp
@@ -1539,7 +1539,7 @@ PropertyValue BarLine::propertyDefault(Pid propertyId) const
{
switch (propertyId) {
case Pid::BARLINE_TYPE:
-// dynamic default values are a bad idea: writing to xml the value maybe ommited resulting in
+// dynamic default values are a bad idea: writing to xml the value maybe omitted resulting in
// wrong values on read (as the default may be different on read)
// if (segment() && segment()->measure() && !segment()->measure()->nextMeasure())
// return QVariant::fromValue(BarLineType::END);
diff --git a/src/engraving/libmscore/box.cpp b/src/engraving/libmscore/box.cpp
index 55547375b4..71eb083297 100644
--- a/src/engraving/libmscore/box.cpp
+++ b/src/engraving/libmscore/box.cpp
@@ -838,7 +838,7 @@ void VBox::layout()
void VBox::adjustLayoutWithoutImages()
{
- qreal calcuatedVBoxHeight = 0;
+ qreal calculatedVBoxHeight = 0;
const int padding = score()->spatium();
auto elementList = el();
@@ -846,11 +846,11 @@ void VBox::adjustLayoutWithoutImages()
if (pElement->isText()) {
Text* txt = toText(pElement);
txt->bbox().moveTop(0);
- calcuatedVBoxHeight += txt->height() + padding;
+ calculatedVBoxHeight += txt->height() + padding;
}
}
- setHeight(calcuatedVBoxHeight);
+ setHeight(calculatedVBoxHeight);
Box::layout();
}
diff --git a/src/engraving/libmscore/box.h b/src/engraving/libmscore/box.h
index c472097144..4303b55cf2 100644
--- a/src/engraving/libmscore/box.h
+++ b/src/engraving/libmscore/box.h
@@ -105,7 +105,7 @@ public:
int gripsCount() const override { return 1; }
Grip initialEditModeGrip() const override { return Grip::START; }
Grip defaultGrip() const override { return Grip::START; }
- std::vector gripsPositions(const EditData&) const override { return { mu::PointF() }; } // overriden in descendants
+ std::vector gripsPositions(const EditData&) const override { return { mu::PointF() }; } // overridden in descendants
};
//---------------------------------------------------------
diff --git a/src/engraving/libmscore/changeMap.cpp b/src/engraving/libmscore/changeMap.cpp
index dc52160023..9f85c01a00 100644
--- a/src/engraving/libmscore/changeMap.cpp
+++ b/src/engraving/libmscore/changeMap.cpp
@@ -216,7 +216,7 @@ void ChangeMap::cleanupStage0()
if (int(rampEvents.size()) > 1) {
// Sort rampEvents so that the longest ramps come first -
- // this is important for when we remove ramps/fixes enclosed wihtin other
+ // this is important for when we remove ramps/fixes enclosed within other
// ramps during stage 1.
std::sort(rampEvents.begin(), rampEvents.end(), ChangeMap::compareRampEvents);
for (auto& event : rampEvents) {
diff --git a/src/engraving/libmscore/chord.cpp b/src/engraving/libmscore/chord.cpp
index 2998076db7..f5dccf8998 100644
--- a/src/engraving/libmscore/chord.cpp
+++ b/src/engraving/libmscore/chord.cpp
@@ -180,7 +180,7 @@ int Chord::downLine() const
// (i.e., upside-down TAB are taken into account)
//
// If no staff, always return 0
-// If staf is not a TAB, always returns TOP and BOTTOM staff lines
+// If staff is not a TAB, always returns TOP and BOTTOM staff lines
//---------------------------------------------------------
int Chord::upString() const
diff --git a/src/engraving/libmscore/clef.cpp b/src/engraving/libmscore/clef.cpp
index f6186f960c..9096a99da1 100644
--- a/src/engraving/libmscore/clef.cpp
+++ b/src/engraving/libmscore/clef.cpp
@@ -181,7 +181,7 @@ void Clef::layout()
case ClefType::TAB: // TAB clef
// on tablature, position clef at half the number of spaces * line distance
yoff = lineDist * (lines - 1) * .5;
- stepOffset = 0; // ignore stepOffset for TAB and pecussion clefs
+ stepOffset = 0; // ignore stepOffset for TAB and percussion clefs
break;
case ClefType::TAB4: // TAB clef 4 strings
// on tablature, position clef at half the number of spaces * line distance
diff --git a/src/engraving/libmscore/cmd.cpp b/src/engraving/libmscore/cmd.cpp
index 79d2cded38..9ccf320c30 100644
--- a/src/engraving/libmscore/cmd.cpp
+++ b/src/engraving/libmscore/cmd.cpp
@@ -294,7 +294,7 @@ void Score::undoRedo(bool undo, EditData* ed)
//---------------------------------------------------------
// endCmd
-/// End a GUI command by (if \a undo) ending a user-visble undo
+/// End a GUI command by (if \a undo) ending a user-visible undo
/// and (always) updating the redraw area.
//---------------------------------------------------------
@@ -3383,7 +3383,7 @@ void Score::cmdSlashFill()
for (voice = 0; voice < VOICES; ++voice) {
needGap[voice] = false;
ChordRest* cr = toChordRest(s->element(track + voice));
- // no chordrest == treat as ordinary rest for purpose of determining availbility of voice
+ // no chordrest == treat as ordinary rest for purpose of determining availability of voice
// but also, we will need to make a gap for this voice if we do end up choosing it
if (!cr) {
needGap[voice] = true;
@@ -3942,7 +3942,7 @@ void Score::cmdPitchDownOctave()
}
//---------------------------------------------------------
-// cmdPadNoteInclreaseTAB
+// cmdPadNoteIncreaseTAB
//---------------------------------------------------------
void Score::cmdPadNoteIncreaseTAB(const EditData& ed)
diff --git a/src/engraving/libmscore/durationtype.cpp b/src/engraving/libmscore/durationtype.cpp
index bc55d4ceed..dd3af2136c 100644
--- a/src/engraving/libmscore/durationtype.cpp
+++ b/src/engraving/libmscore/durationtype.cpp
@@ -428,7 +428,7 @@ void TDuration::truncateToFraction(const Fraction& l, int maxDots)
// that wasn't enough so now change type too
for (shiftType(1); isValid(); shiftType(1)) {
if (setDotsToFitFraction(l, maxDots)) {
- return; // duration fits fits in l
+ return; // duration fits in l
}
}
}
diff --git a/src/engraving/libmscore/easeInOut.cpp b/src/engraving/libmscore/easeInOut.cpp
index 7c0829fae1..fc7cf4fa43 100644
--- a/src/engraving/libmscore/easeInOut.cpp
+++ b/src/engraving/libmscore/easeInOut.cpp
@@ -22,7 +22,7 @@
/**
\file
- Implementation of classe easeInOut for implementing transfer curve with
+ Implementation of class EaseInOut for implementing transfer curve with
parametrerable ease-In and ease-Out.
*/
@@ -36,7 +36,7 @@ namespace Ms {
//-------------------------------------------------------------------------------------------------
// The following function is inspired by "A Primer on Bézier Curve" sections 17 and 23 by Pomax:
// https://pomax.github.io/bezierinfo/
-// However, the fuction is greatly specialized, simplified and optimized for use as an ease-in and
+// However, the function is greatly specialized, simplified and optimized for use as an ease-in and
// ease-out transfer curve for bends, glissandi and portamenti in MuseScore. The function computes
// Y from X by performing a cubic root finding to compute t from X on the X component of the
// transfer curve and then a cubic Bezier evaluation to compute Y from t on the Y component of the
diff --git a/src/engraving/libmscore/edit.cpp b/src/engraving/libmscore/edit.cpp
index d9d68542dc..057a2c6ee3 100644
--- a/src/engraving/libmscore/edit.cpp
+++ b/src/engraving/libmscore/edit.cpp
@@ -1372,7 +1372,7 @@ void Score::cmdRemoveTimeSig(TimeSig* ts)
Fraction tick = m->tick();
// if we remove all time sigs from segment, segment will be already removed by now
- // but this would leave us no means of detecting that we have have measures in a local timesig
+ // but this would leave us no means of detecting that we have measures in a local timesig
// in cases where we try deleting the local time sig
// known bug: this means we do not correctly detect non-empty measures when deleting global timesig change after a local one
// see http://musescore.org/en/node/51596
@@ -3739,7 +3739,7 @@ MeasureBase* Score::insertMeasure(ElementType type, MeasureBase* beforeMeasure,
}
//
- // move clef, time, key signatrues
+ // move clef, time, key signatures
//
for (TimeSig* ts : tsl) {
TimeSig* nts = Factory::copyTimeSig(*ts);
@@ -5091,7 +5091,7 @@ void Score::undoInsertStaff(Staff* staff, staff_idx_t ridx, bool createRests)
// when newly adding an instrument,
// this was already set when we created the staff
// we don't have any better info at this point
- // and it dooesn't work to adjust bracket & barlines until all staves are added
+ // and it doesn't work to adjust bracket & barlines until all staves are added
// TODO: adjust brackets only when appropriate
//adjustBracketsIns(idx, idx+1);
}
diff --git a/src/engraving/libmscore/engravingitem.cpp b/src/engraving/libmscore/engravingitem.cpp
index 0ad6cf23c9..1623470252 100644
--- a/src/engraving/libmscore/engravingitem.cpp
+++ b/src/engraving/libmscore/engravingitem.cpp
@@ -2702,7 +2702,7 @@ void EngravingItem::setSelected(bool f)
setFlag(ElementFlag::SELECTED, f);
if (f) {
- initAccessibeIfNeed();
+ initAccessibleIfNeed();
if (m_accessible) {
AccessibleRoot* accRoot = score()->rootItem()->accessible()->accessibleRoot();
@@ -2723,7 +2723,7 @@ void EngravingItem::setSelected(bool f)
}
}
-void EngravingItem::initAccessibeIfNeed()
+void EngravingItem::initAccessibleIfNeed()
{
if (!engravingConfiguration()->isAccessibleEnabled()) {
return;
diff --git a/src/engraving/libmscore/engravingitem.h b/src/engraving/libmscore/engravingitem.h
index 15441fdb4c..dc3f531751 100644
--- a/src/engraving/libmscore/engravingitem.h
+++ b/src/engraving/libmscore/engravingitem.h
@@ -606,7 +606,7 @@ public:
void setColorsInverionEnabled(bool enabled);
private:
- void initAccessibeIfNeed();
+ void initAccessibleIfNeed();
};
using ElementPtr = std::shared_ptr;
diff --git a/src/engraving/libmscore/factory.cpp b/src/engraving/libmscore/factory.cpp
index 94c7ba5a7a..1124bbfaaa 100644
--- a/src/engraving/libmscore/factory.cpp
+++ b/src/engraving/libmscore/factory.cpp
@@ -370,7 +370,7 @@ EngravingItem* Factory::createItemByName(const QStringRef& name, EngravingItem*
{
ElementType type = name2type(name, isAccessibleEnabled);
if (type == ElementType::INVALID) {
- LOGE() << "Invalide type: " << name.toString();
+ LOGE() << "Invalid type: " << name.toString();
return 0;
}
return createItem(type, parent, isAccessibleEnabled);
diff --git a/src/engraving/libmscore/figuredbass.h b/src/engraving/libmscore/figuredbass.h
index 6db00e458d..9fdd7055d1 100644
--- a/src/engraving/libmscore/figuredbass.h
+++ b/src/engraving/libmscore/figuredbass.h
@@ -250,7 +250,7 @@ class FiguredBass final : public TextBase
{
std::vector items; // the individual lines of the F.B.
std::vector _lineLengths; // lengths of duration indicator lines (in raster units)
- bool _onNote; // true if this element is on a staff note | false if it is betweee notes
+ bool _onNote; // true if this element is on a staff note | false if it is between notes
Fraction _ticks; // the duration (used for cont. lines and for multiple F.B.
// under the same note)
qreal _printedLineLength; // the length of lines actually printed (i.e. continuation lines)
diff --git a/src/engraving/libmscore/glissando.cpp b/src/engraving/libmscore/glissando.cpp
index 00047f0b19..8d60956b14 100644
--- a/src/engraving/libmscore/glissando.cpp
+++ b/src/engraving/libmscore/glissando.cpp
@@ -75,7 +75,7 @@ const std::array Glissando::glissandoTypeNames = {
};
//=========================================================
-// GlisandoSegment
+// GlissandoSegment
//=========================================================
GlissandoSegment::GlissandoSegment(Glissando* sp, System* parent)
diff --git a/src/engraving/libmscore/harmony.cpp b/src/engraving/libmscore/harmony.cpp
index d273d14b5b..609a80aff3 100644
--- a/src/engraving/libmscore/harmony.cpp
+++ b/src/engraving/libmscore/harmony.cpp
@@ -939,7 +939,7 @@ void Harmony::endEdit(EditData& ed)
_realizedHarmony.setDirty(true);
// render and layout chord symbol
- // (needs to be done here if text hasn't changed, or redone if replacemens were performed above)
+ // (needs to be done here if text hasn't changed, or redone if replacements were performed above)
score()->startCmd();
setHarmony(s);
layout1();
diff --git a/src/engraving/libmscore/harmony.h b/src/engraving/libmscore/harmony.h
index f66667aa77..36d3d02ae3 100644
--- a/src/engraving/libmscore/harmony.h
+++ b/src/engraving/libmscore/harmony.h
@@ -94,7 +94,7 @@ class Harmony final : public TextBase
ParsedChord* _parsedForm; // parsed form of chord
bool _isMisspelled = false; // show spell check warning
HarmonyType _harmonyType; // used to control rendering, transposition, export, etc.
- qreal _harmonyHeight; // used for calculating the the height is frame while editing.
+ qreal _harmonyHeight; // used for calculating the height is frame while editing.
mutable RealizedHarmony _realizedHarmony; // the realized harmony used for playback
diff --git a/src/engraving/libmscore/instrument.cpp b/src/engraving/libmscore/instrument.cpp
index 6c86efc99e..203fa2ba57 100644
--- a/src/engraving/libmscore/instrument.cpp
+++ b/src/engraving/libmscore/instrument.cpp
@@ -43,7 +43,7 @@ using namespace mu;
using namespace mu::engraving;
namespace Ms {
-//: Channel name for otherwise unamed channels
+//: Channel name for otherwise unnamed channels
const char* Channel::DEFAULT_NAME = QT_TRANSLATE_NOOP("InstrumentsXML", "normal");
//: Channel name for the chord symbols playback channel, best keep translation shorter than 11 letters
const char* Channel::HARMONY_NAME = QT_TRANSLATE_NOOP("InstrumentsXML", "harmony");
diff --git a/src/engraving/libmscore/keysig.cpp b/src/engraving/libmscore/keysig.cpp
index a42d05463e..0ea9df3e25 100644
--- a/src/engraving/libmscore/keysig.cpp
+++ b/src/engraving/libmscore/keysig.cpp
@@ -116,8 +116,8 @@ void KeySig::addLayout(SymId sym, int line)
SmuflAnchorId previousCutout = isAscending ? SmuflAnchorId::cutOutNE : SmuflAnchorId::cutOutSE;
PointF cutout = symSmuflAnchor(sym, currentCutout);
qreal currentCutoutY = line * step + cutout.y();
- qreal previousCoutoutY = previous.line * step + symSmuflAnchor(previous.sym, previousCutout).y();
- if ((isAscending && currentCutoutY < previousCoutoutY) || (!isAscending && currentCutoutY > previousCoutoutY)) {
+ qreal previousCutoutY = previous.line * step + symSmuflAnchor(previous.sym, previousCutout).y();
+ if ((isAscending && currentCutoutY < previousCutoutY) || (!isAscending && currentCutoutY > previousCutoutY)) {
x -= cutout.x() / _spatium;
}
}
@@ -165,7 +165,7 @@ void KeySig::layout()
int t1 = int(_sig.key());
if (isCustom() && !isAtonal()) {
- // add standard key accidentals first, if neccesary
+ // add standard key accidentals first, if necessary
for (int i = 1; i <= abs(t1) && abs(t1) <= 7; ++i) {
bool drop = false;
for (CustDef& cd: _sig.customKeyDefs()) {
diff --git a/src/engraving/libmscore/layoutbreak.cpp b/src/engraving/libmscore/layoutbreak.cpp
index 94720f4980..071eed4e7a 100644
--- a/src/engraving/libmscore/layoutbreak.cpp
+++ b/src/engraving/libmscore/layoutbreak.cpp
@@ -50,7 +50,7 @@ LayoutBreak::LayoutBreak(MeasureBase* parent)
_pause = 0.;
_startWithLongNames = false;
_startWithMeasureOne = false;
- _firstSystemIdentation = false;
+ _firstSystemIndentation = false;
_layoutBreakType = LayoutBreakType(propertyDefault(Pid::LAYOUT_BREAK).toInt());
initElementStyle(§ionBreakStyle);
@@ -65,12 +65,12 @@ LayoutBreak::LayoutBreak(MeasureBase* parent)
LayoutBreak::LayoutBreak(const LayoutBreak& lb)
: EngravingItem(lb)
{
- _layoutBreakType = lb._layoutBreakType;
- lw = lb.lw;
- _pause = lb._pause;
- _startWithLongNames = lb._startWithLongNames;
- _startWithMeasureOne = lb._startWithMeasureOne;
- _firstSystemIdentation = lb._firstSystemIdentation;
+ _layoutBreakType = lb._layoutBreakType;
+ lw = lb.lw;
+ _pause = lb._pause;
+ _startWithLongNames = lb._startWithLongNames;
+ _startWithMeasureOne = lb._startWithMeasureOne;
+ _firstSystemIndentation = lb._firstSystemIndentation;
layout0();
}
@@ -112,7 +112,8 @@ void LayoutBreak::read(XmlReader& e)
readProperty(e, Pid::START_WITH_LONG_NAMES);
} else if (tag == "startWithMeasureOne") {
readProperty(e, Pid::START_WITH_MEASURE_ONE);
- } else if (tag == "firstSystemIdentation") {
+ } else if (tag == "firstSystemIndentation"
+ || tag == "firstSystemIdentation" /* pre-4.0 typo */) {
readProperty(e, Pid::FIRST_SYSTEM_INDENTATION);
} else if (!EngravingItem::readProperties(e)) {
e.unknown();
@@ -279,7 +280,7 @@ PropertyValue LayoutBreak::getProperty(Pid propertyId) const
case Pid::START_WITH_MEASURE_ONE:
return _startWithMeasureOne;
case Pid::FIRST_SYSTEM_INDENTATION:
- return _firstSystemIdentation;
+ return _firstSystemIndentation;
default:
return EngravingItem::getProperty(propertyId);
}
@@ -306,7 +307,7 @@ bool LayoutBreak::setProperty(Pid propertyId, const PropertyValue& v)
setStartWithMeasureOne(v.toBool());
break;
case Pid::FIRST_SYSTEM_INDENTATION:
- setFirstSystemIdentation(v.toBool());
+ setFirstSystemIndentation(v.toBool());
break;
default:
if (!EngravingItem::setProperty(propertyId, v)) {
diff --git a/src/engraving/libmscore/layoutbreak.h b/src/engraving/libmscore/layoutbreak.h
index fedeeceaef..ac28ce65a9 100644
--- a/src/engraving/libmscore/layoutbreak.h
+++ b/src/engraving/libmscore/layoutbreak.h
@@ -59,8 +59,8 @@ public:
void setStartWithLongNames(bool v) { _startWithLongNames = v; }
bool startWithMeasureOne() const { return _startWithMeasureOne; }
void setStartWithMeasureOne(bool v) { _startWithMeasureOne = v; }
- bool firstSystemIdentation() const { return _firstSystemIdentation; }
- void setFirstSystemIdentation(bool v) { _firstSystemIdentation = v; }
+ bool firstSystemIndentation() const { return _firstSystemIndentation; }
+ void setFirstSystemIndentation(bool v) { _firstSystemIndentation = v; }
bool isPageBreak() const { return _layoutBreakType == LayoutBreakType::PAGE; }
bool isLineBreak() const { return _layoutBreakType == LayoutBreakType::LINE; }
@@ -92,7 +92,7 @@ private:
qreal _pause;
bool _startWithLongNames;
bool _startWithMeasureOne;
- bool _firstSystemIdentation;
+ bool _firstSystemIndentation;
LayoutBreakType _layoutBreakType;
};
} // namespace Ms
diff --git a/src/engraving/libmscore/lyrics.cpp b/src/engraving/libmscore/lyrics.cpp
index bebe6e6857..b8e36661d2 100644
--- a/src/engraving/libmscore/lyrics.cpp
+++ b/src/engraving/libmscore/lyrics.cpp
@@ -380,7 +380,7 @@ void Lyrics::scanElements(void* data, void (* func)(void*, EngravingItem*), bool
{
func(data, this);
/* DO NOT ADD EITHER THE LYRICSLINE OR THE SEGMENTS: segments are added through the system each belongs to;
- LyricsLine is not needed, as it is internally manged.
+ LyricsLine is not needed, as it is internally managed.
if (_separator)
_separator->scanElements(data, func, all); */
}
diff --git a/src/engraving/libmscore/lyrics.h b/src/engraving/libmscore/lyrics.h
index ff71982348..e2a5e54ba0 100644
--- a/src/engraving/libmscore/lyrics.h
+++ b/src/engraving/libmscore/lyrics.h
@@ -44,7 +44,7 @@ public:
// MELISMA FIRST UNDERSCORE:
// used as_ticks value to mark a melisma for which only the first chord has been spanned so far
- // and to give the user a visible feedback that the undercore has been actually entered;
+ // and to give the user a visible feedback that the underscore has been actually entered;
// it should be cleared to 0 at some point, so that it will not be carried over
// if the melisma is not extended beyond a single chord, but no suitable place to do this
// has been identified yet.
diff --git a/src/engraving/libmscore/masterscore.h b/src/engraving/libmscore/masterscore.h
index be57ad3381..c8cb066a43 100644
--- a/src/engraving/libmscore/masterscore.h
+++ b/src/engraving/libmscore/masterscore.h
@@ -98,7 +98,7 @@ class MasterScore : public Score
QQueue _midiInputQueue; // MIDI events that have yet to be processed
std::list _activeMidiPitches; // MIDI keys currently being held down
std::vector _midiMapping;
- bool isSimpleMidiMaping = false; // midi mapping is simple if all ports and channels
+ bool isSimpleMidiMapping = false; // midi mapping is simple if all ports and channels
// don't decrease and don't have gaps
QSet occupiedMidiChannels; // each entry is port*16+channel, port range: 0-inf, channel: 0-15
unsigned int searchMidiMappingFrom = 0; // makes getting next free MIDI mapping faster
@@ -194,7 +194,7 @@ public:
int midiChannel(int idx) const { return _midiMapping[idx].channel(); }
void rebuildMidiMapping();
void checkMidiMapping();
- bool exportMidiMapping() { return !isSimpleMidiMaping; }
+ bool exportMidiMapping() { return !isSimpleMidiMapping; }
int getNextFreeMidiMapping(int p = -1, int ch = -1);
int getNextFreeDrumMidiMapping();
void enqueueMidiEvent(MidiInputEvent ev) { _midiInputQueue.enqueue(ev); }
diff --git a/src/engraving/libmscore/measure.cpp b/src/engraving/libmscore/measure.cpp
index c9ca7bfcfe..ad381e82df 100644
--- a/src/engraving/libmscore/measure.cpp
+++ b/src/engraving/libmscore/measure.cpp
@@ -551,12 +551,12 @@ qreal Measure::tick2pos(Fraction tck) const
//---------------------------------------------------------
// showsMeasureNumberInAutoMode
-/// Wheter the measure will show measure number(s) when MeasureNumberMode is set to AUTO
+/// Whether the measure will show measure number(s) when MeasureNumberMode is set to AUTO
//---------------------------------------------------------
bool Measure::showsMeasureNumberInAutoMode()
{
- // Check wheter any measure number should be shown
+ // Check whether any measure number should be shown
if (!score()->styleB(Sid::showMeasureNumber)) {
return false;
}
@@ -2331,7 +2331,7 @@ bool Measure::hasVoices(staff_idx_t staffIdx, Fraction stick, Fraction len) cons
{
Staff* st = score()->staff(staffIdx);
if (st->isTabStaff(stick)) {
- // TODO: tab staves use different rules for stem directin etc
+ // TODO: tab staves use different rules for stem direction etc
// see for example https://musescore.org/en/node/308371
// we should consider coming up with a more comprehensive solution
// but for now, we are forcing measures on tab staves to be consider as a whole -
@@ -4542,11 +4542,11 @@ void Measure::stretchMeasureInPracticeMode(qreal targetWidth)
// }
qreal spacing = s->spacing();
- qreal widthWihoutSpacing = s->width() - spacing;
+ qreal widthWithoutSpacing = s->width() - spacing;
qreal segmentStretch = s->stretch();
x += spacing * (RealIsNull(segmentStretch) ? 1 : segmentStretch);
s->rxpos() = x;
- x += widthWihoutSpacing * (RealIsNull(segmentStretch) ? 1 : segmentStretch);
+ x += widthWithoutSpacing * (RealIsNull(segmentStretch) ? 1 : segmentStretch);
s = s->nextEnabled();
}
}
diff --git a/src/engraving/libmscore/midimapping.cpp b/src/engraving/libmscore/midimapping.cpp
index 5a7dd879cc..c69f4b87e3 100644
--- a/src/engraving/libmscore/midimapping.cpp
+++ b/src/engraving/libmscore/midimapping.cpp
@@ -58,7 +58,7 @@ void MasterScore::rebuildMidiMapping()
void MasterScore::checkMidiMapping()
{
- isSimpleMidiMaping = true;
+ isSimpleMidiMapping = true;
rebuildMidiMapping();
std::vector drum;
@@ -81,7 +81,7 @@ void MasterScore::checkMidiMapping()
if (drum[index]) {
lastDrumPort++;
if (m.port() != lastDrumPort) {
- isSimpleMidiMaping = false;
+ isSimpleMidiMapping = false;
return;
}
} else {
@@ -92,7 +92,7 @@ void MasterScore::checkMidiMapping()
int p = lastChannel / 16;
int c = lastChannel % 16;
if (m.port() != p || m.channel() != c) {
- isSimpleMidiMaping = false;
+ isSimpleMidiMapping = false;
return;
}
}
diff --git a/src/engraving/libmscore/note.cpp b/src/engraving/libmscore/note.cpp
index 0bacd3bcf5..71962aa041 100644
--- a/src/engraving/libmscore/note.cpp
+++ b/src/engraving/libmscore/note.cpp
@@ -2194,7 +2194,7 @@ void Note::layout()
if (_ghost) {
parenthesis = true;
}
- // not complete but we need systems to be layouted to add parenthesis
+ // not complete but we need systems to be laid out to add parenthesis
if (_fixed) {
_fretString = "/";
} else {
@@ -2417,7 +2417,7 @@ void Note::updateAccidental(AccidentalState* as)
} else {
// microtonal accidentals playback as naturals
// in 1.X, they had no effect on accidental state of measure
- // ultimetely, they should probably get their own state
+ // ultimately, they should probably get their own state
// for now, at least change state to natural, so subsequent notes playback as might be expected
// this is an incompatible change, but better to break it for 2.0 than wait until later
AccidentalVal accVal = Accidental::subtype2value(_accidental->accidentalType());
@@ -2677,7 +2677,7 @@ int Note::playingOctave() const
//---------------------------------------------------------
// customizeVelocity
// Input is the global velocity determined by dynamic
-// signs and crescende/decrescendo etc.
+// signs and crescendo/decrescendo etc.
// Returns the actual play velocity for this note
// modified by veloOffset
//---------------------------------------------------------
diff --git a/src/engraving/libmscore/note.h b/src/engraving/libmscore/note.h
index 68ad1fa9f4..b384cd9700 100644
--- a/src/engraving/libmscore/note.h
+++ b/src/engraving/libmscore/note.h
@@ -152,7 +152,7 @@ public:
Note* endNote = nullptr; // note to end slide (for 2 notes slides)
bool isValid() const { return type != SlideType::Undefined; }
bool is(SlideType t) const { return t == type; }
- uint32_t slideToNoteLenght = 40;
+ uint32_t slideToNoteLength = 40;
};
enum DisplayFretOption {
diff --git a/src/engraving/libmscore/noteentry.cpp b/src/engraving/libmscore/noteentry.cpp
index 1f421dd9eb..2c8392e48b 100644
--- a/src/engraving/libmscore/noteentry.cpp
+++ b/src/engraving/libmscore/noteentry.cpp
@@ -226,7 +226,7 @@ Note* Score::addPitch(NoteVal& nval, bool addFlag, InputState* externalInputStat
std::vector notes = chord->notes();
// break all ties into current chord
// these will exist only if user explicitly moved cursor to a tied-into note
- // in ordinary use, cursor will autoamtically skip past these during note entry
+ // in ordinary use, cursor will automatically skip past these during note entry
for (Note* n : notes) {
if (n->tieBack()) {
undoRemoveElement(n->tieBack());
@@ -563,7 +563,7 @@ void Score::repitchNote(const Position& p, bool replace)
std::vector notes = chord->notes();
// break all ties into current chord
// these will exist only if user explicitly moved cursor to a tied-into note
- // in ordinary use, cursor will autoamtically skip past these during note entry
+ // in ordinary use, cursor will automatically skip past these during note entry
for (Note* n : notes) {
if (n->tieBack()) {
undoRemoveElement(n->tieBack());
diff --git a/src/engraving/libmscore/paste.cpp b/src/engraving/libmscore/paste.cpp
index d89aae38d8..df5680ec83 100644
--- a/src/engraving/libmscore/paste.cpp
+++ b/src/engraving/libmscore/paste.cpp
@@ -494,7 +494,7 @@ bool Score::pasteStaff(XmlReader& e, Segment* dst, staff_idx_t dstStaff, Fractio
if (sp->anchor() == Spanner::Anchor::CHORD || sp->anchor() == Spanner::Anchor::NOTE) {
continue;
}
- // skip if present oiginally
+ // skip if present originally
auto i = std::find(oSpannerList.begin(), oSpannerList.end(), sp);
if (i != oSpannerList.end()) {
continue;
diff --git a/src/engraving/libmscore/pitchspelling.h b/src/engraving/libmscore/pitchspelling.h
index 82b71a3d3d..f3e51675ba 100644
--- a/src/engraving/libmscore/pitchspelling.h
+++ b/src/engraving/libmscore/pitchspelling.h
@@ -32,7 +32,7 @@ enum class Key;
const int INVALID_PITCH = -1;
-// a list of tpc's, with legal ranges, not really an enum, so no way to cnvert into a class
+// a list of tpc's, with legal ranges, not really an enum, so no way to convert into a class
enum Tpc : signed char {
TPC_INVALID = -9,
TPC_F_BBB, TPC_C_BBB, TPC_G_BBB, TPC_D_BBB, TPC_A_BBB, TPC_E_BBB, TPC_B_BBB,
diff --git a/src/engraving/libmscore/rendermidi.cpp b/src/engraving/libmscore/rendermidi.cpp
index cf3924e633..4e384e8632 100644
--- a/src/engraving/libmscore/rendermidi.cpp
+++ b/src/engraving/libmscore/rendermidi.cpp
@@ -1546,7 +1546,7 @@ int convertLine(int lineL2, Note* noteL, Note* noteR)
// noteL is the note to measure the deltastep from, i.e., ornaments are w.r.t. this note
// noteR is the note to search backward from to find accidentals.
// for ornament calculation noteL and noteR are the same, but for glissando they are
-// the start end end note of glissando.
+// the start and end note of glissando.
// deltastep is the desired number of diatonic steps between the base note and this articulation step.
//---------------------------------------------------------
@@ -1847,7 +1847,7 @@ bool renderNoteArticulation(NoteEventList* events, Note* note, bool chromatic, i
// body - notes to play comprising the body of the rendered ornament.
// The body differs from the prefix and suffix in several ways.
// * body does not support tied notes: {0,0,0,1} means play 4 distinct notes (not tied).
-// * if there is sufficient duration in the principle note, AND repeatep is true, then body
+// * if there is sufficient duration in the principle note, AND repeatp is true, then body
// will be rendered multiple times, as the duration allows.
// * to avoid a time gap (or rest) in rendering the articulation, if sustainp is true,
// then the final note of the body will be sustained to fill the left-over time.
@@ -2321,7 +2321,7 @@ void Score::createPlayEvents(Chord* chord)
break;
}
}
- // gateTime is 100% for slured notes
+ // gateTime is 100% for slurred notes
if (!slur) {
Instrument* instr = chord->part()->instrument(tick);
instr->updateGateTime(&gateTime, 0, "");
diff --git a/src/engraving/libmscore/repeatlist.cpp b/src/engraving/libmscore/repeatlist.cpp
index 5c77c59c7e..71f34e1884 100644
--- a/src/engraving/libmscore/repeatlist.cpp
+++ b/src/engraving/libmscore/repeatlist.cpp
@@ -702,7 +702,7 @@ std::pair::const_iterator, RepeatListElementL
/// \brief RepeatList::performJump
/// \param sectionIt [in] Section of the jump target
/// \param repeatListElementTargetIt [in] RepeatListElement of the jump target within the section
-/// \param withRepeats [in] Whether first or last playtrough of the target is the actual target, influences playbackCount
+/// \param withRepeats [in] Whether first or last playthrough of the target is the actual target, influences playbackCount
/// \param playbackCount [out] Will contain the resulting playbackCount value
/// \param activeVolta [out] Contains a reference to the active Volta for jump target
/// \param startRepeatReference [out] Reference point to return to and compare against for jump target
@@ -889,23 +889,23 @@ void RepeatList::unwind()
|| ((activeVolta != nullptr) && (playbackCount == activeVolta->lastEnding()))
) {
std::pair jumpOccurence = std::make_pair(toJump((*repeatListElementIt)->element), playbackCount);
- if (_jumpsTaken.find(jumpOccurence) == _jumpsTaken.end()) { // Not yet processed
+ int> jumpOccurrence = std::make_pair(toJump((*repeatListElementIt)->element), playbackCount);
+ if (_jumpsTaken.find(jumpOccurrence) == _jumpsTaken.end()) { // Not yet processed
// Processing it now
- _jumpsTaken.insert(jumpOccurence);
+ _jumpsTaken.insert(jumpOccurrence);
// Find the jump targets
std::pair::const_iterator,
RepeatListElementList::const_iterator> jumpTo = findMarker(
- jumpOccurence.first->jumpTo(), sectionIt, repeatListElementIt);
- playUntil = findMarker(jumpOccurence.first->playUntil(), sectionIt, repeatListElementIt);
- continueAt = findMarker(jumpOccurence.first->continueAt(), sectionIt, repeatListElementIt);
+ jumpOccurrence.first->jumpTo(), sectionIt, repeatListElementIt);
+ playUntil = findMarker(jumpOccurrence.first->playUntil(), sectionIt, repeatListElementIt);
+ continueAt = findMarker(jumpOccurrence.first->continueAt(), sectionIt, repeatListElementIt);
// Execute
if (jumpTo.first != _rlElements.cend()) {
push_back(rs);
rs = nullptr;
- activeJump = jumpOccurence.first;
+ activeJump = jumpOccurrence.first;
performJump(jumpTo.first, jumpTo.second,
activeJump->playRepeats(), &playbackCount, &activeVolta, &startRepeatReference);
sectionIt = jumpTo.first;
diff --git a/src/engraving/libmscore/score.cpp b/src/engraving/libmscore/score.cpp
index 3d20431aaf..65c338b76b 100644
--- a/src/engraving/libmscore/score.cpp
+++ b/src/engraving/libmscore/score.cpp
@@ -449,7 +449,7 @@ void Score::notifyPosChanged(POS pos, unsigned ticks)
Score* Score::clone()
{
- // TODO: see comments reagrding setting version in corresponding code in 3.x branch
+ // TODO: see comments regarding setting version in corresponding code in 3.x branch
// and also compare to MasterScore::clone()
Excerpt* excerpt = new Excerpt(masterScore());
excerpt->setName(name());
diff --git a/src/engraving/libmscore/scorefont.cpp b/src/engraving/libmscore/scorefont.cpp
index 071f591137..51607519bf 100644
--- a/src/engraving/libmscore/scorefont.cpp
+++ b/src/engraving/libmscore/scorefont.cpp
@@ -632,7 +632,7 @@ bool ScoreFont::useFallbackFont(SymId id) const
}
// =============================================
-// Symbol bouding box
+// Symbol bounding box
// =============================================
const RectF ScoreFont::bbox(SymId id, qreal mag) const
diff --git a/src/engraving/libmscore/scoretree.cpp b/src/engraving/libmscore/scoretree.cpp
index 0a55a1fbd4..ce2ea923ee 100644
--- a/src/engraving/libmscore/scoretree.cpp
+++ b/src/engraving/libmscore/scoretree.cpp
@@ -268,8 +268,8 @@ EngravingObjectList Segment::scanChildren() const
}
}
- for (EngravingItem* anotation : _annotations) {
- children.push_back(anotation);
+ for (EngravingItem* annotation : _annotations) {
+ children.push_back(annotation);
}
if (segmentType() == SegmentType::ChordRest) {
diff --git a/src/engraving/libmscore/segment.cpp b/src/engraving/libmscore/segment.cpp
index bb7e753ae8..d95b0353fa 100644
--- a/src/engraving/libmscore/segment.cpp
+++ b/src/engraving/libmscore/segment.cpp
@@ -2371,7 +2371,7 @@ std::pair Segment::computeCellWidth(const std::vector& visibl
Chord* ch = toChord(cr);
//! check that gracenote exist. If exist add additional spacing
- //! to avoid colliding between grace note and previos chord
+ //! to avoid colliding between grace note and previous chord
if (!ch->graceNotes().empty()) {
Segment* prevSeg = prev();
if (prevSeg && prevSeg->segmentType() == SegmentType::ChordRest) {
@@ -2385,7 +2385,7 @@ std::pair Segment::computeCellWidth(const std::vector& visibl
}
//! check that accidental exist in the chord. If exist add additional spacing
- //! to avoid colliding between grace note and previos chord
+ //! to avoid colliding between grace note and previous chord
for (auto note : ch->notes()) {
if (note->accidental()) {
Segment* prevSeg = prev();
diff --git a/src/engraving/libmscore/segment.h b/src/engraving/libmscore/segment.h
index 65df357d0c..99975bb71f 100644
--- a/src/engraving/libmscore/segment.h
+++ b/src/engraving/libmscore/segment.h
@@ -261,7 +261,7 @@ public:
*/
std::pair computeCellWidth(const std::vector& visibleParts) const;
- /*! \brief get among all ChordRests of segment the ChordRest with minimun ticks,
+ /*! \brief get among all ChordRests of segment the ChordRest with minimum ticks,
* take into account visibleParts
*/
static ChordRest* ChordRestWithMinDuration(const Segment* seg, const std::vector& visibleParts);
diff --git a/src/engraving/libmscore/select.cpp b/src/engraving/libmscore/select.cpp
index cd87ec78f9..6ec302e887 100644
--- a/src/engraving/libmscore/select.cpp
+++ b/src/engraving/libmscore/select.cpp
@@ -1076,7 +1076,7 @@ QByteArray Selection::symbolListMimeData() const
bool done = false;
for (; seg; seg = seg->next1()) {
if (seg->isChordRestType()) {
- // if no ChordRest in right track, look in anotations
+ // if no ChordRest in right track, look in annotations
if (seg->element(currTrack) == nullptr) {
foreach (EngravingItem* el, seg->annotations()) {
// do annotations include our element?
diff --git a/src/engraving/libmscore/shadownote.cpp b/src/engraving/libmscore/shadownote.cpp
index 15d2db7cce..31f58f4820 100644
--- a/src/engraving/libmscore/shadownote.cpp
+++ b/src/engraving/libmscore/shadownote.cpp
@@ -303,17 +303,17 @@ void ShadowNote::layout()
qreal w = noteheadBbox.width();
qreal stemWidth = score()->styleMM(Sid::stemWidth);
- qreal stemLenght = (up ? -3.5 : 3.5) * _spatium;
+ qreal stemLength = (up ? -3.5 : 3.5) * _spatium;
qreal stemAnchor = symSmuflAnchor(m_noteheadSymbol, up ? SmuflAnchorId::stemUpSE : SmuflAnchorId::stemDownNW).y();
newBbox |= RectF(up ? x + w - stemWidth : x,
stemAnchor,
stemWidth,
- stemLenght - stemAnchor);
+ stemLength - stemAnchor);
if (hasFlag()) {
RectF flagBbox = symBbox(flagSym());
newBbox |= RectF(up ? x + w - stemWidth : x,
- stemAnchor + stemLenght + flagBbox.y(),
+ stemAnchor + stemLength + flagBbox.y(),
flagBbox.width(),
flagBbox.height());
}
diff --git a/src/engraving/libmscore/shape.cpp b/src/engraving/libmscore/shape.cpp
index 393837edcd..be79089f29 100644
--- a/src/engraving/libmscore/shape.cpp
+++ b/src/engraving/libmscore/shape.cpp
@@ -180,7 +180,7 @@ qreal Shape::minHorizontalDistance(const Shape& a, Score* score) const
sameVoiceCases = sameVoiceExceptions(item1, item2);
limitedKerning = limitedKerningExceptions(item1, item2);
}
- if (sameVoiceCases // padding for note-note and note-stem needs needs this exception
+ if (sameVoiceCases // padding for note-note and note-stem needs this exception
&& Ms::intersects(ay1, ay2, by1, by2, verticalClearance)
&& (item2->isNote() || item2->isStem())) {
padding = std::max(padding, double(score->styleMM(Sid::minNoteDistance)));
diff --git a/src/engraving/libmscore/shape.h b/src/engraving/libmscore/shape.h
index 1360cc8ff1..2d24e318db 100644
--- a/src/engraving/libmscore/shape.h
+++ b/src/engraving/libmscore/shape.h
@@ -112,7 +112,7 @@ public:
// intersects
//---------------------------------------------------------
-inline static bool intersects(qreal a, qreal b, qreal c, qreal d, qreal verticalClearence)
+inline static bool intersects(qreal a, qreal b, qreal c, qreal d, qreal verticalClearance)
{
// return (a >= c && a < d) || (b >= c && b < d) || (a < c && b >= b);
// return (std::max(a,b) > std::min(c,d)) && (std::min(a,b) < std::max(c,d));
@@ -120,7 +120,7 @@ inline static bool intersects(qreal a, qreal b, qreal c, qreal d, qreal vertical
if (a == b || c == d) { // zero height
return false;
}
- return (b + verticalClearence > c) && (a < d + verticalClearence);
+ return (b + verticalClearance > c) && (a < d + verticalClearance);
}
} // namespace Ms
diff --git a/src/engraving/libmscore/slur.cpp b/src/engraving/libmscore/slur.cpp
index f6574a629d..42283a8bc3 100644
--- a/src/engraving/libmscore/slur.cpp
+++ b/src/engraving/libmscore/slur.cpp
@@ -73,7 +73,7 @@ void SlurSegment::draw(mu::draw::Painter* painter) const
qreal mag = staff() ? staff()->staffMag(slur()->tick()) : 1.0;
//Replace generic Qt dash patterns with improved equivalents to show true dots (keep in sync with tie.cpp)
- std::vector dotted = { 0.01, 1.99 }; // tighter than Qt PenStyle::DotLine equivalent - woud be { 0.01, 2.99 }
+ std::vector dotted = { 0.01, 1.99 }; // tighter than Qt PenStyle::DotLine equivalent - would be { 0.01, 2.99 }
std::vector dashed = { 3.00, 3.00 }; // Compensating for caps. Qt default PenStyle::DashLine is { 4.0, 2.0 }
std::vector wideDashed = { 5.00, 6.00 };
diff --git a/src/engraving/libmscore/spanner.cpp b/src/engraving/libmscore/spanner.cpp
index e5674399a6..29074cdab9 100644
--- a/src/engraving/libmscore/spanner.cpp
+++ b/src/engraving/libmscore/spanner.cpp
@@ -538,7 +538,7 @@ void Spanner::scanElements(void* data, void (* func)(void*, EngravingItem*), boo
}
//---------------------------------------------------------
-// isVisbleCR
+// isVisibleCR
//---------------------------------------------------------
static bool isVisibleCR(EngravingItem* e)
diff --git a/src/engraving/libmscore/splitMeasure.cpp b/src/engraving/libmscore/splitMeasure.cpp
index 170b19816f..915a3526ec 100644
--- a/src/engraving/libmscore/splitMeasure.cpp
+++ b/src/engraving/libmscore/splitMeasure.cpp
@@ -93,7 +93,7 @@ void Score::splitMeasure(Segment* segment)
}
}
- // Make sure ties are the beginning the split measure are restored.
+ // Make sure ties to the beginning of the split measure are restored.
std::vector ties;
for (size_t track = 0; track < ntracks(); track++) {
Chord* chord = measure->findChord(stick, static_cast(track));
@@ -156,7 +156,7 @@ void Score::splitMeasure(Segment* segment)
m2->adjustToLen(ticks2, false);
range.write(this, m1->tick());
- // Restore ties the the beginning of the split measure.
+ // Restore ties to the beginning of the split measure.
for (auto tie : ties) {
tie->setEndNote(searchTieNote(tie->startNote()));
undoAddElement(tie);
diff --git a/src/engraving/libmscore/stafftype.cpp b/src/engraving/libmscore/stafftype.cpp
index 10de07a3b7..60a8a1a656 100644
--- a/src/engraving/libmscore/stafftype.cpp
+++ b/src/engraving/libmscore/stafftype.cpp
@@ -675,7 +675,7 @@ PointF StaffType::chordStemPos(const Chord* chord) const
{
qreal y;
if (stemThrough()) {
- // if stems are through staff, stem goes from fartest note string
+ // if stems are through staff, stem goes from farthest note string
y = (chord->up() ? chord->downString() : chord->upString()) * _lineDistance.val();
} else {
// if stems are beside staff, stem start point has a fixed vertical position,
diff --git a/src/engraving/libmscore/stafftype.h b/src/engraving/libmscore/stafftype.h
index 1ebe203ccf..f30177be69 100644
--- a/src/engraving/libmscore/stafftype.h
+++ b/src/engraving/libmscore/stafftype.h
@@ -75,7 +75,7 @@ class XmlWriter;
// how much to lower a bass string note with slashes with respect to line distance (in fraction of line distance)
#define STAFFTYPE_TAB_BASSSLASH_YOFFSET 0.33
-// The following constants could ideially be customizeable values;
+// The following constants could ideally be customizable values;
// they are currently constants to simplify implementation;
// Note that these constants do not constrain which strings of an instrument are
// physically frettable (which is defined in the instrument itself) but fix the
diff --git a/src/engraving/libmscore/stringdata.cpp b/src/engraving/libmscore/stringdata.cpp
index 61b3444e0f..9dc9052bd1 100644
--- a/src/engraving/libmscore/stringdata.cpp
+++ b/src/engraving/libmscore/stringdata.cpp
@@ -274,7 +274,7 @@ void StringData::fretChords(Chord* chord) const
}
}
- // TODO : try to optimize used fret range, avoiding eccessively open positions
+ // TODO : try to optimize used fret range, avoiding excessively open positions
// if fretting did change, store as a fret change
if (nFret != nNewFret) {
diff --git a/src/engraving/libmscore/synthesizerstate.h b/src/engraving/libmscore/synthesizerstate.h
index 2b98450491..44b5f076fd 100644
--- a/src/engraving/libmscore/synthesizerstate.h
+++ b/src/engraving/libmscore/synthesizerstate.h
@@ -90,7 +90,7 @@ public:
};
//---------------------------------------------------------
-// default buildin SynthesizerState
+// default builtin SynthesizerState
// used if synthesizer.xml does not exist or is not
// readable
//---------------------------------------------------------
diff --git a/src/engraving/libmscore/system.cpp b/src/engraving/libmscore/system.cpp
index 9d731b2e39..3535bbd2ed 100644
--- a/src/engraving/libmscore/system.cpp
+++ b/src/engraving/libmscore/system.cpp
@@ -520,7 +520,7 @@ void System::layoutInstrumentNames()
if (visible != mu::nidx) {
// The top staff might be invisible but this top staff contains the instrument names.
// To make sure these instrument name are drawn, even when the top staff is invisible,
- // move the InstrumentName elements to the the first visible staff of the part.
+ // move the InstrumentName elements to the first visible staff of the part.
if (visible != staffIdx) {
SysStaff* vs = staff(visible);
for (InstrumentName* t : qAsConst(s->instrumentNames)) {
diff --git a/src/engraving/libmscore/tie.cpp b/src/engraving/libmscore/tie.cpp
index 797d44f19d..10751a9293 100644
--- a/src/engraving/libmscore/tie.cpp
+++ b/src/engraving/libmscore/tie.cpp
@@ -77,7 +77,7 @@ void TieSegment::draw(mu::draw::Painter* painter) const
qreal mag = staff() ? staff()->staffMag(tie()->tick()) : 1.0;
//Replace generic Qt dash patterns with improved equivalents to show true dots (keep in sync with slur.cpp)
- std::vector dotted = { 0.01, 1.99 }; // tighter than Qt PenStyle::DotLine equivalent - woud be { 0.01, 2.99 }
+ std::vector dotted = { 0.01, 1.99 }; // tighter than Qt PenStyle::DotLine equivalent - would be { 0.01, 2.99 }
std::vector dashed = { 3.00, 3.00 }; // Compensating for caps. Qt default PenStyle::DashLine is { 4.0, 2.0 }
std::vector wideDashed = { 5.00, 6.00 };
diff --git a/src/engraving/libmscore/types.h b/src/engraving/libmscore/types.h
index 27573dd925..28744fc89d 100644
--- a/src/engraving/libmscore/types.h
+++ b/src/engraving/libmscore/types.h
@@ -175,7 +175,7 @@ using ElementTypeSet = std::unordered_set;
//---------------------------------------------------------
// AccidentalType
//---------------------------------------------------------
-// NOTE: keep this in sync with with accList array in accidentals.cpp
+// NOTE: keep this in sync with accList array in accidentals.cpp
enum class AccidentalType {
///.\{
@@ -496,7 +496,7 @@ constexpr bool operator&(FontStyle a1, FontStyle a2)
//---------------------------------------------------------
// PlayEventType
-/// Determines whether oranaments are automatically generated
+/// Determines whether ornaments are automatically generated
/// when playing a score and whether the PlayEvents are saved
/// in the score file.
//---------------------------------------------------------
diff --git a/src/engraving/libmscore/undo.h b/src/engraving/libmscore/undo.h
index 9f5e91f427..357070b3ba 100644
--- a/src/engraving/libmscore/undo.h
+++ b/src/engraving/libmscore/undo.h
@@ -25,7 +25,7 @@
/**
\file
- Definition of undo-releated classes and structs.
+ Definition of undo-related classes and structs.
*/
#include
diff --git a/src/importexport/musicxml/tests/data/testMaxNumberLevel.mscx b/src/importexport/musicxml/tests/data/testMaxNumberLevel.mscx
index 8faa3fb43d..e6268f398f 100644
--- a/src/importexport/musicxml/tests/data/testMaxNumberLevel.mscx
+++ b/src/importexport/musicxml/tests/data/testMaxNumberLevel.mscx
@@ -254,7 +254,7 @@
Test MAX_NUMBER_LEVEL for all element types using a different implementation
TODO: extend trill line to two measures (currently incorrectly generates a double stop)
-Using MuseScore 3.x (MusicXML 3.1) only 6 levels are suppored
+Using MuseScore 3.x (MusicXML 3.1) only 6 levels are supported
Using MuseScore 4 (MusicXML 4.0) 16 levels are supported
diff --git a/src/importexport/musicxml/tests/data/testMaxNumberLevel_ref.xml b/src/importexport/musicxml/tests/data/testMaxNumberLevel_ref.xml
index 13c4496d36..90a3313034 100644
--- a/src/importexport/musicxml/tests/data/testMaxNumberLevel_ref.xml
+++ b/src/importexport/musicxml/tests/data/testMaxNumberLevel_ref.xml
@@ -119,7 +119,7 @@
TODO: extend trill line to two measures (currently incorrectly generates a double stop)
- Using MuseScore 3.x (MusicXML 3.1) only 6 levels are suppored
+ Using MuseScore 3.x (MusicXML 3.1) only 6 levels are supported
Using MuseScore 4 (MusicXML 4.0) 16 levels are supported
diff --git a/src/importexport/musicxml/tests/tst_mxml_io.cpp b/src/importexport/musicxml/tests/tst_mxml_io.cpp
index 544892f1da..baa2747c70 100644
--- a/src/importexport/musicxml/tests/tst_mxml_io.cpp
+++ b/src/importexport/musicxml/tests/tst_mxml_io.cpp
@@ -153,7 +153,7 @@ private slots:
void helloReadCompr() { mxmlReadTestCompr("testHello"); }
void helloReadWriteCompr() { mxmlReadWriteTestCompr("testHello"); }
void implicitMeasure1() { mxmlIoTest("testImplicitMeasure1"); }
- // void incompleteTuplet() { mxmlIoTestRef("testIncomplteTuplet"); } fails
+ void incompleteTuplet() { mxmlIoTestRef("testIncompleteTuplet"); }
// void incorrectMidiProgram() { mxmlIoTestRef("testIncorrectMidiProgram"); } fails
void incorrectStaffNumber1() { mxmlIoTestRef("testIncorrectStaffNumber1"); }
void incorrectStaffNumber2() { mxmlIoTestRef("testIncorrectStaffNumber2"); }
diff --git a/src/importexport/ove/internal/importove.cpp b/src/importexport/ove/internal/importove.cpp
index c8e344515e..6f35c03dfe 100644
--- a/src/importexport/ove/internal/importove.cpp
+++ b/src/importexport/ove/internal/importove.cpp
@@ -223,7 +223,7 @@ private:
void convertNotes(Measure* measure, int part, int staff, int track);
void convertArticulation(Measure* measure, Chord* cr, int track, int absTick, ovebase::Articulation* art);
void convertLyrics(Measure* measure, int part, int staff, int track);
- void convertHarmonys(Measure* measure, int part, int staff, int track);
+ void convertHarmonies(Measure* measure, int part, int staff, int track);
void convertRepeats(Measure* measure, int part, int staff, int track);
void convertDynamics(Measure* measure, int part, int staff, int track);
void convertExpressions(Measure* measure, int part, int staff, int track);
@@ -1225,7 +1225,7 @@ void OveToMScore::convertMeasure(Measure* measure)
convertMeasureMisc(measure, i, j, trackIndex);
convertNotes(measure, i, j, trackIndex);
convertLyrics(measure, i, j, trackIndex);
- convertHarmonys(measure, i, j, trackIndex);
+ convertHarmonies(measure, i, j, trackIndex);
convertRepeats(measure, i, j, trackIndex);
convertDynamics(measure, i, j, trackIndex);
convertExpressions(measure, i, j, trackIndex);
@@ -2077,17 +2077,17 @@ void OveToMScore::convertLyrics(Measure* measure, int part, int staff, int track
}
}
-void OveToMScore::convertHarmonys(Measure* measure, int part, int staff, int track)
+void OveToMScore::convertHarmonies(Measure* measure, int part, int staff, int track)
{
ovebase::MeasureData* measureData = m_ove->getMeasureData(part, staff, measure->no());
if (measureData == 0) {
return;
}
- QList harmonys = measureData->getMusicDatas(ovebase::MusicDataType::Harmony);
+ QList harmonies = measureData->getMusicDatas(ovebase::MusicDataType::Harmony);
- for (int i = 0; i < harmonys.size(); ++i) {
- ovebase::Harmony* harmonyPtr = static_cast(harmonys[i]);
+ for (int i = 0; i < harmonies.size(); ++i) {
+ ovebase::Harmony* harmonyPtr = static_cast(harmonies[i]);
int absTick = m_mtt->getTick(measure->no(), harmonyPtr->getTick());
Harmony* harmony = Factory::createHarmony(m_score->dummy()->segment());
diff --git a/src/importexport/ove/internal/ove.cpp b/src/importexport/ove/internal/ove.cpp
index 26e560cb14..7ee46fb598 100644
--- a/src/importexport/ove/internal/ove.cpp
+++ b/src/importexport/ove/internal/ove.cpp
@@ -1037,7 +1037,7 @@ void Track::setTransposeClef(int clef)
m_transposeClef = ClefType(clef);
}
-ClefType Track::getTansposeClef() const
+ClefType Track::getTransposeClef() const
{
return m_transposeClef;
}
diff --git a/src/importexport/ove/internal/ove.h b/src/importexport/ove/internal/ove.h
index 044fc18dba..bfc218b902 100644
--- a/src/importexport/ove/internal/ove.h
+++ b/src/importexport/ove/internal/ove.h
@@ -109,7 +109,7 @@ enum class BdatType : unsigned char {
Harmony = 0x11,
Clef = 0x12,
Dynamics = 0x13,
- Wedge = 0x14, // cresendo, decresendo
+ Wedge = 0x14, // crescendo, decrescendo
Glissando = 0x15,
Decorator = 0x16, // measure repeat | piano pedal | dotted barline
Key = 0x17,
@@ -902,7 +902,7 @@ public:
ClefType getStartClef() const;
void setTransposeClef(int clef /* in ClefType */);
- ClefType getTansposeClef() const;
+ ClefType getTransposeClef() const;
void setStartKey(int key /* in KeyType */);
int getStartKey() const;
diff --git a/src/inspector/models/notation/lines/hairpinsettingsmodel.cpp b/src/inspector/models/notation/lines/hairpinsettingsmodel.cpp
index e4b25b8cb0..27a17fccb4 100644
--- a/src/inspector/models/notation/lines/hairpinsettingsmodel.cpp
+++ b/src/inspector/models/notation/lines/hairpinsettingsmodel.cpp
@@ -50,9 +50,9 @@ PropertyItem* HairpinSettingsModel::height() const
return m_height;
}
-PropertyItem* HairpinSettingsModel::continiousHeight() const
+PropertyItem* HairpinSettingsModel::continuousHeight() const
{
- return m_continiousHeight;
+ return m_continuousHeight;
}
void HairpinSettingsModel::createProperties()
@@ -61,7 +61,7 @@ void HairpinSettingsModel::createProperties()
m_isNienteCircleVisible = buildPropertyItem(Ms::Pid::HAIRPIN_CIRCLEDTIP);
m_height = buildPropertyItem(Ms::Pid::HAIRPIN_HEIGHT);
- m_continiousHeight = buildPropertyItem(Ms::Pid::HAIRPIN_CONT_HEIGHT);
+ m_continuousHeight = buildPropertyItem(Ms::Pid::HAIRPIN_CONT_HEIGHT);
isLineVisible()->setIsVisible(false);
allowDiagonal()->setIsVisible(true);
@@ -74,7 +74,7 @@ void HairpinSettingsModel::loadProperties()
loadPropertyItem(m_isNienteCircleVisible);
loadPropertyItem(m_height, formatDoubleFunc);
- loadPropertyItem(m_continiousHeight, formatDoubleFunc);
+ loadPropertyItem(m_continuousHeight, formatDoubleFunc);
}
void HairpinSettingsModel::resetProperties()
@@ -83,7 +83,7 @@ void HairpinSettingsModel::resetProperties()
m_isNienteCircleVisible->resetToDefault();
m_height->resetToDefault();
- m_continiousHeight->resetToDefault();
+ m_continuousHeight->resetToDefault();
}
void HairpinSettingsModel::requestElements()
diff --git a/src/inspector/models/notation/lines/hairpinsettingsmodel.h b/src/inspector/models/notation/lines/hairpinsettingsmodel.h
index e3f2e2d7b7..073f0bbe27 100644
--- a/src/inspector/models/notation/lines/hairpinsettingsmodel.h
+++ b/src/inspector/models/notation/lines/hairpinsettingsmodel.h
@@ -32,7 +32,7 @@ class HairpinSettingsModel : public TextLineSettingsModel
Q_PROPERTY(PropertyItem * isNienteCircleVisible READ isNienteCircleVisible CONSTANT)
Q_PROPERTY(PropertyItem * height READ height CONSTANT)
- Q_PROPERTY(PropertyItem * continiousHeight READ continiousHeight CONSTANT)
+ Q_PROPERTY(PropertyItem * continuousHeight READ continuousHeight CONSTANT)
public:
explicit HairpinSettingsModel(QObject* parent, IElementRepositoryService* repository);
@@ -40,7 +40,7 @@ public:
PropertyItem* isNienteCircleVisible() const;
PropertyItem* height() const;
- PropertyItem* continiousHeight() const;
+ PropertyItem* continuousHeight() const;
private:
void createProperties() override;
@@ -54,7 +54,7 @@ private:
PropertyItem* m_isNienteCircleVisible = nullptr;
PropertyItem* m_height = nullptr;
- PropertyItem* m_continiousHeight = nullptr;
+ PropertyItem* m_continuousHeight = nullptr;
};
}
diff --git a/src/inspector/models/notation/lines/pedalsettingsmodel.cpp b/src/inspector/models/notation/lines/pedalsettingsmodel.cpp
index 778998b7ec..3999811d7f 100644
--- a/src/inspector/models/notation/lines/pedalsettingsmodel.cpp
+++ b/src/inspector/models/notation/lines/pedalsettingsmodel.cpp
@@ -67,7 +67,7 @@ PropertyItem* PedalSettingsModel::lineType() const
bool PedalSettingsModel::pedalSymbolVisible() const
{
- return beginingText()->value().toString() == Ms::Pedal::PEDAL_SYMBOL;
+ return beginningText()->value().toString() == Ms::Pedal::PEDAL_SYMBOL;
}
bool PedalSettingsModel::isChangingLineVisibilityAllowed() const
@@ -82,14 +82,14 @@ bool PedalSettingsModel::isStarSymbolVisible() const
void PedalSettingsModel::setPedalSymbolVisible(bool visible)
{
- beginingText()->setValue(visible ? Ms::Pedal::PEDAL_SYMBOL : "");
+ beginningText()->setValue(visible ? Ms::Pedal::PEDAL_SYMBOL : "");
}
void PedalSettingsModel::createProperties()
{
TextLineSettingsModel::createProperties();
- connect(beginingText(), &PropertyItem::isModifiedChanged, this, [this]() {
+ connect(beginningText(), &PropertyItem::isModifiedChanged, this, [this]() {
emit pedalSymbolVisibleChanged();
});
diff --git a/src/inspector/models/notation/lines/textlinesettingsmodel.cpp b/src/inspector/models/notation/lines/textlinesettingsmodel.cpp
index 08b3ce6fa6..b7047bd0aa 100644
--- a/src/inspector/models/notation/lines/textlinesettingsmodel.cpp
+++ b/src/inspector/models/notation/lines/textlinesettingsmodel.cpp
@@ -81,18 +81,18 @@ void TextLineSettingsModel::createProperties()
m_placement = buildPropertyItem(Ms::Pid::PLACEMENT);
m_placement->setIsVisible(false);
- if (isTextVisible(BeginingText)) {
- m_beginingText = buildPropertyItem(Ms::Pid::BEGIN_TEXT);
+ if (isTextVisible(BeginningText)) {
+ m_beginningText = buildPropertyItem(Ms::Pid::BEGIN_TEXT);
- m_beginingTextVerticalOffset = buildPropertyItem(Ms::Pid::BEGIN_TEXT_OFFSET, [this](const Ms::Pid pid, const QVariant& newValue) {
+ m_beginningTextVerticalOffset = buildPropertyItem(Ms::Pid::BEGIN_TEXT_OFFSET, [this](const Ms::Pid pid, const QVariant& newValue) {
onPropertyValueChanged(pid, QPointF(0, newValue.toDouble()));
});
}
- if (isTextVisible(ContiniousText)) {
- m_continiousText = buildPropertyItem(Ms::Pid::CONTINUE_TEXT);
+ if (isTextVisible(ContinuousText)) {
+ m_continuousText = buildPropertyItem(Ms::Pid::CONTINUE_TEXT);
- m_continiousTextVerticalOffset = buildPropertyItem(Ms::Pid::CONTINUE_TEXT_OFFSET, [this](const Ms::Pid pid, const QVariant& newValue) {
+ m_continuousTextVerticalOffset = buildPropertyItem(Ms::Pid::CONTINUE_TEXT_OFFSET, [this](const Ms::Pid pid, const QVariant& newValue) {
onPropertyValueChanged(pid, QPointF(0,
newValue.toDouble()));
});
@@ -124,13 +124,13 @@ void TextLineSettingsModel::loadProperties()
loadPropertyItem(m_placement);
- loadPropertyItem(m_beginingText);
- loadPropertyItem(m_beginingTextVerticalOffset, [](const QVariant& elementPropertyValue) -> QVariant {
+ loadPropertyItem(m_beginningText);
+ loadPropertyItem(m_beginningTextVerticalOffset, [](const QVariant& elementPropertyValue) -> QVariant {
return DataFormatter::roundDouble(elementPropertyValue.value().y());
});
- loadPropertyItem(m_continiousText);
- loadPropertyItem(m_continiousTextVerticalOffset, [](const QVariant& elementPropertyValue) -> QVariant {
+ loadPropertyItem(m_continuousText);
+ loadPropertyItem(m_continuousTextVerticalOffset, [](const QVariant& elementPropertyValue) -> QVariant {
return DataFormatter::roundDouble(elementPropertyValue.value().y());
});
@@ -155,10 +155,10 @@ void TextLineSettingsModel::resetProperties()
m_endHookType,
m_hookHeight,
m_placement,
- m_beginingText,
- m_beginingTextVerticalOffset,
- m_continiousText,
- m_continiousTextVerticalOffset,
+ m_beginningText,
+ m_beginningTextVerticalOffset,
+ m_continuousText,
+ m_continuousTextVerticalOffset,
m_endText,
m_endTextVerticalOffset
};
@@ -220,24 +220,24 @@ PropertyItem* TextLineSettingsModel::placement() const
return m_placement;
}
-PropertyItem* TextLineSettingsModel::beginingText() const
+PropertyItem* TextLineSettingsModel::beginningText() const
{
- return m_beginingText;
+ return m_beginningText;
}
-PropertyItem* TextLineSettingsModel::beginingTextVerticalOffset() const
+PropertyItem* TextLineSettingsModel::beginningTextVerticalOffset() const
{
- return m_beginingTextVerticalOffset;
+ return m_beginningTextVerticalOffset;
}
-PropertyItem* TextLineSettingsModel::continiousText() const
+PropertyItem* TextLineSettingsModel::continuousText() const
{
- return m_continiousText;
+ return m_continuousText;
}
-PropertyItem* TextLineSettingsModel::continiousTextVerticalOffset() const
+PropertyItem* TextLineSettingsModel::continuousTextVerticalOffset() const
{
- return m_continiousTextVerticalOffset;
+ return m_continuousTextVerticalOffset;
}
PropertyItem* TextLineSettingsModel::endText() const
diff --git a/src/inspector/models/notation/lines/textlinesettingsmodel.h b/src/inspector/models/notation/lines/textlinesettingsmodel.h
index 5501cf4a04..7eaff8beff 100644
--- a/src/inspector/models/notation/lines/textlinesettingsmodel.h
+++ b/src/inspector/models/notation/lines/textlinesettingsmodel.h
@@ -46,11 +46,11 @@ class TextLineSettingsModel : public AbstractInspectorModel
Q_PROPERTY(PropertyItem * placement READ placement CONSTANT)
- Q_PROPERTY(PropertyItem * beginingText READ beginingText CONSTANT)
- Q_PROPERTY(PropertyItem * beginingTextVerticalOffset READ beginingTextVerticalOffset CONSTANT)
+ Q_PROPERTY(PropertyItem * beginningText READ beginningText CONSTANT)
+ Q_PROPERTY(PropertyItem * beginningTextVerticalOffset READ beginningTextVerticalOffset CONSTANT)
- Q_PROPERTY(PropertyItem * continiousText READ continiousText CONSTANT)
- Q_PROPERTY(PropertyItem * continiousTextVerticalOffset READ continiousTextVerticalOffset CONSTANT)
+ Q_PROPERTY(PropertyItem * continuousText READ continuousText CONSTANT)
+ Q_PROPERTY(PropertyItem * continuousTextVerticalOffset READ continuousTextVerticalOffset CONSTANT)
Q_PROPERTY(PropertyItem * endText READ endText CONSTANT)
Q_PROPERTY(PropertyItem * endTextVerticalOffset READ endTextVerticalOffset CONSTANT)
@@ -74,11 +74,11 @@ public:
PropertyItem* placement() const;
- PropertyItem* beginingText() const;
- PropertyItem* beginingTextVerticalOffset() const;
+ PropertyItem* beginningText() const;
+ PropertyItem* beginningTextVerticalOffset() const;
- PropertyItem* continiousText() const;
- PropertyItem* continiousTextVerticalOffset() const;
+ PropertyItem* continuousText() const;
+ PropertyItem* continuousTextVerticalOffset() const;
PropertyItem* endText() const;
PropertyItem* endTextVerticalOffset() const;
@@ -88,8 +88,8 @@ public:
protected:
enum TextType {
- BeginingText,
- ContiniousText,
+ BeginningText,
+ ContinuousText,
EndText
};
@@ -136,11 +136,11 @@ private:
PropertyItem* m_endHookType = nullptr;
PropertyItem* m_hookHeight = nullptr;
- PropertyItem* m_beginingText = nullptr;
- PropertyItem* m_beginingTextVerticalOffset = nullptr;
+ PropertyItem* m_beginningText = nullptr;
+ PropertyItem* m_beginningTextVerticalOffset = nullptr;
- PropertyItem* m_continiousText = nullptr;
- PropertyItem* m_continiousTextVerticalOffset = nullptr;
+ PropertyItem* m_continuousText = nullptr;
+ PropertyItem* m_continuousTextVerticalOffset = nullptr;
PropertyItem* m_endText = nullptr;
PropertyItem* m_endTextVerticalOffset = nullptr;
diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/accidentals/AccidentalSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/accidentals/AccidentalSettings.qml
index fda9e0cc9f..3fbb88f4c5 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/notation/accidentals/AccidentalSettings.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/notation/accidentals/AccidentalSettings.qml
@@ -41,11 +41,11 @@ Column {
spacing: 12
function focusOnFirst() {
- breacketType.focusOnFirst()
+ bracketType.focusOnFirst()
}
FlatRadioButtonGroupPropertyView {
- id: breacketType
+ id: bracketType
titleText: qsTrc("inspector", "Bracket type")
propertyItem: root.model ? root.model.bracketType : null
diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/frames/VerticalFrameSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/frames/VerticalFrameSettings.qml
index b3c795c329..516f34150e 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/notation/frames/VerticalFrameSettings.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/notation/frames/VerticalFrameSettings.qml
@@ -73,7 +73,7 @@ Column {
SeparatorLine { anchors.margins: -12 }
HorizontalMarginsSection {
- id: horizontalMargindSection
+ id: horizontalMarginsSection
frameLeftMargin: root.model ? root.model.frameLeftMargin : null
frameRightMargin: root.model ? root.model.frameRightMargin : null
@@ -86,6 +86,6 @@ Column {
frameBottomMargin: root.model ? root.model.frameBottomMargin : null
navigationPanel: root.navigationPanel
- navigationRowStart: horizontalMargindSection.navigationRowEnd + 1
+ navigationRowStart: horizontalMarginsSection.navigationRowEnd + 1
}
}
diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/lines/PedalSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/lines/PedalSettings.qml
index b0b508ad1f..4350add80e 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/notation/lines/PedalSettings.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/notation/lines/PedalSettings.qml
@@ -60,7 +60,7 @@ Column {
}
LineTypeSection {
- id: lineTypeSectuion
+ id: lineTypeSection
startHookType: root.model ? root.model.startHookType : null
endHookType: root.model ? root.model.lineType : null
@@ -83,7 +83,7 @@ Column {
navigation.name: "ShowLineWithRosetteCheckBox"
navigation.panel: root.navigationPanel
- navigation.row: lineTypeSectuion.navigationRowEnd + 1
+ navigation.row: lineTypeSection.navigationRowEnd + 1
}
SeparatorLine { anchors.margins: -12 }
diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/lines/internal/HairpinStyleSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/lines/internal/HairpinStyleSettings.qml
index 115ae5a6d9..dac13e2744 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/notation/lines/internal/HairpinStyleSettings.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/notation/lines/internal/HairpinStyleSettings.qml
@@ -135,12 +135,12 @@ FocusableItem {
width: parent.width
SpinBoxPropertyView {
- id: continiousHeightSection
+ id: continuousHeightSection
anchors.left: parent.left
anchors.right: parent.right
titleText: qsTrc("inspector", "Height (new system)")
- propertyItem: root.model ? root.model.continiousHeight : null
+ propertyItem: root.model ? root.model.continuousHeight : null
step: 0.1
maxValue: 10
@@ -156,7 +156,7 @@ FocusableItem {
propertyItem: root.model ? root.model.placement : null
navigationPanel: root.navigationPanel
- navigationRowStart: continiousHeightSection.navigationRowEnd + 1
+ navigationRowStart: continuousHeightSection.navigationRowEnd + 1
}
}
}
diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/lines/internal/LineTextSettingsTab.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/lines/internal/LineTextSettingsTab.qml
index 53ab532562..86b9ab49cb 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/notation/lines/internal/LineTextSettingsTab.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/notation/lines/internal/LineTextSettingsTab.qml
@@ -50,7 +50,7 @@ FocusableItem {
TextSection {
id: beginningTextSection
titleText: qsTrc("inspector", "Beginning text")
- propertyItem: root.model ? root.model.beginingText : null
+ propertyItem: root.model ? root.model.beginningText : null
navigationPanel: root.navigationPanel
navigationRowStart: root.navigationRowStart + 1
@@ -59,7 +59,7 @@ FocusableItem {
OffsetSection {
id: beginningTextOffsetSection
titleText: qsTrc("inspector", "Vertical offset")
- verticalOffset: root.model ? root.model.beginingTextVerticalOffset : null
+ verticalOffset: root.model ? root.model.beginningTextVerticalOffset : null
navigationPanel: root.navigationPanel
navigationRowStart: beginningTextSection.navigationRowEnd + 1
@@ -68,21 +68,21 @@ FocusableItem {
SeparatorLine { anchors.margins: -12 }
TextSection {
- id: continiousTextSection
+ id: continuousTextSection
titleText: qsTrc("inspector", "Text when continuing to a new system")
- propertyItem: root.model ? root.model.continiousText : null
+ propertyItem: root.model ? root.model.continuousText : null
navigationPanel: root.navigationPanel
navigationRowStart: beginningTextOffsetSection.navigationRowEnd + 1
}
OffsetSection {
- id: continiousTextOffsetSection
+ id: continuousTextOffsetSection
titleText: qsTrc("inspector", "Vertical offset")
- verticalOffset: root.model ? root.model.continiousTextVerticalOffset : null
+ verticalOffset: root.model ? root.model.continuousTextVerticalOffset : null
navigationPanel: root.navigationPanel
- navigationRowStart: continiousTextSection.navigationRowEnd + 1
+ navigationRowStart: continuousTextSection.navigationRowEnd + 1
}
SeparatorLine { anchors.margins: -12; visible: endTextSection.visible }
@@ -93,7 +93,7 @@ FocusableItem {
propertyItem: root.model ? root.model.endText : null
navigationPanel: root.navigationPanel
- navigationRowStart: continiousTextOffsetSection.navigationRowEnd + 1
+ navigationRowStart: continuousTextOffsetSection.navigationRowEnd + 1
}
OffsetSection {
diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/sectionbreaks/SectionBreakSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/sectionbreaks/SectionBreakSettings.qml
index f3d3f4f68a..fb028bfac9 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/notation/sectionbreaks/SectionBreakSettings.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/notation/sectionbreaks/SectionBreakSettings.qml
@@ -40,11 +40,11 @@ Column {
spacing: 12
function focusOnFirst() {
- pauseBeforStartsSection.focusOnFirst()
+ pauseBeforeStartsSection.focusOnFirst()
}
SpinBoxPropertyView {
- id: pauseBeforStartsSection
+ id: pauseBeforeStartsSection
titleText: qsTrc("inspector", "Pause before new section starts")
propertyItem: root.model ? root.model.pauseDuration : null
@@ -65,7 +65,7 @@ Column {
navigation.name: "StartWithLong"
navigation.panel: root.navigationPanel
- navigation.row: pauseBeforStartsSection.navigationRowEnd + 1
+ navigation.row: pauseBeforeStartsSection.navigationRowEnd + 1
}
CheckBoxPropertyView {
diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/timesignatures/TimeSignatureSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/timesignatures/TimeSignatureSettings.qml
index 32e31e774c..94825ef9ce 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/notation/timesignatures/TimeSignatureSettings.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/notation/timesignatures/TimeSignatureSettings.qml
@@ -119,7 +119,7 @@ Column {
maxValue: 300
minValue: 1
- navigation.name: "VeriticalScale"
+ navigation.name: "VerticalScale"
navigation.panel: root.navigationPanel
navigation.row: scaleSection.navigationRowStart + 3
navigation.accessible.name: scaleSection.titleText + " " + qsTrc("inspector", "Vertical") + currentValue
diff --git a/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml
index e0cbd1d501..5cc3ac592c 100644
--- a/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml
+++ b/src/inspector/view/qml/MuseScore/Inspector/text/TextSettings.qml
@@ -251,7 +251,7 @@ Column {
{ text: qsTrc("inspector", "Dynamics"), value: TextTypes.TEXT_TYPE_DYNAMICS },
{ text: qsTrc("inspector", "Hairpin"), value: TextTypes.TEXT_TYPE_HAIRPIN },
{ text: qsTrc("inspector", "Tempo"), value: TextTypes.TEXT_TYPE_TEMPO },
- { text: qsTrc("inspector", "Rehearshal mark"), value: TextTypes.TEXT_TYPE_REHEARSAL_MARK },
+ { text: qsTrc("inspector", "Rehearsal mark"), value: TextTypes.TEXT_TYPE_REHEARSAL_MARK },
{ text: qsTrc("inspector", "Repeat text left"), value: TextTypes.TEXT_TYPE_REPEAT_LEFT },
{ text: qsTrc("inspector", "Repeat text right"), value: TextTypes.TEXT_TYPE_REPEAT_RIGHT },
{ text: qsTrc("inspector", "Lyrics odd lines"), value: TextTypes.TEXT_TYPE_LYRICS_ODD },
diff --git a/src/inspector/view/widgets/gridcanvas.cpp b/src/inspector/view/widgets/gridcanvas.cpp
index 24bd5bbcc3..397108ea6d 100644
--- a/src/inspector/view/widgets/gridcanvas.cpp
+++ b/src/inspector/view/widgets/gridcanvas.cpp
@@ -161,7 +161,7 @@ void GridCanvas::setPointList(QVariant points)
void GridCanvas::paint(QPainter* painter)
{
if (!(m_rows && m_columns)) {
- LOGD("SqareCanvas::paintEvent: number of columns or rows set to 0.\nColumns: %i, Rows: %i", m_rows,
+ LOGD("GridCanvas::paintEvent: number of columns or rows set to 0.\nColumns: %i, Rows: %i", m_rows,
m_columns);
return;
}
diff --git a/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/FamilyView.qml b/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/FamilyView.qml
index 53c951a9a5..35e43c29e8 100644
--- a/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/FamilyView.qml
+++ b/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/FamilyView.qml
@@ -141,7 +141,7 @@ Item {
navigation.row: 2 + model.index
navigation.accessible.name: itemTitleLabel.text
- onNavigationActived: {
+ onNavigationActivated: {
item.clicked(null)
}
diff --git a/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/InstrumentsOnScoreView.qml b/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/InstrumentsOnScoreView.qml
index dabe49d0e4..bab307259b 100644
--- a/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/InstrumentsOnScoreView.qml
+++ b/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/InstrumentsOnScoreView.qml
@@ -155,7 +155,7 @@ Item {
navigation.column: 0
navigation.accessible.name: itemTitleLabel.text
- onNavigationActived: {
+ onNavigationActivated: {
item.clicked(null)
}
diff --git a/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/InstrumentsView.qml b/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/InstrumentsView.qml
index 9a9995b0cd..aa7efa8245 100644
--- a/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/InstrumentsView.qml
+++ b/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/InstrumentsView.qml
@@ -110,7 +110,7 @@ Item {
navigation.row: 2 + model.index
navigation.accessible.name: itemTitleLabel.text
- onNavigationActived: {
+ onNavigationActivated: {
root.instrumentsModel.selectInstrument(model.index)
}
diff --git a/src/instrumentsscene/view/instrumentspaneltreemodel.cpp b/src/instrumentsscene/view/instrumentspaneltreemodel.cpp
index 88c585f583..f523e571b6 100644
--- a/src/instrumentsscene/view/instrumentspaneltreemodel.cpp
+++ b/src/instrumentsscene/view/instrumentspaneltreemodel.cpp
@@ -518,13 +518,13 @@ void InstrumentsPanelTreeModel::setIsMovingUpAvailable(bool isMovingUpAvailable)
emit isMovingUpAvailableChanged(m_isMovingUpAvailable);
}
-void InstrumentsPanelTreeModel::setIsMovingDownAvailable(bool isMoveingDownAvailable)
+void InstrumentsPanelTreeModel::setIsMovingDownAvailable(bool isMovingDownAvailable)
{
- if (m_isMovingDownAvailable == isMoveingDownAvailable) {
+ if (m_isMovingDownAvailable == isMovingDownAvailable) {
return;
}
- m_isMovingDownAvailable = isMoveingDownAvailable;
+ m_isMovingDownAvailable = isMovingDownAvailable;
emit isMovingDownAvailableChanged(m_isMovingDownAvailable);
}
diff --git a/src/languages/internal/languagesservice.cpp b/src/languages/internal/languagesservice.cpp
index bd65aa4b4b..d734abb344 100644
--- a/src/languages/internal/languagesservice.cpp
+++ b/src/languages/internal/languagesservice.cpp
@@ -477,10 +477,10 @@ void LanguagesService::th_refreshLanguages()
QBuffer buff;
INetworkManagerPtr networkManagerPtr = networkManagerCreator()->makeNetworkManager();
- Ret getLanguagessInfo = networkManagerPtr->get(configuration()->languagesUpdateUrl().toString(), &buff);
+ Ret getLanguagesInfo = networkManagerPtr->get(configuration()->languagesUpdateUrl().toString(), &buff);
- if (!getLanguagessInfo) {
- LOGE() << getLanguagessInfo.toString();
+ if (!getLanguagesInfo) {
+ LOGE() << getLanguagesInfo.toString();
return;
}
diff --git a/src/multiinstances/internal/ipc/ipc.cpp b/src/multiinstances/internal/ipc/ipc.cpp
index 0f1518465b..04f0252f09 100644
--- a/src/multiinstances/internal/ipc/ipc.cpp
+++ b/src/multiinstances/internal/ipc/ipc.cpp
@@ -92,7 +92,7 @@ bool mu::ipc::writeToSocket(QLocalSocket* socket, const QByteArray& data)
return ok;
}
-bool mu::ipc::readFromSocket(QLocalSocket* socket, std::function onPackegReaded)
+bool mu::ipc::readFromSocket(QLocalSocket* socket, std::function onPackageRead)
{
qint64 bytesAvailable = socket->bytesAvailable();
if (bytesAvailable < (qint64)sizeof(quint32)) {
@@ -102,7 +102,7 @@ bool mu::ipc::readFromSocket(QLocalSocket* socket, std::function> remaining;
@@ -117,13 +117,13 @@ bool mu::ipc::readFromSocket(QLocalSocket* socket, std::function onPackegReaded);
+bool readFromSocket(QLocalSocket* socket, std::function onPackageRead);
}
#endif // MU_IPC_IPC_H
diff --git a/src/multiinstances/internal/ipc/ipcchannel.cpp b/src/multiinstances/internal/ipc/ipcchannel.cpp
index bd1ef113ba..6d046e78b0 100644
--- a/src/multiinstances/internal/ipc/ipcchannel.cpp
+++ b/src/multiinstances/internal/ipc/ipcchannel.cpp
@@ -35,7 +35,7 @@ using namespace mu::ipc;
IpcChannel::IpcChannel()
{
m_selfSocket = new IpcSocket();
- m_selfSocket->disconected().onNotify(this, [this]() { onDisconected(); });
+ m_selfSocket->disconnected().onNotify(this, [this]() { onDisconnected(); });
m_selfSocket->msgReceived().onReceive(this, [this](const Msg& msg) { onSocketMsgReceived(msg); });
}
@@ -102,21 +102,21 @@ Code IpcChannel::syncRequestToAll(const QString& method, const QStringList& args
int total = m_selfSocket->instances().count();
total -= 1; //! NOTE Exclude itself
- int recived = 0;
+ int received = 0;
- m_msgCallback = [method, total, &recived, &loop, onReceived](const Msg& msg) {
+ m_msgCallback = [method, total, &received, &loop, onReceived](const Msg& msg) {
if (!(msg.type == MsgType::Response && msg.method == method)) {
return;
}
- ++recived;
+ ++received;
bool success = onReceived(msg.args);
if (success) {
loop.exit(Code::Success);
return;
}
- if (recived == total) {
+ if (received == total) {
loop.exit(Code::AllAnswered);
}
};
@@ -165,7 +165,7 @@ void IpcChannel::setupConnection()
}
}
-void IpcChannel::onDisconected()
+void IpcChannel::onDisconnected()
{
//! NOTE If the server is down, then we will try to connect to another or create a server ourselves
uint64_t min = 1;
diff --git a/src/multiinstances/internal/ipc/ipcchannel.h b/src/multiinstances/internal/ipc/ipcchannel.h
index 4b32656f55..d409444868 100644
--- a/src/multiinstances/internal/ipc/ipcchannel.h
+++ b/src/multiinstances/internal/ipc/ipcchannel.h
@@ -66,7 +66,7 @@ public:
private:
void setupConnection();
- void onDisconected();
+ void onDisconnected();
void onSocketMsgReceived(const Msg& msg);
IpcSocket* m_selfSocket = nullptr;
diff --git a/src/multiinstances/internal/ipc/ipcsocket.cpp b/src/multiinstances/internal/ipc/ipcsocket.cpp
index e30c9c6a23..087f1dd799 100644
--- a/src/multiinstances/internal/ipc/ipcsocket.cpp
+++ b/src/multiinstances/internal/ipc/ipcsocket.cpp
@@ -53,7 +53,7 @@ bool IpcSocket::connect(const QString& serverName)
QObject::connect(m_socket, &QLocalSocket::errorOccurred, [this](QLocalSocket::LocalSocketError err) {
//! NOTE If the server is down, then we will try to connect to another or create a server ourselves
if (err == QLocalSocket::PeerClosedError) {
- m_disconected.notify();
+ m_disconnected.notify();
}
});
@@ -85,9 +85,9 @@ bool IpcSocket::connect(const QString& serverName)
return true;
}
-mu::async::Notification IpcSocket::disconected()
+mu::async::Notification IpcSocket::disconnected()
{
- return m_disconected;
+ return m_disconnected;
}
bool IpcSocket::send(Msg msg)
diff --git a/src/multiinstances/internal/ipc/ipcsocket.h b/src/multiinstances/internal/ipc/ipcsocket.h
index 2935019697..fb58f16d50 100644
--- a/src/multiinstances/internal/ipc/ipcsocket.h
+++ b/src/multiinstances/internal/ipc/ipcsocket.h
@@ -41,7 +41,7 @@ public:
const ID& selfID() const;
bool connect(const QString& serverName);
- async::Notification disconected();
+ async::Notification disconnected();
bool send(Msg msg);
async::Channel msgReceived() const;
@@ -58,7 +58,7 @@ private:
mutable ID m_selfID = 0;
IpcLock* m_lock = nullptr;
QLocalSocket* m_socket = nullptr;
- async::Notification m_disconected;
+ async::Notification m_disconnected;
async::Channel m_msgReceived;
QList m_instances;
diff --git a/src/notation/inotationconfiguration.h b/src/notation/inotationconfiguration.h
index 8fa0e12544..3abe83fcab 100644
--- a/src/notation/inotationconfiguration.h
+++ b/src/notation/inotationconfiguration.h
@@ -76,7 +76,7 @@ public:
virtual QColor selectionColor(engraving::voice_idx_t voiceIndex = 0) const = 0;
virtual int selectionProximity() const = 0;
- virtual void setSelectionProximity(int proxymity) = 0;
+ virtual void setSelectionProximity(int proximity) = 0;
virtual ZoomType defaultZoomType() const = 0;
virtual void setDefaultZoomType(ZoomType zoomType) = 0;
@@ -134,8 +134,8 @@ public:
virtual void setIsLimitCanvasScrollArea(bool limited) = 0;
virtual async::Notification isLimitCanvasScrollAreaChanged() const = 0;
- virtual bool colorNotesOusideOfUsablePitchRange() const = 0;
- virtual void setColorNotesOusideOfUsablePitchRange(bool value) = 0;
+ virtual bool colorNotesOutsideOfUsablePitchRange() const = 0;
+ virtual void setColorNotesOutsideOfUsablePitchRange(bool value) = 0;
virtual int delayBetweenNotesInRealTimeModeMilliseconds() const = 0;
virtual void setDelayBetweenNotesInRealTimeModeMilliseconds(int delayMs) = 0;
@@ -143,7 +143,7 @@ public:
virtual int notePlayDurationMilliseconds() const = 0;
virtual void setNotePlayDurationMilliseconds(int durationMs) = 0;
- virtual void setTemplateModeEnalbed(bool enabled) = 0;
+ virtual void setTemplateModeEnabled(bool enabled) = 0;
virtual void setTestModeEnabled(bool enabled) = 0;
virtual io::paths instrumentListPaths() const = 0;
diff --git a/src/notation/inotationinteraction.h b/src/notation/inotationinteraction.h
index 98ae95d465..15b3bda3c6 100644
--- a/src/notation/inotationinteraction.h
+++ b/src/notation/inotationinteraction.h
@@ -231,7 +231,7 @@ public:
virtual void navigateToLyrics(MoveDirection direction) = 0;
virtual void navigateToLyricsVerse(MoveDirection direction) = 0;
- virtual void nagivateToNextSyllable() = 0;
+ virtual void navigateToNextSyllable() = 0;
virtual void navigateToNearHarmony(MoveDirection direction, bool nearNoteOrRest) = 0;
virtual void navigateToHarmonyInNearMeasure(MoveDirection direction) = 0;
diff --git a/src/notation/internal/masternotation.cpp b/src/notation/internal/masternotation.cpp
index 884fe9b788..67bd7bd57f 100644
--- a/src/notation/internal/masternotation.cpp
+++ b/src/notation/internal/masternotation.cpp
@@ -70,7 +70,7 @@ MasterNotation::MasterNotation()
});
undoStack()->stackChanged().onNotify(this, [this]() {
- updateExerpts();
+ updateExcerpts();
notifyAboutNeedSaveChanged();
});
}
@@ -537,13 +537,13 @@ void MasterNotation::doSetExcerpts(ExcerptNotationList excerpts)
for (auto excerpt : excerpts) {
excerpt->notation()->undoStack()->stackChanged().onNotify(this, [this]() {
- updateExerpts();
+ updateExcerpts();
notifyAboutNeedSaveChanged();
});
}
}
-void MasterNotation::updateExerpts()
+void MasterNotation::updateExcerpts()
{
if (!masterScore()->excerptsChanged()) {
return;
diff --git a/src/notation/internal/masternotation.h b/src/notation/internal/masternotation.h
index 28889ba8f0..5eb83e5a43 100644
--- a/src/notation/internal/masternotation.h
+++ b/src/notation/internal/masternotation.h
@@ -76,7 +76,7 @@ private:
void initExcerptNotations(const std::vector& excerpts);
void addExcerptsToMasterScore(const std::vector& excerpts);
void doSetExcerpts(ExcerptNotationList excerpts);
- void updateExerpts();
+ void updateExcerpts();
bool containsExcerpt(const Ms::Excerpt* excerpt) const;
void notifyAboutNeedSaveChanged();
diff --git a/src/notation/internal/notationactioncontroller.cpp b/src/notation/internal/notationactioncontroller.cpp
index 4d1af37ab7..0d3b34d7f8 100644
--- a/src/notation/internal/notationactioncontroller.cpp
+++ b/src/notation/internal/notationactioncontroller.cpp
@@ -132,7 +132,7 @@ void NotationActionController::init()
&Controller::isEditingLyrics);
registerAction("prev-lyric-verse", &Interaction::navigateToLyricsVerse, MoveDirection::Up, PlayMode::NoPlay,
&Controller::isEditingLyrics);
- registerAction("next-syllable", &Interaction::nagivateToNextSyllable, PlayMode::NoPlay, &Controller::isEditingLyrics);
+ registerAction("next-syllable", &Interaction::navigateToNextSyllable, PlayMode::NoPlay, &Controller::isEditingLyrics);
registerAction("add-melisma", &Interaction::addMelisma, PlayMode::NoPlay, &Controller::isEditingLyrics);
registerAction("add-lyric-verse", &Interaction::addLyricsVerse, PlayMode::NoPlay, &Controller::isEditingLyrics);
diff --git a/src/notation/internal/notationconfiguration.cpp b/src/notation/internal/notationconfiguration.cpp
index 91222a0d31..e10f6f96b6 100644
--- a/src/notation/internal/notationconfiguration.cpp
+++ b/src/notation/internal/notationconfiguration.cpp
@@ -219,7 +219,7 @@ void NotationConfiguration::init()
m_foregroundChanged.notify();
});
- Ms::MScore::warnPitchRange = colorNotesOusideOfUsablePitchRange();
+ Ms::MScore::warnPitchRange = colorNotesOutsideOfUsablePitchRange();
Ms::MScore::defaultPlayDuration = notePlayDurationMilliseconds();
Ms::MScore::setHRaster(DEFAULT_GRID_SIZE_SPATIUM);
@@ -418,9 +418,9 @@ int NotationConfiguration::selectionProximity() const
return settings()->value(SELECTION_PROXIMITY).toInt();
}
-void NotationConfiguration::setSelectionProximity(int proxymity)
+void NotationConfiguration::setSelectionProximity(int proximity)
{
- settings()->setSharedValue(SELECTION_PROXIMITY, Val(proxymity));
+ settings()->setSharedValue(SELECTION_PROXIMITY, Val(proximity));
}
ZoomType NotationConfiguration::defaultZoomType() const
@@ -625,12 +625,12 @@ Notification NotationConfiguration::isLimitCanvasScrollAreaChanged() const
return m_isLimitCanvasScrollAreaChanged;
}
-bool NotationConfiguration::colorNotesOusideOfUsablePitchRange() const
+bool NotationConfiguration::colorNotesOutsideOfUsablePitchRange() const
{
return settings()->value(COLOR_NOTES_OUTSIDE_OF_USABLE_PITCH_RANGE).toBool();
}
-void NotationConfiguration::setColorNotesOusideOfUsablePitchRange(bool value)
+void NotationConfiguration::setColorNotesOutsideOfUsablePitchRange(bool value)
{
Ms::MScore::warnPitchRange = value;
settings()->setSharedValue(COLOR_NOTES_OUTSIDE_OF_USABLE_PITCH_RANGE, Val(value));
@@ -657,7 +657,7 @@ void NotationConfiguration::setNotePlayDurationMilliseconds(int durationMs)
settings()->setSharedValue(NOTE_DEFAULT_PLAY_DURATION, Val(durationMs));
}
-void NotationConfiguration::setTemplateModeEnalbed(bool enabled)
+void NotationConfiguration::setTemplateModeEnabled(bool enabled)
{
Ms::MScore::saveTemplateMode = enabled;
}
diff --git a/src/notation/internal/notationconfiguration.h b/src/notation/internal/notationconfiguration.h
index 892f7b93c7..3064aab93a 100644
--- a/src/notation/internal/notationconfiguration.h
+++ b/src/notation/internal/notationconfiguration.h
@@ -82,7 +82,7 @@ public:
QColor selectionColor(engraving::voice_idx_t voiceIndex = 0) const override;
int selectionProximity() const override;
- void setSelectionProximity(int proxymity) override;
+ void setSelectionProximity(int proximity) override;
ZoomType defaultZoomType() const override;
void setDefaultZoomType(ZoomType zoomType) override;
@@ -140,8 +140,8 @@ public:
void setIsLimitCanvasScrollArea(bool limited) override;
async::Notification isLimitCanvasScrollAreaChanged() const override;
- bool colorNotesOusideOfUsablePitchRange() const override;
- void setColorNotesOusideOfUsablePitchRange(bool value) override;
+ bool colorNotesOutsideOfUsablePitchRange() const override;
+ void setColorNotesOutsideOfUsablePitchRange(bool value) override;
int delayBetweenNotesInRealTimeModeMilliseconds() const override;
void setDelayBetweenNotesInRealTimeModeMilliseconds(int delayMs) override;
@@ -149,7 +149,7 @@ public:
int notePlayDurationMilliseconds() const override;
void setNotePlayDurationMilliseconds(int durationMs) override;
- void setTemplateModeEnalbed(bool enabled) override;
+ void setTemplateModeEnabled(bool enabled) override;
void setTestModeEnabled(bool enabled) override;
io::paths instrumentListPaths() const override;
diff --git a/src/notation/internal/notationinteraction.cpp b/src/notation/internal/notationinteraction.cpp
index 5b41feefb4..2424844d89 100644
--- a/src/notation/internal/notationinteraction.cpp
+++ b/src/notation/internal/notationinteraction.cpp
@@ -4163,7 +4163,7 @@ void NotationInteraction::navigateToLyrics(MoveDirection direction)
navigateToLyrics(direction == MoveDirection::Left, true, false);
}
-void NotationInteraction::nagivateToNextSyllable()
+void NotationInteraction::navigateToNextSyllable()
{
if (!m_editData.element || !m_editData.element->isLyrics()) {
LOGW("nextSyllable called with invalid current element");
diff --git a/src/notation/internal/notationinteraction.h b/src/notation/internal/notationinteraction.h
index b7defbe634..61ec01fda4 100644
--- a/src/notation/internal/notationinteraction.h
+++ b/src/notation/internal/notationinteraction.h
@@ -229,7 +229,7 @@ public:
void navigateToLyrics(MoveDirection direction) override;
void navigateToLyricsVerse(MoveDirection direction) override;
- void nagivateToNextSyllable() override;
+ void navigateToNextSyllable() override;
void navigateToNearHarmony(MoveDirection direction, bool nearNoteOrRest) override;
void navigateToHarmonyInNearMeasure(MoveDirection direction) override;
diff --git a/src/notation/view/continuouspanel.cpp b/src/notation/view/continuouspanel.cpp
index a874e57290..ed4d3bc3cf 100644
--- a/src/notation/view/continuouspanel.cpp
+++ b/src/notation/view/continuouspanel.cpp
@@ -328,7 +328,7 @@ void ContinuousPanel::paint(mu::draw::Painter& painter, const NotationViewContex
painter.translate(-pos);
delete newElement;
- // This second pass draws the elements spaced evently using the width of the largest element
+ // This second pass draws the elements spaced evenly using the width of the largest element
for (const Ms::EngravingItem* e : qAsConst(el)) {
if (!e->visible() && !showInvisible) {
continue;
diff --git a/src/notation/view/partlistmodel.cpp b/src/notation/view/partlistmodel.cpp
index d1b9225e47..6789fcc56d 100644
--- a/src/notation/view/partlistmodel.cpp
+++ b/src/notation/view/partlistmodel.cpp
@@ -158,7 +158,7 @@ void PartListModel::doRemovePart(int partIndex)
return;
}
- bool isCurrentContation = context()->currentNotation() == m_excerpts[partIndex]->notation();
+ bool isCurrentNotation = context()->currentNotation() == m_excerpts[partIndex]->notation();
beginRemoveRows(QModelIndex(), partIndex, partIndex);
@@ -167,7 +167,7 @@ void PartListModel::doRemovePart(int partIndex)
endRemoveRows();
- if (isCurrentContation) {
+ if (isCurrentNotation) {
context()->setCurrentNotation(context()->currentMasterNotation()->notation());
}
}
diff --git a/src/notation/view/widgets/editstaff.cpp b/src/notation/view/widgets/editstaff.cpp
index a2ab038006..b4683e506c 100644
--- a/src/notation/view/widgets/editstaff.cpp
+++ b/src/notation/view/widgets/editstaff.cpp
@@ -609,7 +609,7 @@ void EditStaff::editStringDataClicked()
oldHighestStringPitch = str.pitch;
}
}
- // if there were no string, arbitrarely set old top to maxPitchA
+ // if there were no string, arbitrarily set old top to maxPitchA
if (oldHighestStringPitch == INT16_MIN) {
oldHighestStringPitch = m_instrument.maxPitchA();
}
diff --git a/src/notation/view/widgets/editstafftype.cpp b/src/notation/view/widgets/editstafftype.cpp
index 76ae7522de..93700c0198 100644
--- a/src/notation/view/widgets/editstafftype.cpp
+++ b/src/notation/view/widgets/editstafftype.cpp
@@ -98,7 +98,7 @@ EditStaffType::EditStaffType(QWidget* parent)
Q_ASSERT_X(false, "EditStaffType::EditStaffType", "Error in opening sample standard file for preview");
}
- // load a sample tabulature score in preview
+ // load a sample tablature score in preview
sc = mu::engraving::compat::ScoreAccess::createMasterScoreWithDefaultStyle();
if (loadScore(sc, ":/view/resources/data/tab_sample.mscx")) {
tabPreview->setScore(sc);
@@ -305,7 +305,7 @@ void EditStaffType::setValues()
durFontSize->setValue(staffType.durationFontSize());
durY->setValue(staffType.durationFontUserY());
// convert combined values of genDurations and slashStyle/stemless into noteValuesx radio buttons
- // Sbove/Below, Beside/Through and minim are only used if stems-and-beams
+ // Above/Below, Beside/Through and minim are only used if stems-and-beams
// but set them from stt values anyway, to ensure preset matching
stemAboveRadio->setChecked(!staffType.stemsDown());
stemBelowRadio->setChecked(staffType.stemsDown());
diff --git a/src/notation/view/widgets/editstyle.cpp b/src/notation/view/widgets/editstyle.cpp
index 50fef118d5..204b2fd33a 100644
--- a/src/notation/view/widgets/editstyle.cpp
+++ b/src/notation/view/widgets/editstyle.cpp
@@ -1949,9 +1949,9 @@ void EditStyle::valueChanged(int i)
setStyleValue(StyleId::doubleBarDistance, newDoubleBarDistance);
// guess the repeat dot width = spatium * .3
- double newRepeatBarlineDotSepration = styleValue(StyleId::repeatBarlineDotSeparation).toDouble()
- + (styleValue(StyleId::barWidth).toDouble() + .3) * .5;
- setStyleValue(StyleId::repeatBarlineDotSeparation, newRepeatBarlineDotSepration);
+ double newRepeatBarlineDotSeparation = styleValue(StyleId::repeatBarlineDotSeparation).toDouble()
+ + (styleValue(StyleId::barWidth).toDouble() + .3) * .5;
+ setStyleValue(StyleId::repeatBarlineDotSeparation, newRepeatBarlineDotSeparation);
// adjust mmrest, which is not in engravingDefaults
// TODO: create generalized method for setting style vals based on font
diff --git a/src/notation/view/widgets/editstyle.ui b/src/notation/view/widgets/editstyle.ui
index e47c328457..b21195e3a6 100644
--- a/src/notation/view/widgets/editstyle.ui
+++ b/src/notation/view/widgets/editstyle.ui
@@ -678,7 +678,7 @@
-
-
+
Min. vertical distance:
diff --git a/src/notation/view/widgets/timeline.cpp b/src/notation/view/widgets/timeline.cpp
index ec3697fd06..5e4a47dba2 100644
--- a/src/notation/view/widgets/timeline.cpp
+++ b/src/notation/view/widgets/timeline.cpp
@@ -1248,12 +1248,12 @@ void Timeline::rehearsalMeta(Segment* seg, int* stagger, int pos)
for (EngravingItem* element : seg->annotations()) {
int x = pos + (*stagger) * _spacing;
if (element->isRehearsalMark()) {
- RehearsalMark* rehersal_mark = toRehearsalMark(element);
- if (!rehersal_mark) {
+ RehearsalMark* rehearsal_mark = toRehearsalMark(element);
+ if (!rehearsal_mark) {
continue;
}
- if (addMetaValue(x, pos, rehersal_mark->plainText(), row, ElementType::REHEARSAL_MARK, element, 0, seg->measure())) {
+ if (addMetaValue(x, pos, rehearsal_mark->plainText(), row, ElementType::REHEARSAL_MARK, element, 0, seg->measure())) {
(*stagger)++;
_globalZValue++;
}
diff --git a/src/palette/internal/paletteconfiguration.cpp b/src/palette/internal/paletteconfiguration.cpp
index 9cc4afca97..99b06a9427 100644
--- a/src/palette/internal/paletteconfiguration.cpp
+++ b/src/palette/internal/paletteconfiguration.cpp
@@ -38,10 +38,10 @@ static const Settings::Key IS_SINGLE_CLICK_TO_OPEN_PALETTE(MODULE_NAME, "applica
void PaletteConfiguration::init()
{
settings()->setDefaultValue(PALETTE_SCALE, Val(1.0));
- settings()->setCanBeMannualyEdited(PALETTE_SCALE, true);
+ settings()->setCanBeManuallyEdited(PALETTE_SCALE, true);
settings()->setDefaultValue(PALETTE_USE_SINGLE, Val(false));
- settings()->setCanBeMannualyEdited(PALETTE_USE_SINGLE, true);
+ settings()->setCanBeManuallyEdited(PALETTE_USE_SINGLE, true);
m_isSinglePalette.val = settings()->value(PALETTE_USE_SINGLE).toBool();
settings()->valueChanged(PALETTE_USE_SINGLE).onReceive(this, [this](const Val& newValue) {
@@ -49,7 +49,7 @@ void PaletteConfiguration::init()
});
settings()->setDefaultValue(IS_SINGLE_CLICK_TO_OPEN_PALETTE, Val(true));
- settings()->setCanBeMannualyEdited(IS_SINGLE_CLICK_TO_OPEN_PALETTE, true);
+ settings()->setCanBeManuallyEdited(IS_SINGLE_CLICK_TO_OPEN_PALETTE, true);
m_isSingleClickToOpenPalette.val = settings()->value(IS_SINGLE_CLICK_TO_OPEN_PALETTE).toBool();
settings()->valueChanged(IS_SINGLE_CLICK_TO_OPEN_PALETTE).onReceive(this, [this](const Val& newValue) {
diff --git a/src/palette/view/widgets/keyedit.cpp b/src/palette/view/widgets/keyedit.cpp
index 9bae2ea24f..8db69bf982 100644
--- a/src/palette/view/widgets/keyedit.cpp
+++ b/src/palette/view/widgets/keyedit.cpp
@@ -337,7 +337,7 @@ KeyEditor::KeyEditor(QWidget* parent)
connect(m_keySigPaletteWidget, &PaletteWidget::changed, this, &KeyEditor::setDirty);
//
- // set all "buildin" key signatures to read only
+ // set all "builtin" key signatures to read only
//
int n = m_keySigPaletteWidget->actualCellCount();
for (int i = 0; i < n; ++i) {
diff --git a/src/playback/playbacktypes.h b/src/playback/playbacktypes.h
index d11a349898..aae2e51307 100644
--- a/src/playback/playbacktypes.h
+++ b/src/playback/playbacktypes.h
@@ -68,9 +68,9 @@ inline audio::msecs_t secondsToMilliseconds(float seconds)
return seconds * 1000;
}
-inline QTime timeFromMilliseconds(audio::msecs_t millisecons)
+inline QTime timeFromMilliseconds(audio::msecs_t milliseconds)
{
- return ZERO_TIME.addMSecs(millisecons);
+ return ZERO_TIME.addMSecs(milliseconds);
}
inline QTime timeFromSeconds(float seconds)
diff --git a/src/plugins/api/elements.h b/src/plugins/api/elements.h
index ec814602cd..451669003b 100644
--- a/src/plugins/api/elements.h
+++ b/src/plugins/api/elements.h
@@ -327,7 +327,7 @@ class EngravingItem : public Ms::PluginAPI::ScoreElement
API_PROPERTY(dashGapLen, DASH_GAP_LEN)
// API_PROPERTY_READ_ONLY( tick, TICK ) // wasn't available in 2.X, disabled due to fractions transition
/**
- * Symbol ID of this element (if approproate),
+ * Symbol ID of this element (if appropriate),
* one of PluginAPI::PluginAPI::SymId values.
*/
API_PROPERTY(symbol, SYMBOL)
@@ -543,7 +543,7 @@ public:
static bool isChildAllowed(Ms::ElementType elementType);
/// \endcond
- /// Creates a PlayEvent object for use in Javascript.
+ /// Creates a PlayEvent object for use in JavaScript.
/// \since MuseScore 3.3
Q_INVOKABLE Ms::PluginAPI::PlayEvent* createPlayEvent() { return playEventWrap(new NoteEvent(), nullptr); }
diff --git a/src/plugins/api/qmlpluginapi.h b/src/plugins/api/qmlpluginapi.h
index 3acbc3dfbb..2e039cba26 100644
--- a/src/plugins/api/qmlpluginapi.h
+++ b/src/plugins/api/qmlpluginapi.h
@@ -207,8 +207,8 @@ signals:
* - \p instrumentsChanged
* - \p startLayoutTick
* - \p endLayoutTick
- * - \p undoRedo - whether this onScoreStateChanged invokation results
- * from user undo/redo action. It is usualy not recommended to modify
+ * - \p undoRedo - whether this onScoreStateChanged invocation results
+ * from user undo/redo action. It is usually not recommended to modify
* score from plugins in this case. Available since MuseScore 3.5.
*
* If a plugin modifies score in this handler, then it should:
diff --git a/src/plugins/api/score.h b/src/plugins/api/score.h
index 0f2667eea4..8d46a86e48 100644
--- a/src/plugins/api/score.h
+++ b/src/plugins/api/score.h
@@ -72,7 +72,7 @@ class Score : public Ms::PluginAPI::ScoreElement
/** Whether score has lyrics (read only).\n \since MuseScore 3.2 */
Q_PROPERTY(bool hasLyrics READ hasLyrics)
/// Key signature at the start of the score, in number of accidentals,
- /// negative for flats, postitive for sharps (read only).\n \since MuseScore 3.2
+ /// negative for flats, positive for sharps (read only).\n \since MuseScore 3.2
Q_PROPERTY(int keysig READ keysig)
/** Last measure of the score (read only) */
Q_PROPERTY(Ms::PluginAPI::Measure * lastMeasure READ lastMeasure)
diff --git a/src/plugins/api/selection.cpp b/src/plugins/api/selection.cpp
index 382de2dd29..f2135aa1e5 100644
--- a/src/plugins/api/selection.cpp
+++ b/src/plugins/api/selection.cpp
@@ -104,7 +104,7 @@ bool Selection::select(EngravingItem* elWrapper, bool add)
/// \param startTick start tick to be included in selection
/// \param endTick end tick of selection, excluded from selection
/// \param startStaff start staff index, included in selection
-/// \param endStaff end staff index, excluded from seleciton
+/// \param endStaff end staff index, excluded from selection
/// \return \p true on success, \p false if selection
/// cannot be changed, e.g. due to the ongoing operation
/// on a score (like dragging elements) or incorrect
diff --git a/src/plugins/internal/pluginsuiactions.h b/src/plugins/internal/pluginsuiactions.h
index 4714118399..dbbacf572f 100644
--- a/src/plugins/internal/pluginsuiactions.h
+++ b/src/plugins/internal/pluginsuiactions.h
@@ -35,10 +35,10 @@ public:
const ui::UiActionList& actionsList() const override;
- bool actionEnabled(const ui::UiAction& acttion) const override;
+ bool actionEnabled(const ui::UiAction& action) const override;
async::Channel actionEnabledChanged() const override;
- bool actionChecked(const ui::UiAction& acttion) const override;
+ bool actionChecked(const ui::UiAction& action) const override;
async::Channel actionCheckedChanged() const override;
private:
diff --git a/src/project/internal/exportprojectscenario.cpp b/src/project/internal/exportprojectscenario.cpp
index 0a77675f6f..e30ccd3280 100644
--- a/src/project/internal/exportprojectscenario.cpp
+++ b/src/project/internal/exportprojectscenario.cpp
@@ -254,7 +254,7 @@ bool ExportProjectScenario::askForRetry(const QString& filename) const
{
IInteractive::Result result = interactive()->question(
trc("project", "Error"),
- qtrc("project", "An error occured while writing the file %1. Do you want to retry?")
+ qtrc("project", "An error occurred while writing the file %1. Do you want to retry?")
.arg(filename).toStdString(), { IInteractive::Button::Retry, IInteractive::Button::Abort });
return result.standardButton() == IInteractive::Button::Retry;
diff --git a/src/project/internal/mscmetareader.cpp b/src/project/internal/mscmetareader.cpp
index e76b44e73f..5b55eae083 100644
--- a/src/project/internal/mscmetareader.cpp
+++ b/src/project/internal/mscmetareader.cpp
@@ -84,7 +84,7 @@ MscMetaReader::RawMeta MscMetaReader::doReadBox(framework::XmlReader& xmlReader)
bool isTitle = false;
bool isSubtitle = false;
bool isComposer = false;
- bool isLiricist = false;
+ bool isLyricist = false;
while (xmlReader.readNextStartElement()) {
std::string tag(xmlReader.tagName());
@@ -98,7 +98,7 @@ MscMetaReader::RawMeta MscMetaReader::doReadBox(framework::XmlReader& xmlReader)
} else if (val == "subtitle") {
isSubtitle = true;
} else if (val == "lyricist") {
- isLiricist = true;
+ isLyricist = true;
} else {
xmlReader.skipCurrentElement();
}
@@ -109,7 +109,7 @@ MscMetaReader::RawMeta MscMetaReader::doReadBox(framework::XmlReader& xmlReader)
meta.subtitleStyle = readText(xmlReader);
} else if (isComposer) {
meta.composerStyle = readText(xmlReader);
- } else if (isLiricist) {
+ } else if (isLyricist) {
meta.lyricistStyle = readText(xmlReader);
} else {
xmlReader.skipCurrentElement();
@@ -121,7 +121,7 @@ MscMetaReader::RawMeta MscMetaReader::doReadBox(framework::XmlReader& xmlReader)
meta.subtitleStyleHtml = readText(xmlReader);
} else if (isComposer) {
meta.composerStyleHtml = readText(xmlReader);
- } else if (isLiricist) {
+ } else if (isLyricist) {
meta.lyricistStyleHtml = readText(xmlReader);
} else {
xmlReader.skipCurrentElement();
diff --git a/src/project/internal/projectactionscontroller.cpp b/src/project/internal/projectactionscontroller.cpp
index 2bef2fc305..cee0f77a63 100644
--- a/src/project/internal/projectactionscontroller.cpp
+++ b/src/project/internal/projectactionscontroller.cpp
@@ -120,7 +120,7 @@ Ret ProjectActionsController::openProject(const io::path& projectPath_)
{
//! NOTE This method is synchronous,
//! but inside `multiInstancesProvider` there can be an event loop
- //! to wait for the responces from other instances, accordingly,
+ //! to wait for the responses from other instances, accordingly,
//! the events (like user click) can be executed and this method can be called several times,
//! before the end of the current call.
//! So we ignore all subsequent calls until the current one completes.
@@ -252,7 +252,7 @@ void ProjectActionsController::newProject()
{
//! NOTE This method is synchronous,
//! but inside `multiInstancesProvider` there can be an event loop
- //! to wait for the responces from other instances, accordingly,
+ //! to wait for the responses from other instances, accordingly,
//! the events (like user click) can be executed and this method can be called several times,
//! before the end of the current call.
//! So we ignore all subsequent calls until the current one completes.
diff --git a/src/project/qml/MuseScore/Project/internal/AdditionalInfoView.qml b/src/project/qml/MuseScore/Project/internal/AdditionalInfoView.qml
index 2e36777218..2a4ced6b20 100644
--- a/src/project/qml/MuseScore/Project/internal/AdditionalInfoView.qml
+++ b/src/project/qml/MuseScore/Project/internal/AdditionalInfoView.qml
@@ -72,7 +72,7 @@ Row {
}
Column {
- id: keySignatureСolumn
+ id: keySignatureColumn
anchors.top: parent.top
anchors.bottom: parent.bottom
@@ -111,7 +111,7 @@ Row {
}
Column {
- id: timeSignatureСolumn
+ id: timeSignatureColumn
anchors.top: parent.top
anchors.bottom: parent.bottom
width: privatesProperties.contentWidth
@@ -147,7 +147,7 @@ Row {
}
Column {
- id: tempoСolumn
+ id: tempoColumn
anchors.top: parent.top
anchors.bottom: parent.bottom
width: privatesProperties.contentWidth
diff --git a/src/project/qml/MuseScore/Project/internal/ChooseInstrumentsAndTemplatesPage.qml b/src/project/qml/MuseScore/Project/internal/ChooseInstrumentsAndTemplatesPage.qml
index a843d02657..7342c1dca1 100644
--- a/src/project/qml/MuseScore/Project/internal/ChooseInstrumentsAndTemplatesPage.qml
+++ b/src/project/qml/MuseScore/Project/internal/ChooseInstrumentsAndTemplatesPage.qml
@@ -85,7 +85,7 @@ Item {
StyledTabBar {
id: bar
- property bool complited: false
+ property bool completed: false
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
@@ -142,7 +142,7 @@ Item {
break
}
- bar.complited = true
+ bar.completed = true
}
}
@@ -156,7 +156,7 @@ Item {
anchors.bottom: parent.bottom
sourceComponent: {
- if (!bar.complited) {
+ if (!bar.completed) {
return null
}
diff --git a/src/project/qml/MuseScore/Project/internal/TitleListView.qml b/src/project/qml/MuseScore/Project/internal/TitleListView.qml
index 204dc9c1be..bb75ad6d2b 100644
--- a/src/project/qml/MuseScore/Project/internal/TitleListView.qml
+++ b/src/project/qml/MuseScore/Project/internal/TitleListView.qml
@@ -107,7 +107,7 @@ Item {
navigation.panel: navPanel
navigation.row: 2 + model.index
navigation.accessible.name: titleLabel.text
- onNavigationActived: {
+ onNavigationActivated: {
prv.currentItemNavigationIndex = [navigation.row, navigation.column]
root.titleClicked(model.index)
}
diff --git a/src/project/tests/templatesrepositorytest.cpp b/src/project/tests/templatesrepositorytest.cpp
index 3be2160b4e..81b50e620d 100644
--- a/src/project/tests/templatesrepositorytest.cpp
+++ b/src/project/tests/templatesrepositorytest.cpp
@@ -131,7 +131,7 @@ TEST_F(TemplatesRepositoryTest, Templates)
}
}
- // [GIVEN] One dir has no caterogiers.json file
+ // [GIVEN] One dir has no categories.json file
ON_CALL(*m_fileSystem, exists(otherUserTemplatesDir))
.WillByDefault(Return(Ret(false)));
diff --git a/src/stubs/framework/network/networkmanagerstub.h b/src/stubs/framework/network/networkmanagerstub.h
index 9cbb0a7cec..85a3e83efc 100644
--- a/src/stubs/framework/network/networkmanagerstub.h
+++ b/src/stubs/framework/network/networkmanagerstub.h
@@ -28,13 +28,13 @@ namespace mu::network {
class NetworkManagerStub : public INetworkManager
{
public:
- Ret get(const QUrl& url, IncomingDevice* incommingData, const RequestHeaders& headers = RequestHeaders()) override;
+ Ret get(const QUrl& url, IncomingDevice* incomingData, const RequestHeaders& headers = RequestHeaders()) override;
Ret head(const QUrl& url, const RequestHeaders& headers = RequestHeaders()) override;
- Ret post(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incommingData,
+ Ret post(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incomingData,
const RequestHeaders& headers = RequestHeaders()) override;
- Ret put(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incommingData,
+ Ret put(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incomingData,
const RequestHeaders& headers = RequestHeaders()) override;
- Ret del(const QUrl& url, IncomingDevice* incommingData, const RequestHeaders& headers = RequestHeaders()) override;
+ Ret del(const QUrl& url, IncomingDevice* incomingData, const RequestHeaders& headers = RequestHeaders()) override;
framework::ProgressChannel progressChannel() const override;
diff --git a/src/stubs/instrumentsscene/qml/MuseScore/InstrumentsScene/InstrumentsDialog.qml b/src/stubs/instrumentsscene/qml/MuseScore/InstrumentsScene/InstrumentsDialog.qml
index 749365259a..433fa56c85 100644
--- a/src/stubs/instrumentsscene/qml/MuseScore/InstrumentsScene/InstrumentsDialog.qml
+++ b/src/stubs/instrumentsscene/qml/MuseScore/InstrumentsScene/InstrumentsDialog.qml
@@ -44,7 +44,7 @@ QmlDialog {
StyledTextLabel {
anchors.centerIn: parent
- text: "Instrumens Dialog Stub"
+ text: "Instruments Dialog Stub"
}
}
}
diff --git a/test/README b/test/README
index 25acc1e7eb..f9d64efb93 100644
--- a/test/README
+++ b/test/README
@@ -153,7 +153,7 @@ testVoicePiano1.xml score with both a voice and a piano part
testVolta1.xml simple (one-measure) volta's
testWedge1.xml crescendo and diminuendo wedges
testWords1.xml the "words" direction
-test98.xml 9/8 time signature with dottet rests
+test98.xml 9/8 time signature with dotted rests
-------------------------------------------------
MuseData
diff --git a/tools/codestyle/uncrustify_musescore.cfg b/tools/codestyle/uncrustify_musescore.cfg
index 06bdc9fe23..1cec885365 100644
--- a/tools/codestyle/uncrustify_musescore.cfg
+++ b/tools/codestyle/uncrustify_musescore.cfg
@@ -1534,7 +1534,7 @@ cmt_insert_func_header = "" # string
# Will substitute $(class) with the class name.
cmt_insert_class_header = "" # string
-# The filename that contains text to insert before a Obj-C message specification if the method isn't preceeded with a C/C++ comment.
+# The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment.
# Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff.
cmt_insert_oc_msg_header = "" # string