From 55c452fb68db87c70a4d04ebeee9efe89e64836f Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 15 May 2022 10:35:32 -0400 Subject: [PATCH] Spelling (#11566) * spelling: above Signed-off-by: Josh Soref * spelling: accessibility Signed-off-by: Josh Soref * spelling: accessible Signed-off-by: Josh Soref * spelling: account Signed-off-by: Josh Soref * spelling: action Signed-off-by: Josh Soref * spelling: activated Signed-off-by: Josh Soref * spelling: active Signed-off-by: Josh Soref * spelling: again Signed-off-by: Josh Soref * spelling: allegro Signed-off-by: Josh Soref * spelling: alternative Signed-off-by: Josh Soref * spelling: amplitude Signed-off-by: Josh Soref * spelling: and Signed-off-by: Josh Soref * spelling: annotation Signed-off-by: Josh Soref * spelling: appended Signed-off-by: Josh Soref * spelling: appending Signed-off-by: Josh Soref * spelling: appropriate Signed-off-by: Josh Soref * spelling: arbitrarily Signed-off-by: Josh Soref * spelling: architecture Signed-off-by: Josh Soref * spelling: arpeggio Signed-off-by: Josh Soref * spelling: arranger Signed-off-by: Josh Soref * spelling: assumed Signed-off-by: Josh Soref * spelling: asynchronous Signed-off-by: Josh Soref * spelling: automatically Signed-off-by: Josh Soref * spelling: availability Signed-off-by: Josh Soref * spelling: available Signed-off-by: Josh Soref * spelling: backslashes Signed-off-by: Josh Soref * spelling: before Signed-off-by: Josh Soref * spelling: beginning Signed-off-by: Josh Soref * spelling: between Signed-off-by: Josh Soref * spelling: bounding Signed-off-by: Josh Soref * spelling: bracket Signed-off-by: Josh Soref * spelling: builtin Signed-off-by: Josh Soref * spelling: calculated Signed-off-by: Josh Soref * spelling: categories Signed-off-by: Josh Soref * spelling: check Signed-off-by: Josh Soref * spelling: class Signed-off-by: Josh Soref * spelling: clearance Signed-off-by: Josh Soref * spelling: column Signed-off-by: Josh Soref * spelling: combinations Signed-off-by: Josh Soref * spelling: completed Signed-off-by: Josh Soref * spelling: composer Signed-off-by: Josh Soref * spelling: compression Signed-off-by: Josh Soref * spelling: consideration Signed-off-by: Josh Soref * spelling: constraints Signed-off-by: Josh Soref * spelling: container Signed-off-by: Josh Soref * spelling: continuous Signed-off-by: Josh Soref * spelling: contrabass Signed-off-by: Josh Soref * spelling: control Signed-off-by: Josh Soref * spelling: convergence Signed-off-by: Josh Soref * spelling: conversion Signed-off-by: Josh Soref * spelling: convert Signed-off-by: Josh Soref * spelling: coordinates Signed-off-by: Josh Soref * spelling: correctly Signed-off-by: Josh Soref * spelling: corresponds Signed-off-by: Josh Soref * spelling: counting Signed-off-by: Josh Soref * spelling: crescendo Signed-off-by: Josh Soref * spelling: customizable Signed-off-by: Josh Soref * spelling: cutout Signed-off-by: Josh Soref * spelling: deep Signed-off-by: Josh Soref * spelling: denom Signed-off-by: Josh Soref * spelling: denominator Signed-off-by: Josh Soref * spelling: diagram Signed-off-by: Josh Soref * spelling: diminished Signed-off-by: Josh Soref * spelling: direction Signed-off-by: Josh Soref * spelling: directories Signed-off-by: Josh Soref * spelling: disconnected Signed-off-by: Josh Soref * spelling: doesn't Signed-off-by: Josh Soref * spelling: dotted Signed-off-by: Josh Soref * spelling: easeinout Signed-off-by: Josh Soref * spelling: eighth Signed-off-by: Josh Soref * spelling: element Signed-off-by: Josh Soref * spelling: elements Signed-off-by: Josh Soref * spelling: enabled Signed-off-by: Josh Soref * spelling: engraving Signed-off-by: Josh Soref * spelling: evenly Signed-off-by: Josh Soref * spelling: exactly Signed-off-by: Josh Soref * spelling: exceed Signed-off-by: Josh Soref * spelling: excerpts Signed-off-by: Josh Soref * spelling: excessively Signed-off-by: Josh Soref * spelling: exclusive Signed-off-by: Josh Soref * spelling: extension Signed-off-by: Josh Soref * spelling: extrapolated Signed-off-by: Josh Soref * spelling: farthest Signed-off-by: Josh Soref * spelling: fits Signed-off-by: Josh Soref * spelling: friends Signed-off-by: Josh Soref * spelling: function Signed-off-by: Josh Soref * spelling: glissando Signed-off-by: Josh Soref * spelling: global Signed-off-by: Josh Soref * spelling: grid Signed-off-by: Josh Soref * spelling: halved Signed-off-by: Josh Soref * spelling: happen * spelling: harmonies Signed-off-by: Josh Soref * spelling: have Signed-off-by: Josh Soref * spelling: header Signed-off-by: Josh Soref * spelling: height Signed-off-by: Josh Soref * spelling: iabbrev Signed-off-by: Josh Soref * spelling: ideally Signed-off-by: Josh Soref * spelling: implementation Signed-off-by: Josh Soref * spelling: in Signed-off-by: Josh Soref * spelling: incoming Signed-off-by: Josh Soref * spelling: incomplete Signed-off-by: Josh Soref * spelling: increase Signed-off-by: Josh Soref * spelling: indentation Signed-off-by: Josh Soref * spelling: individual Signed-off-by: Josh Soref * spelling: infer Signed-off-by: Josh Soref * spelling: initial Signed-off-by: Josh Soref * spelling: initially Signed-off-by: Josh Soref * spelling: inputted Signed-off-by: Josh Soref * spelling: instrument Signed-off-by: Josh Soref * spelling: instruments Signed-off-by: Josh Soref * spelling: invalid Signed-off-by: Josh Soref * spelling: invocation Signed-off-by: Josh Soref * spelling: iplugin Signed-off-by: Josh Soref * spelling: javascript Signed-off-by: Josh Soref * spelling: label Signed-off-by: Josh Soref * spelling: laid out Signed-off-by: Josh Soref * spelling: languages Signed-off-by: Josh Soref * spelling: length Signed-off-by: Josh Soref * spelling: linked Signed-off-by: Josh Soref * spelling: lyrchord Signed-off-by: Josh Soref * spelling: lyricist Signed-off-by: Josh Soref * spelling: managed Signed-off-by: Josh Soref * spelling: manually Signed-off-by: Josh Soref * spelling: mapping Signed-off-by: Josh Soref * spelling: mappings Signed-off-by: Josh Soref * spelling: margins Signed-off-by: Josh Soref * spelling: measure Signed-off-by: Josh Soref * spelling: metric Signed-off-by: Josh Soref * spelling: metronome Signed-off-by: Josh Soref * spelling: military Signed-off-by: Josh Soref * spelling: milliseconds Signed-off-by: Josh Soref * spelling: minimum Signed-off-by: Josh Soref * spelling: modifiers Signed-off-by: Josh Soref * spelling: moving Signed-off-by: Josh Soref * spelling: multi Signed-off-by: Josh Soref * spelling: namespace Signed-off-by: Josh Soref * spelling: navigate Signed-off-by: Josh Soref * spelling: necessary Signed-off-by: Josh Soref * spelling: needs Signed-off-by: Josh Soref * spelling: newly Signed-off-by: Josh Soref * spelling: notation Signed-off-by: Josh Soref * spelling: numerator Signed-off-by: Josh Soref * spelling: occasionally Signed-off-by: Josh Soref * spelling: occurred Signed-off-by: Josh Soref * spelling: occurrence Signed-off-by: Josh Soref * spelling: omitted Signed-off-by: Josh Soref * spelling: or Signed-off-by: Josh Soref * spelling: oriented Signed-off-by: Josh Soref * spelling: originally Signed-off-by: Josh Soref * spelling: ornament Signed-off-by: Josh Soref * spelling: ornaments Signed-off-by: Josh Soref * spelling: output Signed-off-by: Josh Soref * spelling: outputted Signed-off-by: Josh Soref * spelling: outside Signed-off-by: Josh Soref * spelling: overlapping Signed-off-by: Josh Soref * spelling: overridden Signed-off-by: Josh Soref * spelling: package Signed-off-by: Josh Soref * spelling: padding Signed-off-by: Josh Soref * spelling: parameter Signed-off-by: Josh Soref * spelling: percussion Signed-off-by: Josh Soref * spelling: placement Signed-off-by: Josh Soref * spelling: playthrough Signed-off-by: Josh Soref * spelling: positive Signed-off-by: Josh Soref * spelling: preceded Signed-off-by: Josh Soref * spelling: precision Signed-off-by: Josh Soref * spelling: previous Signed-off-by: Josh Soref * spelling: process Signed-off-by: Josh Soref * spelling: property Signed-off-by: Josh Soref * spelling: proximity Signed-off-by: Josh Soref * spelling: publish Signed-off-by: Josh Soref * spelling: rasgueado Signed-off-by: Josh Soref * spelling: read Signed-off-by: Josh Soref * spelling: receive Signed-off-by: Josh Soref * spelling: received Signed-off-by: Josh Soref * spelling: rectangle Signed-off-by: Josh Soref * spelling: regarding Signed-off-by: Josh Soref * spelling: register Signed-off-by: Josh Soref * spelling: registry Signed-off-by: Josh Soref * spelling: rehearsal Signed-off-by: Josh Soref * spelling: related Signed-off-by: Josh Soref * spelling: repeat Signed-off-by: Josh Soref * spelling: repeatp Signed-off-by: Josh Soref * spelling: replacements Signed-off-by: Josh Soref * spelling: represent Signed-off-by: Josh Soref * spelling: representation Signed-off-by: Josh Soref * spelling: responses Signed-off-by: Josh Soref * spelling: rhythm Signed-off-by: Josh Soref * spelling: section Signed-off-by: Josh Soref * spelling: selected Signed-off-by: Josh Soref * spelling: selection Signed-off-by: Josh Soref * spelling: separation Signed-off-by: Josh Soref * spelling: separator Signed-off-by: Josh Soref * spelling: shortcuts Signed-off-by: Josh Soref * spelling: signatures Signed-off-by: Josh Soref * spelling: simile Signed-off-by: Josh Soref * spelling: slurred Signed-off-by: Josh Soref * spelling: sound Signed-off-by: Josh Soref * spelling: staccato Signed-off-by: Josh Soref * spelling: staff Signed-off-by: Josh Soref * spelling: stuff Signed-off-by: Josh Soref * spelling: style Signed-off-by: Josh Soref * spelling: suffix Signed-off-by: Josh Soref * spelling: supported Signed-off-by: Josh Soref * spelling: symbol Signed-off-by: Josh Soref * spelling: symbols Signed-off-by: Josh Soref * spelling: system Signed-off-by: Josh Soref * spelling: tablature Signed-off-by: Josh Soref * spelling: tcp_invalid Signed-off-by: Josh Soref * spelling: that Signed-off-by: Josh Soref * spelling: the Signed-off-by: Josh Soref * spelling: thickness Signed-off-by: Josh Soref * spelling: tibetan Signed-off-by: Josh Soref * spelling: of Signed-off-by: Josh Soref * spelling: to Signed-off-by: Josh Soref * spelling: transparent Signed-off-by: Josh Soref * spelling: transpose Signed-off-by: Josh Soref * spelling: tremolo Signed-off-by: Josh Soref * spelling: ultimately Signed-off-by: Josh Soref * spelling: unassigned Signed-off-by: Josh Soref * spelling: underscore Signed-off-by: Josh Soref * spelling: unhandled Signed-off-by: Josh Soref * spelling: uninstall Signed-off-by: Josh Soref * spelling: unknown Signed-off-by: Josh Soref * spelling: unnamed Signed-off-by: Josh Soref * spelling: useful Signed-off-by: Josh Soref * spelling: usually Signed-off-by: Josh Soref * spelling: vertical Signed-off-by: Josh Soref * spelling: violin Signed-off-by: Josh Soref * spelling: visible Signed-off-by: Josh Soref * spelling: when Signed-off-by: Josh Soref * spelling: whether Signed-off-by: Josh Soref * spelling: with Signed-off-by: Josh Soref * spelling: within Signed-off-by: Josh Soref * spelling: without Signed-off-by: Josh Soref * spelling: would Signed-off-by: Josh Soref * spelling: writing Signed-off-by: Josh Soref * spelling: written Signed-off-by: Josh Soref * spelling: xmlns Signed-off-by: Josh Soref * Remove unused avaiableArticulationTypesChanged Signed-off-by: Josh Soref * spelling: firstSystemIndentation [API] Signed-off-by: Josh Soref * Enable testIncompleteTuplet Signed-off-by: Josh Soref * Drop stray comment Signed-off-by: Josh Soref * Update license header in module.cmake per https://github.com/musescore/MuseScore/pull/11566#discussion_r870550003 Signed-off-by: Josh Soref Co-authored-by: Josh Soref --- CMakeLists.txt | 4 +- Doxyfile.plugins | 8 +- build.cmake | 4 +- .../org.musescore.MuseScore.appdata.xml.in | 2 +- build/Packaging.cmake | 2 +- build/cmake/GetUtilsFunctions.cmake | 2 +- build/module.cmake | 59 ++++++------ build/packaging/NSIS.template.in | 46 +++++----- mscore3.txt | 6 +- .../musicxml/visual/testTitleFrameBottom.xml | 4 +- .../testTitleFrameBottomCopyrightTop.xml | 4 +- .../testTitleFrameTopCopyrightBottom.xml | 4 +- .../testoves/structure/tst_ove_structure.cpp | 2 +- ...mscx => paste_exceed_scoreLen_MMrest.mscx} | 0 ...t => paste_exceed_scoreLen_MMrest2.script} | 2 +- share/autobotscripts/steps/Navigation.js | 28 +++--- share/instruments/instruments.xml | 2 +- share/instruments/instrumentsxml.h | 2 +- share/sound/FluidR3MonoChangeLog.txt | 2 +- share/sound/MuseScore_General_Changelog.txt | 2 +- share/styles/chords_std.xml | 2 +- src/appshell/commandlinecontroller.cpp | 2 +- .../qml/Preferences/IOPreferencesPage.qml | 2 +- .../Preferences/NoteInputPreferencesPage.qml | 4 +- .../Preferences/internal/FoldersSection.qml | 2 +- .../internal/MidiDevicesSection.qml | 4 +- .../qml/Preferences/internal/ZoomSection.qml | 2 +- src/appshell/qml/PublishPage/PublishPage.qml | 2 +- src/appshell/qml/dockwindow/DockPage.qml | 8 +- .../view/dockwindow/dockpanelview.cpp | 4 +- src/appshell/view/dockwindow/docktypes.h | 2 +- src/appshell/view/dockwindow/dockwindow.cpp | 6 +- .../view/dockwindow/internal/dockbase.cpp | 4 +- .../dockwindow/internal/dockframemodel.cpp | 2 +- .../preferences/advancedpreferencesmodel.cpp | 2 +- .../preferences/folderspreferencesmodel.cpp | 4 +- .../preferences/folderspreferencesmodel.h | 2 +- .../preferences/noteinputpreferencesmodel.cpp | 12 +-- .../preferences/noteinputpreferencesmodel.h | 8 +- src/autobot/CMakeLists.txt | 4 - src/autobot/internal/api/navigationapi.cpp | 22 ++--- src/autobot/internal/api/navigationapi.h | 4 +- src/autobot/internal/autobotinteractive.cpp | 4 +- src/autobot/internal/autobotinteractive.h | 2 +- src/converter/CMakeLists.txt | 2 +- .../internal/compat/notationmeta.cpp | 6 +- .../internal/diagnosticsactionscontroller.cpp | 4 +- .../internal/engravingelementsprovider.h | 2 +- .../Diagnostics/EngravingElementsPanel.qml | 6 +- src/engraving/compat/writescorehook.cpp | 2 +- src/engraving/infrastructure/draw/geometry.h | 2 +- .../internal/engravingconfiguration.cpp | 2 +- src/engraving/infrastructure/io/mscwriter.cpp | 4 +- src/engraving/infrastructure/io/mscwriter.h | 2 +- src/engraving/layout/layoutharmonies.cpp | 2 +- src/engraving/layout/layoutsystem.cpp | 8 +- src/engraving/libmscore/accidental.cpp | 2 +- src/engraving/libmscore/ambitus.cpp | 2 +- src/engraving/libmscore/barline.cpp | 2 +- src/engraving/libmscore/box.cpp | 6 +- src/engraving/libmscore/box.h | 2 +- src/engraving/libmscore/changeMap.cpp | 2 +- src/engraving/libmscore/chord.cpp | 2 +- src/engraving/libmscore/clef.cpp | 2 +- src/engraving/libmscore/cmd.cpp | 6 +- src/engraving/libmscore/durationtype.cpp | 2 +- src/engraving/libmscore/easeInOut.cpp | 4 +- src/engraving/libmscore/edit.cpp | 6 +- src/engraving/libmscore/engravingitem.cpp | 4 +- src/engraving/libmscore/engravingitem.h | 2 +- src/engraving/libmscore/factory.cpp | 2 +- src/engraving/libmscore/figuredbass.h | 2 +- src/engraving/libmscore/glissando.cpp | 2 +- src/engraving/libmscore/harmony.cpp | 2 +- src/engraving/libmscore/harmony.h | 2 +- src/engraving/libmscore/instrument.cpp | 2 +- src/engraving/libmscore/keysig.cpp | 6 +- src/engraving/libmscore/layoutbreak.cpp | 21 ++--- src/engraving/libmscore/layoutbreak.h | 6 +- src/engraving/libmscore/lyrics.cpp | 2 +- src/engraving/libmscore/lyrics.h | 2 +- src/engraving/libmscore/masterscore.h | 4 +- src/engraving/libmscore/measure.cpp | 10 +-- src/engraving/libmscore/midimapping.cpp | 6 +- src/engraving/libmscore/note.cpp | 6 +- src/engraving/libmscore/note.h | 2 +- src/engraving/libmscore/noteentry.cpp | 4 +- src/engraving/libmscore/paste.cpp | 2 +- src/engraving/libmscore/pitchspelling.h | 2 +- src/engraving/libmscore/rendermidi.cpp | 6 +- src/engraving/libmscore/repeatlist.cpp | 16 ++-- src/engraving/libmscore/score.cpp | 2 +- src/engraving/libmscore/scorefont.cpp | 2 +- src/engraving/libmscore/scoretree.cpp | 4 +- src/engraving/libmscore/segment.cpp | 4 +- src/engraving/libmscore/segment.h | 2 +- src/engraving/libmscore/select.cpp | 2 +- src/engraving/libmscore/shadownote.cpp | 6 +- src/engraving/libmscore/shape.cpp | 2 +- src/engraving/libmscore/shape.h | 4 +- src/engraving/libmscore/slur.cpp | 2 +- src/engraving/libmscore/spanner.cpp | 2 +- src/engraving/libmscore/splitMeasure.cpp | 4 +- src/engraving/libmscore/stafftype.cpp | 2 +- src/engraving/libmscore/stafftype.h | 2 +- src/engraving/libmscore/stringdata.cpp | 2 +- src/engraving/libmscore/synthesizerstate.h | 2 +- src/engraving/libmscore/system.cpp | 2 +- src/engraving/libmscore/tie.cpp | 2 +- src/engraving/libmscore/types.h | 4 +- src/engraving/libmscore/undo.h | 2 +- src/engraving/libmscore/utils.cpp | 2 +- .../mapping/percussionssetupdataresolver.cpp | 2 +- .../mapping/stringssetupdataresolver.cpp | 2 +- .../mapping/windssetupdataresolver.cpp | 2 +- .../playback/metaparsers/metaparserbase.h | 6 +- src/engraving/playback/playbackmodel.cpp | 4 +- src/engraving/playback/playbackmodel.h | 2 +- .../playback/renderers/gracenotesrenderer.cpp | 6 +- .../playback/utils/arrangementutils.h | 2 +- src/engraving/rw/compat/read114.cpp | 2 +- src/engraving/rw/compat/read206.cpp | 4 +- src/engraving/style/defaultstyle.cpp | 8 +- src/engraving/style/defaultstyle.h | 6 +- ...-ref.mscx => instrumentNameAlign-ref.mscx} | 0 ...ameAlign.mscx => instrumentNameAlign.mscx} | 0 .../tests/compat206_data/updateReference | 2 +- src/engraving/tests/tst_compat206.cpp | 2 +- src/engraving/tests/tst_midi.cpp | 2 +- src/engraving/tests/tst_text.cpp | 4 +- src/engraving/types/fraction.h | 2 +- src/engraving/types/types.h | 4 +- src/engraving/utests/barline_tests.cpp | 2 +- src/engraving/utests/measure_tests.cpp | 4 +- .../META-INF/container.xml | 1 - .../META-INF/container.xml | 1 - .../META-INF/container.xml | 1 + .../Thumbnails/thumbnail.png | Bin .../audiosettings.json | 0 .../score_style.mss | 0 .../two_notes_continuous_glissando.mscx} | 0 .../viewsettings.json | 0 .../META-INF/container.xml | 1 + .../Thumbnails/thumbnail.png | Bin .../audiosettings.json | 0 .../score_style.mss | 0 ...o_notes_continuous_glissando_no_play.mscx} | 0 .../viewsettings.json | 0 .../utests/playbackeventsrendering_tests.cpp | 6 +- src/engraving/utests/playbackmodel_tests.cpp | 54 +++++------ src/engraving/utests/tempomap_tests.cpp | 20 ++--- .../utests/timesig_data/timesig-02-ref.mscx | 2 +- .../utests/timesig_data/timesig-02.mscx | 2 +- src/framework/README.md | 2 +- .../tests/accessibilitycontroller_tests.cpp | 2 +- src/framework/audio/audioerrors.h | 2 +- src/framework/audio/audiomodule.cpp | 2 +- .../platform/win/wincoreaudiodriver.cpp | 6 +- .../synthesizers/fluidsynth/sfcachedloader.h | 8 +- .../synthesizers/fluidsynth/soundmapping.h | 8 +- .../audio/internal/worker/audiostream.h | 2 +- .../internal/worker/samplerateconvertor.cpp | 2 +- .../internal/worker/samplerateconvertor.h | 4 +- .../Audio/DevTools/SoundFontsPanel.qml | 20 ++--- .../Audio/DevTools/SynthSettings.qml | 8 +- .../audio/view/synthssettingsmodel.cpp | 16 ++-- .../audio/view/synthssettingsmodel.h | 8 +- src/framework/global/settings.cpp | 6 +- src/framework/global/settings.h | 4 +- src/framework/global/stringutils.cpp | 4 +- .../internal/platform/win/winmidiinport.cpp | 4 +- src/framework/midi/midievent.h | 2 +- .../MuseScore/Mpe/ArticulationPatternPlot.qml | 6 +- src/framework/mpe/soundid.h | 6 +- .../mpe/tests/multinotearticulationstest.cpp | 4 +- .../mpe/tests/singlenotearticulationstest.cpp | 2 +- .../mpe/view/articulationpatternitem.h | 1 - src/framework/network/inetworkmanager.h | 8 +- .../network/internal/networkmanager.cpp | 40 ++++----- .../network/internal/networkmanager.h | 14 +-- src/framework/shortcuts/imidiremote.h | 2 +- .../shortcuts/internal/midiremote.cpp | 2 +- src/framework/shortcuts/internal/midiremote.h | 2 +- .../Shortcuts/EditMidiMappingDialog.qml | 2 +- .../Shortcuts/EditShortcutDialog.qml | 6 +- .../shortcuts/view/editmidimappingmodel.cpp | 2 +- .../shortcuts/view/editmidimappingmodel.h | 2 +- .../shortcuts/view/editshortcutmodel.cpp | 42 ++++----- .../shortcuts/view/editshortcutmodel.h | 18 ++-- .../shortcuts/view/mididevicemappingmodel.cpp | 2 +- .../shortcuts/view/shortcutsmodel.cpp | 6 +- .../ui/dev/interactivetestsmodel.cpp | 2 +- src/framework/ui/iinteractiveuriregister.h | 2 +- .../Ui/internal/StandardDialogPanel.qml | 2 +- .../ui/tests/navigationcontroller_tests.cpp | 2 +- src/framework/ui/view/uitheme.cpp | 2 +- .../UiComponents/FocusableControl.qml | 10 +-- .../MuseScore/UiComponents/StyledMenuItem.qml | 6 +- .../qml/MuseScore/UiComponents/Utils.js | 2 +- .../vst/internal/vstmodulesrepository.cpp | 2 +- .../vst/internal/vstpluginsregister.cpp | 2 +- .../vst/view/abstractvsteditorview.cpp | 2 +- src/framework/vst/vsttypes.h | 2 +- .../braille/internal/exportbraille.cpp | 74 +++++++-------- ...testGlissando_Example_16.6.1_MBC2015.mscx} | 0 ...tGlissando_Example_16.6.1_MBC2015_ref.brf} | 0 .../braille/tests/tst_braille_io.cpp | 4 +- src/importexport/capella/internal/capella.cpp | 4 +- .../capella/internal/capellareader.cpp | 6 +- src/importexport/guitarpro/CMakeLists.txt | 4 +- .../guitarpro/internal/gtp/gp67dombuilder.cpp | 73 ++++++++------- .../guitarpro/internal/gtp/gp67dombuilder.h | 8 +- .../guitarpro/internal/gtp/gp6dombuilder.cpp | 4 +- .../guitarpro/internal/gtp/gp7dombuilder.cpp | 4 +- .../guitarpro/internal/gtp/gpbeat.cpp | 8 +- .../guitarpro/internal/gtp/gpbeat.h | 20 ++--- .../guitarpro/internal/gtp/gpconverter.cpp | 84 +++++++++--------- .../guitarpro/internal/gtp/gpconverter.h | 4 +- .../guitarpro/internal/gtp/gpmasterbar.h | 10 +-- .../guitarpro/internal/gtp/gprhythm.cpp | 4 + .../internal/gtp/{gprhytm.h => gprhythm.h} | 18 ++-- .../guitarpro/internal/gtp/gprhytm.cpp | 4 - .../guitarpro/internal/gtp/gptrack.h | 6 +- .../guitarpro/internal/importgtp-gp4.cpp | 2 +- .../guitarpro/internal/importgtp-gp5.cpp | 2 +- .../guitarpro/internal/importgtp-gp6.cpp | 2 +- .../guitarpro/internal/importgtp.cpp | 6 +- .../guitarpro/internal/importgtp.h | 2 +- .../guitarpro/internal/importptb.cpp | 20 ++--- .../guitarpro/internal/importptb.h | 10 +-- .../tests/data/high-pitch.gp-ref.mscx | 4 +- .../tests/data/high-pitch.gp3-ref.mscx | 4 +- .../tests/data/high-pitch.gpx-ref.mscx | 4 +- .../guitarpro_old/internal/importgtp-gp4.cpp | 2 +- .../guitarpro_old/internal/importgtp-gp5.cpp | 2 +- .../guitarpro_old/internal/importgtp-gp6.cpp | 14 +-- .../guitarpro_old/internal/importgtp-gp7.cpp | 2 +- .../guitarpro_old/internal/importgtp.cpp | 6 +- .../guitarpro_old/internal/importgtp.h | 2 +- .../guitarpro_old/internal/importptb.cpp | 20 ++--- .../guitarpro_old/internal/importptb.h | 10 +-- .../tests/data/high-pitch.gp-ref.mscx | 4 +- .../tests/data/high-pitch.gp3-ref.mscx | 4 +- .../tests/data/high-pitch.gpx-ref.mscx | 4 +- .../internal/midiimport/importmidi_lrhand.cpp | 4 +- .../internal/midiimport/importmidi_meter.cpp | 2 +- .../midi/tests/tst_importmidi.cpp | 4 +- .../musicxml/internal/musicxml/exportxml.cpp | 22 ++--- .../internal/musicxml/importmxmlpass1.cpp | 2 +- .../internal/musicxml/importmxmlpass2.cpp | 10 +-- .../internal/musicxml/importxmlfirstpass.cpp | 2 +- .../internal/musicxmlconfiguration.cpp | 8 +- .../musicxml/internal/musicxmlreader.cpp | 6 +- src/importexport/musicxml/schema/musicxml.xsd | 4 +- .../tests/data/testIncorrectStaffNumber2.xml | 2 +- .../tests/data/testMaxNumberLevel.mscx | 2 +- .../tests/data/testMaxNumberLevel_ref.xml | 2 +- .../musicxml/tests/tst_mxml_io.cpp | 2 +- src/importexport/ove/internal/importove.cpp | 12 +-- src/importexport/ove/internal/ove.cpp | 2 +- src/importexport/ove/internal/ove.h | 4 +- .../notation/lines/hairpinsettingsmodel.cpp | 10 +-- .../notation/lines/hairpinsettingsmodel.h | 6 +- .../notation/lines/pedalsettingsmodel.cpp | 6 +- .../notation/lines/textlinesettingsmodel.cpp | 44 ++++----- .../notation/lines/textlinesettingsmodel.h | 28 +++--- .../accidentals/AccidentalSettings.qml | 4 +- .../notation/frames/VerticalFrameSettings.qml | 4 +- .../notation/lines/PedalSettings.qml | 4 +- .../lines/internal/HairpinStyleSettings.qml | 6 +- .../lines/internal/LineTextSettingsTab.qml | 16 ++-- .../sectionbreaks/SectionBreakSettings.qml | 6 +- .../timesignatures/TimeSignatureSettings.qml | 2 +- .../MuseScore/Inspector/text/TextSettings.qml | 2 +- src/inspector/view/widgets/gridcanvas.cpp | 2 +- .../InstrumentsScene/internal/FamilyView.qml | 2 +- .../internal/InstrumentsOnScoreView.qml | 2 +- .../internal/InstrumentsView.qml | 2 +- .../view/instrumentspaneltreemodel.cpp | 6 +- src/languages/internal/languagesservice.cpp | 6 +- src/multiinstances/internal/ipc/ipc.cpp | 12 +-- src/multiinstances/internal/ipc/ipc.h | 2 +- .../internal/ipc/ipcchannel.cpp | 12 +-- src/multiinstances/internal/ipc/ipcchannel.h | 2 +- src/multiinstances/internal/ipc/ipcsocket.cpp | 6 +- src/multiinstances/internal/ipc/ipcsocket.h | 4 +- src/notation/inotationconfiguration.h | 8 +- src/notation/inotationinteraction.h | 2 +- src/notation/internal/masternotation.cpp | 6 +- src/notation/internal/masternotation.h | 2 +- .../internal/notationactioncontroller.cpp | 2 +- .../internal/notationconfiguration.cpp | 12 +-- src/notation/internal/notationconfiguration.h | 8 +- src/notation/internal/notationinteraction.cpp | 2 +- src/notation/internal/notationinteraction.h | 2 +- src/notation/view/continuouspanel.cpp | 2 +- src/notation/view/partlistmodel.cpp | 4 +- src/notation/view/widgets/editstaff.cpp | 2 +- src/notation/view/widgets/editstafftype.cpp | 4 +- src/notation/view/widgets/editstyle.cpp | 6 +- src/notation/view/widgets/editstyle.ui | 2 +- src/notation/view/widgets/timeline.cpp | 6 +- src/palette/internal/paletteconfiguration.cpp | 6 +- src/palette/view/widgets/keyedit.cpp | 2 +- src/playback/playbacktypes.h | 4 +- src/plugins/api/elements.h | 4 +- src/plugins/api/qmlpluginapi.h | 4 +- src/plugins/api/score.h | 2 +- src/plugins/api/selection.cpp | 2 +- src/plugins/internal/pluginsuiactions.h | 4 +- .../internal/exportprojectscenario.cpp | 2 +- src/project/internal/mscmetareader.cpp | 8 +- .../internal/projectactionscontroller.cpp | 4 +- .../Project/internal/AdditionalInfoView.qml | 6 +- .../ChooseInstrumentsAndTemplatesPage.qml | 6 +- .../Project/internal/TitleListView.qml | 2 +- src/project/tests/templatesrepositorytest.cpp | 2 +- .../framework/network/networkmanagerstub.h | 8 +- .../InstrumentsScene/InstrumentsDialog.qml | 2 +- test/README | 2 +- tools/codestyle/uncrustify_musescore.cfg | 2 +- 321 files changed, 951 insertions(+), 955 deletions(-) rename mtest/testscript/scripts/{paste_excceed_scoreLen_MMrest.mscx => paste_exceed_scoreLen_MMrest.mscx} (100%) rename mtest/testscript/scripts/{paste_excceed_scoreLen_MMrest2.script => paste_exceed_scoreLen_MMrest2.script} (88%) rename src/engraving/tests/compat206_data/{intrumentNameAlign-ref.mscx => instrumentNameAlign-ref.mscx} (100%) rename src/engraving/tests/compat206_data/{intrumentNameAlign.mscx => instrumentNameAlign.mscx} (100%) delete mode 100644 src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/META-INF/container.xml delete mode 100644 src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/META-INF/container.xml create mode 100644 src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/META-INF/container.xml rename src/engraving/utests/playbackeventsrenderer_data/{two_notes_continous_glissando => two_notes_continuous_glissando}/Thumbnails/thumbnail.png (100%) rename src/engraving/utests/playbackeventsrenderer_data/{two_notes_continous_glissando => two_notes_continuous_glissando}/audiosettings.json (100%) rename src/engraving/utests/playbackeventsrenderer_data/{two_notes_continous_glissando => two_notes_continuous_glissando}/score_style.mss (100%) rename src/engraving/utests/playbackeventsrenderer_data/{two_notes_continous_glissando/two_notes_continous_glissando.mscx => two_notes_continuous_glissando/two_notes_continuous_glissando.mscx} (100%) rename src/engraving/utests/playbackeventsrenderer_data/{two_notes_continous_glissando => two_notes_continuous_glissando}/viewsettings.json (100%) create mode 100644 src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/META-INF/container.xml rename src/engraving/utests/playbackeventsrenderer_data/{two_notes_continous_glissando_no_play => two_notes_continuous_glissando_no_play}/Thumbnails/thumbnail.png (100%) rename src/engraving/utests/playbackeventsrenderer_data/{two_notes_continous_glissando_no_play => two_notes_continuous_glissando_no_play}/audiosettings.json (100%) rename src/engraving/utests/playbackeventsrenderer_data/{two_notes_continous_glissando_no_play => two_notes_continuous_glissando_no_play}/score_style.mss (100%) rename src/engraving/utests/playbackeventsrenderer_data/{two_notes_continous_glissando_no_play/two_notes_continous_glissando_no_play.mscx => two_notes_continuous_glissando_no_play/two_notes_continuous_glissando_no_play.mscx} (100%) rename src/engraving/utests/playbackeventsrenderer_data/{two_notes_continous_glissando_no_play => two_notes_continuous_glissando_no_play}/viewsettings.json (100%) rename src/importexport/braille/tests/data/{testGlisando_Example_16.6.1_MBC2015.mscx => testGlissando_Example_16.6.1_MBC2015.mscx} (100%) rename src/importexport/braille/tests/data/{testGlisando_Example_16.6.1_MBC2015_ref.brf => testGlissando_Example_16.6.1_MBC2015_ref.brf} (100%) create mode 100644 src/importexport/guitarpro/internal/gtp/gprhythm.cpp rename src/importexport/guitarpro/internal/gtp/{gprhytm.h => gprhythm.h} (66%) delete mode 100644 src/importexport/guitarpro/internal/gtp/gprhytm.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index e45453f0d83f4..9172914c97e57 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 660178ac2d564..6bc62aeb1aab3 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 47793df96b929..1766d3c97f775 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 1f4a528a14dc5..35aeb3ac21bca 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 362d3e84738ca..6c608dd01c331 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 4f3e20e17c95b..42d5b8c20c7b7 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 45c291446460a..66ae259d75d2f 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 847ef51977429..fa85baed29ce0 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 037d1d3d4acf0..57b416c41fc21 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 eef74bbf79756..889fd688ad859 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 fe867fdf2fb4b..34578b40fd861 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 1353a032c68e8..9b3b40f5788ef 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 8a29ab945a181..67ae2c578dcb1 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 439af3c9ce523..591d45100419a 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 dbc5a8274c152..2fc33d435ef1d 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 3820d7a58ed09..9f7cf5f2e9bd6 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 717a0bf94771b..bb41a053e0866 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 1a628cae3d979..51c3ddb9225a1 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 d8abd0bb85508..5b113db5f7be0 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 1361f8be3a812..5dc2f6cfbc756 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 4f69236d0b789..7361a10fa71f5 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 2105df0d8f697..b60c5cd3e683c 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 3a0638d378b34..4c714982156a3 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 5354a099a9dc1..f33ec50c24dd0 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 eb37316947cdb..66b52b55790b6 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 bf41bb97e1986..a8f42040b3af2 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 59537e66b7386..8f7207c0de6fa 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 4cc6e868d2779..4157a048f8070 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 d49d7462f0f0b..65f0f835a588c 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 d3373491f98cf..85d347a0e42f5 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 07f0803ea27df..9b824ab2973d1 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 56371b2350d32..0a947a3e19bdb 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 2a0cdd4571057..7dd9f34df39a1 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 05b2c36f56a80..f7befa64ea2c1 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 d11b3af895001..e018dd3a5c81a 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 e589391716e57..e9aca25405983 100644 --- a/src/appshell/view/preferences/folderspreferencesmodel.h +++ b/src/appshell/view/preferences/folderspreferencesmodel.h @@ -62,7 +62,7 @@ class FoldersPreferencesModel : public QAbstractListModel, public async::Asyncab 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 1b971bd0d099f..945ad771ed25c 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 4f4e3d444f09a..a298cd3e8d9e8 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 @@ class NoteInputPreferencesModel : public QObject explicit NoteInputPreferencesModel(QObject* parent = nullptr); bool advanceToNextNoteOnKeyRelease() const; - bool colorNotesOusideOfUsablePitchRange() const; + bool colorNotesOutsideOfUsablePitchRange() const; int delayBetweenNotesInRealTimeModeMilliseconds() const; bool playNotesWhenEditing() const; @@ -66,7 +66,7 @@ class NoteInputPreferencesModel : public QObject 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 8638ffa23f2e1..9628d9e915d4a 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 f358b2600d185..4093364605d27 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 f5374c15c0ed3..1d505bf5fe21d 100644 --- a/src/autobot/internal/api/navigationapi.h +++ b/src/autobot/internal/api/navigationapi.h @@ -49,9 +49,9 @@ class NavigationApi : public ApiObject 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 138042b9f30c4..ae6899db4c822 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 c5fae3a32cee2..2981e96b937b1 100644 --- a/src/autobot/internal/autobotinteractive.h +++ b/src/autobot/internal/autobotinteractive.h @@ -67,7 +67,7 @@ class AutobotInteractive : public framework::IInteractive // 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 e74f7e2b9dccb..e81ffff3e21b9 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 4181cfb7c0074..a31b229601489 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 922d845c11e11..543e7ebc1526e 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 e5ce5342e5491..50d3414befcde 100644 --- a/src/diagnostics/internal/engravingelementsprovider.h +++ b/src/diagnostics/internal/engravingelementsprovider.h @@ -42,7 +42,7 @@ class EngravingElementsProvider : public IEngravingElementsProvider 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 26a53640f2e27..25fb7958e5e36 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 25d7944959cbe..264728791f9a8 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 b1ee0510088d6..6e3cd56122390 100644 --- a/src/engraving/infrastructure/draw/geometry.h +++ b/src/engraving/infrastructure/draw/geometry.h @@ -441,7 +441,7 @@ class PolygonX : public std::vector > 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 640c34f4b9863..78b51f80606b3 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 664649ecbd60d..f9e8008730648 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 900948a60686d..9bd176a2a7dcb 100644 --- a/src/engraving/infrastructure/io/mscwriter.h +++ b/src/engraving/infrastructure/io/mscwriter.h @@ -115,7 +115,7 @@ class MscWriter 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 27d94e9d2556d..16c63fcfe2260 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 2b68304bf9518..9654f3b92077d 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 b4e6e26a114cb..e3b6d8627c139 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 b799ebf8e8e27..5ade8fd3f69f5 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 55547375b4536..71eb08329771e 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 c4720971445da..4303b55cf28ab 100644 --- a/src/engraving/libmscore/box.h +++ b/src/engraving/libmscore/box.h @@ -105,7 +105,7 @@ class Box : public MeasureBase 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 dc52160023468..9f85c01a00c89 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 2998076db7c5f..f5dccf899848c 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 f6186f960c892..9096a99da1110 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 79d2cded384e6..9ccf320c30475 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 bc55d4ceed436..dd3af2136c2ff 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 7c0829fae15dd..fc7cf4fa43e65 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 d9d68542dc217..057a2c6ee33cb 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 0ad6cf23c920c..162347025258c 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 15441fdb4c640..dc3f53175119e 100644 --- a/src/engraving/libmscore/engravingitem.h +++ b/src/engraving/libmscore/engravingitem.h @@ -606,7 +606,7 @@ class EngravingItem : public EngravingObject 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 94c7ba5a7a912..1124bbfaaab0c 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 6db00e458dccb..9fdd7055d1836 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 00047f0b19684..8d60956b148a8 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 d273d14b5b135..609a80aff3f12 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 f66667aa7784f..36d3d02ae3eca 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 6c86efc99e848..203fa2ba5707b 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 a42d05463ecce..0ea9df3e25574 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 94720f49806da..071eed4e7a3ae 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 fedeeceaefe9b..ac28ce65a9095 100644 --- a/src/engraving/libmscore/layoutbreak.h +++ b/src/engraving/libmscore/layoutbreak.h @@ -59,8 +59,8 @@ class LayoutBreak final : public EngravingItem 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 @@ class LayoutBreak final : public EngravingItem 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 bebe6e685764f..b8e36661d25e0 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 ff71982348603..e2a5e54ba0ab8 100644 --- a/src/engraving/libmscore/lyrics.h +++ b/src/engraving/libmscore/lyrics.h @@ -44,7 +44,7 @@ class Lyrics final : public TextBase // 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 be57ad338164e..c8cb066a43861 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 @@ class MasterScore : public Score 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 c9ca7bfcfef15..ad381e82df5b4 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 5a7dd879cc15f..c69f4b87e3376 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 0bacd3bcf5a0f..71962aa041943 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 68ad1fa9f458a..b384cd970065a 100644 --- a/src/engraving/libmscore/note.h +++ b/src/engraving/libmscore/note.h @@ -152,7 +152,7 @@ class Note final : public EngravingItem 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 1f421dd9ebfd2..2c8392e48b575 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 d89aae38d8a17..df5680ec8346a 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 82b71a3d3df34..f3e51675baec2 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 cf3924e63369c..4e384e8632b3c 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 5c77c59c7e3a4..71f34e18842b9 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 3d20431aaf403..65c338b76b4bb 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 071f59113776e..51607519bfe4e 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 0a55a1fbd482c..ce2ea923eec9f 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 bb7e753ae8957..d95b0353fafe2 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 65df357d0cbdc..99975bb71f6ac 100644 --- a/src/engraving/libmscore/segment.h +++ b/src/engraving/libmscore/segment.h @@ -261,7 +261,7 @@ class Segment final : public EngravingItem */ 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 cd87ec78f9f77..6ec302e887886 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 15d2db7cce065..31f58f48207bb 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 393837edcd79f..be79089f29ac0 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 1360cc8ff1598..2d24e318db03a 100644 --- a/src/engraving/libmscore/shape.h +++ b/src/engraving/libmscore/shape.h @@ -112,7 +112,7 @@ class Shape : public std::vector // 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 f6574a629d664..42283a8bc31fb 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 e5674399a6436..29074cdab98b4 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 170b19816feff..915a3526eccb5 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 10de07a3b7ab4..60a8a1a656ad7 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 1ebe203ccf3e7..f30177be696cb 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 61b3444e0f21b..9dc9052bd1ab9 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 2b98450491001..44b5f076fd310 100644 --- a/src/engraving/libmscore/synthesizerstate.h +++ b/src/engraving/libmscore/synthesizerstate.h @@ -90,7 +90,7 @@ class SynthesizerState : public std::list }; //--------------------------------------------------------- -// 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 9d731b2e391fc..3535bbd2ed6f6 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 797d44f19d837..10751a9293af5 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 27573dd9251e0..28744fc89d92e 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 9f5e91f427c22..357070b3ba297 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/engraving/libmscore/utils.cpp b/src/engraving/libmscore/utils.cpp index ce35cce60884e..8e62e58f10602 100644 --- a/src/engraving/libmscore/utils.cpp +++ b/src/engraving/libmscore/utils.cpp @@ -579,7 +579,7 @@ Interval intervalList[intervalListSize] = { Interval(6, 11), // 22 Major Seventh Interval(6, 12), // 23 Augmented Seventh - Interval(7, 11), // 24 Diminshed Octave + Interval(7, 11), // 24 Diminished Octave Interval(7, 12) // 25 Perfect Octave }; diff --git a/src/engraving/playback/mapping/percussionssetupdataresolver.cpp b/src/engraving/playback/mapping/percussionssetupdataresolver.cpp index a89903ce09bfb..25dcedee6c3da 100644 --- a/src/engraving/playback/mapping/percussionssetupdataresolver.cpp +++ b/src/engraving/playback/mapping/percussionssetupdataresolver.cpp @@ -120,7 +120,7 @@ const PlaybackSetupData& PercussionsSetupDataResolver::doResolve(const Ms::Instr { "congas", { SoundId::Conga, SoundCategory::Percussions, {}, {} } }, { "cuica", { SoundId::Cuica, SoundCategory::Percussions, {}, {} } }, { "drumset", { SoundId::Drumset, SoundCategory::Percussions, {}, {} } }, - { "military-drum", { SoundId::Drum, SoundCategory::Percussions, { SoundSubCategory::Millitary }, {} } }, + { "military-drum", { SoundId::Drum, SoundCategory::Percussions, { SoundSubCategory::Military }, {} } }, { "frame-drum", { SoundId::Drum, SoundCategory::Percussions, { SoundSubCategory::Frame }, {} } }, { "piccolo-snare-drum", { SoundId::Drum, SoundCategory::Percussions, { SoundSubCategory::Snare, SoundSubCategory::Piccolo }, {} } }, diff --git a/src/engraving/playback/mapping/stringssetupdataresolver.cpp b/src/engraving/playback/mapping/stringssetupdataresolver.cpp index 5a7a949c2bf73..ea13e13c1cce0 100644 --- a/src/engraving/playback/mapping/stringssetupdataresolver.cpp +++ b/src/engraving/playback/mapping/stringssetupdataresolver.cpp @@ -178,7 +178,7 @@ const PlaybackSetupData& StringsSetupDataResolver::doResolve(const Ms::Instrumen { "strings", { SoundId::StringsGroup, SoundCategory::Strings, {}, {} } }, { "double-bass", { SoundId::Contrabass, SoundCategory::Strings, { SoundSubCategory::Orchestral }, {} } }, { "contrabass", { SoundId::Contrabass, SoundCategory::Strings, { SoundSubCategory::Orchestral }, {} } }, - { "contrabasses", { SoundId::ContrabasseSection, SoundCategory::Strings, { SoundSubCategory::Orchestral }, {} } }, + { "contrabasses", { SoundId::ContrabassSection, SoundCategory::Strings, { SoundSubCategory::Orchestral }, {} } }, { "violin", { SoundId::Violin, SoundCategory::Strings, { SoundSubCategory::Orchestral }, {} } }, { "violins", { SoundId::ViolinSection, SoundCategory::Strings, { SoundSubCategory::Orchestral }, {} } }, { "viola", { SoundId::Viola, SoundCategory::Strings, { SoundSubCategory::Orchestral }, {} } }, diff --git a/src/engraving/playback/mapping/windssetupdataresolver.cpp b/src/engraving/playback/mapping/windssetupdataresolver.cpp index eedb6d2bc6fdd..2e3e21136fffa 100644 --- a/src/engraving/playback/mapping/windssetupdataresolver.cpp +++ b/src/engraving/playback/mapping/windssetupdataresolver.cpp @@ -411,7 +411,7 @@ const PlaybackSetupData& WindsSetupDataResolver::doResolve(const Ms::Instrument* { "horagai", { SoundId::Horagai, SoundCategory::Winds, { SoundSubCategory::Japanese }, {} } }, { "alphorn", { SoundId::Alphorn, SoundCategory::Winds, { SoundSubCategory::Alpine }, {} } }, - { "rag-dung", { SoundId::RagDung, SoundCategory::Winds, { SoundSubCategory::Tibetian }, {} } }, + { "rag-dung", { SoundId::RagDung, SoundCategory::Winds, { SoundSubCategory::Tibetan }, {} } }, { "didgeridoo", { SoundId::Didgeridoo, SoundCategory::Winds, { SoundSubCategory::Australian }, {} } }, { "shofar", { SoundId::Shofar, SoundCategory::Winds, {}, {} } }, { "vuvuzela", { SoundId::Vuvuzela, SoundCategory::Winds, {}, {} } }, diff --git a/src/engraving/playback/metaparsers/metaparserbase.h b/src/engraving/playback/metaparsers/metaparserbase.h index 7cb3ec18860ed..e473eb3dbc40e 100644 --- a/src/engraving/playback/metaparsers/metaparserbase.h +++ b/src/engraving/playback/metaparsers/metaparserbase.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef MU_ENGRAING_PARSERBASE_H -#define MU_ENGRAING_PARSERBASE_H +#ifndef MU_ENGRAVING_PARSERBASE_H +#define MU_ENGRAVING_PARSERBASE_H #include "log.h" #include "mpe/mpetypes.h" @@ -54,4 +54,4 @@ class MetaParserBase }; } -#endif // MU_ENGRAING_PARSERBASE_H +#endif // MU_ENGRAVING_PARSERBASE_H diff --git a/src/engraving/playback/playbackmodel.cpp b/src/engraving/playback/playbackmodel.cpp index 8c1ec6357db92..8663b911c569f 100644 --- a/src/engraving/playback/playbackmodel.cpp +++ b/src/engraving/playback/playbackmodel.cpp @@ -506,9 +506,9 @@ InstrumentTrackId PlaybackModel::idKey(const Ms::EngravingItem* item) const item->part()->instrumentId(item->tick()).toStdString() }; } -InstrumentTrackId PlaybackModel::idKey(const ID& partId, const std::string& instrimentId) const +InstrumentTrackId PlaybackModel::idKey(const ID& partId, const std::string& instrumentId) const { - return { partId, instrimentId }; + return { partId, instrumentId }; } InstrumentTrackIdSet PlaybackModel::existingTrackIdSet() const diff --git a/src/engraving/playback/playbackmodel.h b/src/engraving/playback/playbackmodel.h index e95b23693111b..825128e0033a3 100644 --- a/src/engraving/playback/playbackmodel.h +++ b/src/engraving/playback/playbackmodel.h @@ -90,7 +90,7 @@ class PlaybackModel : public async::Asyncable }; InstrumentTrackId idKey(const Ms::EngravingItem* item) const; - InstrumentTrackId idKey(const ID& partId, const std::string& instrimentId) const; + InstrumentTrackId idKey(const ID& partId, const std::string& instrumentId) const; InstrumentTrackIdSet existingTrackIdSet() const; void update(const int tickFrom, const int tickTo, const track_idx_t trackFrom, const track_idx_t trackTo, diff --git a/src/engraving/playback/renderers/gracenotesrenderer.cpp b/src/engraving/playback/renderers/gracenotesrenderer.cpp index ffffc0331c430..488ec7e17eeb6 100644 --- a/src/engraving/playback/renderers/gracenotesrenderer.cpp +++ b/src/engraving/playback/renderers/gracenotesrenderer.cpp @@ -178,7 +178,7 @@ void GraceNotesRenderer::buildPrincipalNoteEvents(const Ms::Chord* chord, const duration_t GraceNotesRenderer::graceNotesMaxAvailableDuration(const ArticulationType type, const RenderingContext& ctx, const size_t graceNotesCount) { - duration_t halfedDuration = 0.5 * ctx.nominalDuration; + duration_t halvedDuration = 0.5 * ctx.nominalDuration; duration_t twoThirdsDuration = (2 * ctx.nominalDuration) / 3; if (type == ArticulationType::PostAppoggiatura @@ -186,13 +186,13 @@ duration_t GraceNotesRenderer::graceNotesMaxAvailableDuration(const Articulation if (ctx.timeSignatureFraction.isCompound() && ctx.nominalDurationTicks > QUAVER_TICKS) { return twoThirdsDuration; } else { - return halfedDuration; + return halvedDuration; } } duration_t minAcciacaturaDuration = durationFromTicks(ctx.beatsPerSecond.val, DEMISEMIQUAVER_TICKS / 2); - return std::min(minAcciacaturaDuration * static_cast(graceNotesCount), halfedDuration); + return std::min(minAcciacaturaDuration * static_cast(graceNotesCount), halvedDuration); } timestamp_t GraceNotesRenderer::graceNotesStartTimestamp(const mpe::ArticulationType type, const mpe::duration_t availableDuration, diff --git a/src/engraving/playback/utils/arrangementutils.h b/src/engraving/playback/utils/arrangementutils.h index e6eac1fe8f396..8edf86bde8c56 100644 --- a/src/engraving/playback/utils/arrangementutils.h +++ b/src/engraving/playback/utils/arrangementutils.h @@ -50,7 +50,7 @@ static constexpr int DEMISEMIQUAVER_TICKS = Ms::Constant::division / 8; static constexpr qreal PRESTISSIMO_BPS_BOUND = 200 /*bpm*/ / 60.f /*secs*/; static constexpr qreal PRESTO_BPS_BOUND = 168 /*bpm*/ / 60.f /*secs*/; -static constexpr qreal ALEGRO_BPS_BOUND = 120 /*bpm*/ / 60.f /*secs*/; +static constexpr qreal ALLEGRO_BPS_BOUND = 120 /*bpm*/ / 60.f /*secs*/; static constexpr qreal MODERATO_BPS_BOUND = 108 /*bpm*/ / 60.f /*secs*/; static constexpr qreal ANDANTE_BPS_BOUND = 76 /*bpm*/ / 60.f /*secs*/; static constexpr qreal ADAGIO_BPS_BOUND = 66 /*bpm*/ / 60.f /*secs*/; diff --git a/src/engraving/rw/compat/read114.cpp b/src/engraving/rw/compat/read114.cpp index f58e7088bd9c3..f70142c0827d5 100644 --- a/src/engraving/rw/compat/read114.cpp +++ b/src/engraving/rw/compat/read114.cpp @@ -2151,7 +2151,7 @@ static void readMeasure(Measure* m, int staffIdx, XmlReader& e, ReadContext& ctx } } // For nested tuplets created with MuseScore 1.3 tuplet dialog (i.e. "Other..." dialog), - // the parent tuplet was not set. Try to infere if the tuplet was actually a nested tuplet + // the parent tuplet was not set. Try to infer if the tuplet was actually a nested tuplet for (auto& p : ctx.tuplets()) { Tuplet* tuplet = p.second; Fraction tupletTick = tuplet->tick(); diff --git a/src/engraving/rw/compat/read206.cpp b/src/engraving/rw/compat/read206.cpp index f7e05b7e82617..8768f28531f2a 100644 --- a/src/engraving/rw/compat/read206.cpp +++ b/src/engraving/rw/compat/read206.cpp @@ -159,7 +159,7 @@ void Read206::readTextStyle206(MStyle* style, XmlReader& e, std::mapsetTrack(note->track()); sp->read(e); Staff* staff = note->staff(); - // DISABLE pasting of glissandi into staves with other lionked staves + // DISABLE pasting of glissandi into staves with other linked staves // because the glissando is not properly cloned into the linked staves if (ctx.pasteMode() && staff && staff->links() && !staff->links()->empty()) { ctx.removeSpanner(sp); // read() added the element to the XMLReader: remove it diff --git a/src/engraving/style/defaultstyle.cpp b/src/engraving/style/defaultstyle.cpp index 268aca3c089fc..9637dd2251ca0 100644 --- a/src/engraving/style/defaultstyle.cpp +++ b/src/engraving/style/defaultstyle.cpp @@ -44,13 +44,13 @@ DefaultStyle* DefaultStyle::instance() return &s; } -void DefaultStyle::init(const QString& defaultSyleFilePath, const QString& partStyleFilePath) +void DefaultStyle::init(const QString& defaultStyleFilePath, const QString& partStyleFilePath) { m_baseStyle.precomputeValues(); - if (!defaultSyleFilePath.isEmpty()) { + if (!defaultStyleFilePath.isEmpty()) { m_defaultStyle = new MStyle(); - bool ok = doLoadStyle(m_defaultStyle, defaultSyleFilePath); + bool ok = doLoadStyle(m_defaultStyle, defaultStyleFilePath); if (!ok) { delete m_defaultStyle; m_defaultStyle = nullptr; @@ -61,7 +61,7 @@ void DefaultStyle::init(const QString& defaultSyleFilePath, const QString& partS if (!partStyleFilePath.isEmpty()) { m_defaultStyleForParts = new MStyle(); - bool ok = doLoadStyle(m_defaultStyleForParts, defaultSyleFilePath); + bool ok = doLoadStyle(m_defaultStyleForParts, defaultStyleFilePath); if (!ok) { delete m_defaultStyleForParts; m_defaultStyleForParts = nullptr; diff --git a/src/engraving/style/defaultstyle.h b/src/engraving/style/defaultstyle.h index 005d24af10947..52fd06dc8b4dc 100644 --- a/src/engraving/style/defaultstyle.h +++ b/src/engraving/style/defaultstyle.h @@ -31,7 +31,7 @@ class DefaultStyle static DefaultStyle* instance(); - void init(const QString& defaultSyleFilePath, const QString& partStyleFilePath); + void init(const QString& defaultStyleFilePath, const QString& partStyleFilePath); static const Ms::MStyle& baseStyle(); @@ -47,8 +47,8 @@ class DefaultStyle static bool doLoadStyle(Ms::MStyle* style, const QString& filePath); - Ms::MStyle m_baseStyle; // buildin initial style - Ms::MStyle* m_defaultStyle; // buildin modified by preferences + Ms::MStyle m_baseStyle; // builtin initial style + Ms::MStyle* m_defaultStyle; // builtin modified by preferences Ms::MStyle* m_defaultStyleForParts = nullptr; }; } diff --git a/src/engraving/tests/compat206_data/intrumentNameAlign-ref.mscx b/src/engraving/tests/compat206_data/instrumentNameAlign-ref.mscx similarity index 100% rename from src/engraving/tests/compat206_data/intrumentNameAlign-ref.mscx rename to src/engraving/tests/compat206_data/instrumentNameAlign-ref.mscx diff --git a/src/engraving/tests/compat206_data/intrumentNameAlign.mscx b/src/engraving/tests/compat206_data/instrumentNameAlign.mscx similarity index 100% rename from src/engraving/tests/compat206_data/intrumentNameAlign.mscx rename to src/engraving/tests/compat206_data/instrumentNameAlign.mscx diff --git a/src/engraving/tests/compat206_data/updateReference b/src/engraving/tests/compat206_data/updateReference index c82203b7a9ee1..05d64b8a61074 100755 --- a/src/engraving/tests/compat206_data/updateReference +++ b/src/engraving/tests/compat206_data/updateReference @@ -20,5 +20,5 @@ cp $S/tuplets-test.mscx tuplets-ref.mscx cp $S/hairpin-test.mscx hairpin-ref.mscx cp $S/barlines-test.mscx barlines-ref.mscx cp $S/lidemptytext-test.mscx lidemptytext-ref.mscx -cp $S/intrumentNameAlign-test.mscx intrumentNameAlign-ref.mscx +cp $S/instrumentNameAlign-test.mscx instrumentNameAlign-ref.mscx cp $S/fermata-test.mscx fermata-ref.mscx diff --git a/src/engraving/tests/tst_compat206.cpp b/src/engraving/tests/tst_compat206.cpp index 8014b49441bfd..9c0e9cdb168cc 100644 --- a/src/engraving/tests/tst_compat206.cpp +++ b/src/engraving/tests/tst_compat206.cpp @@ -53,7 +53,7 @@ private slots: void hairpin() { compat("hairpin"); } void brlines() { compat("barlines"); } void lidEmptyText() { compat("lidemptytext"); } - void intrumentNameAlign() { compat("intrumentNameAlign"); } + void instrumentNameAlign() { compat("instrumentNameAlign"); } void fermata() { compat("fermata"); } void frame_utf8() { compat("frame_text2"); } }; diff --git a/src/engraving/tests/tst_midi.cpp b/src/engraving/tests/tst_midi.cpp index 81d9697bc4110..6f3ca9241245e 100644 --- a/src/engraving/tests/tst_midi.cpp +++ b/src/engraving/tests/tst_midi.cpp @@ -125,7 +125,7 @@ void TestMidi::events_data() QTest::newRow("testSwing16thDots") << "testSwing16thDots"; QTest::newRow("testSwingOdd") << "testSwingOdd"; QTest::newRow("testSwingPickup") << "testSwingPickup"; - // Test Text Cominations + // Test Text Combinations QTest::newRow("testSwingStyleText") << "testSwingStyleText"; //TODO::ws QTest::newRow("testSwingTexts") << "testSwingTexts"; // ornaments diff --git a/src/engraving/tests/tst_text.cpp b/src/engraving/tests/tst_text.cpp index 5d49da11af86c..c987d417e21e1 100644 --- a/src/engraving/tests/tst_text.cpp +++ b/src/engraving/tests/tst_text.cpp @@ -458,7 +458,7 @@ void TestText::testReadWrite() //--------------------------------------------------------- /// testBasicUnicodeDeletePreviousChar -/// text contains Basic Unicode symobls +/// text contains Basic Unicode symbols //--------------------------------------------------------- void TestText::testBasicUnicodeDeletePreviousChar() @@ -745,7 +745,7 @@ void TestText::testChineseBasicSupplemental() //--------------------------------------------------------- /// testDropUnicodeAfterSMUFLwhenCursorSetToSymbol /// Tests dropping unicode after SMUFL as described in https://github.com/musescore/MuseScore/pull/3020#issuecomment-281932322 -/// When appeding text after a symbol, TextBlock needs to always (regardless of the state of the cursor) append a new TEXT TextFragment after the SYMBOL TextFragment. +/// When appending text after a symbol, TextBlock needs to always (regardless of the state of the cursor) append a new TEXT TextFragment after the SYMBOL TextFragment. //--------------------------------------------------------- void TestText::testDropUnicodeAfterSMUFLwhenCursorSetToSymbol() diff --git a/src/engraving/types/fraction.h b/src/engraving/types/fraction.h index ae0856af05c31..c34a418dc655c 100644 --- a/src/engraving/types/fraction.h +++ b/src/engraving/types/fraction.h @@ -226,7 +226,7 @@ class Fraction Fraction operator/(const Fraction& v) const { return Fraction(*this) /= v; } Fraction operator/(int v) const { return Fraction(*this) /= v; } - // convertion + // conversion int ticks() const { if (m_numerator == -1 && m_denominator == 1) { // HACK diff --git a/src/engraving/types/types.h b/src/engraving/types/types.h index 6625721646e3e..0e8d326e35bd1 100644 --- a/src/engraving/types/types.h +++ b/src/engraving/types/types.h @@ -433,7 +433,7 @@ enum class KeyMode : signed char { enum class TextStyleType { DEFAULT, - // Page-orientde styles + // Page-oriented styles TITLE, SUBTITLE, COMPOSER, @@ -451,7 +451,7 @@ enum class TextStyleType { MEASURE_NUMBER, MMREST_RANGE, - // Sytem-level styles + // System-level styles TEMPO, METRONOME, REPEAT_LEFT, // align to start of measure diff --git a/src/engraving/utests/barline_tests.cpp b/src/engraving/utests/barline_tests.cpp index 9c9644c8b8f9d..42ddaa3e59030 100644 --- a/src/engraving/utests/barline_tests.cpp +++ b/src/engraving/utests/barline_tests.cpp @@ -178,7 +178,7 @@ TEST_F(BarlineTests, barline03) //--------------------------------------------------------- // barline04 // Sets custom span parameters to a system-initial start-repeat bar line and -// check that it is properly applied to it and to the start-reapeat bar lines of staves below. +// check that it is properly applied to it and to the start-repeat bar lines of staves below. // // NO REFERENCE SCORE IS USED. //--------------------------------------------------------- diff --git a/src/engraving/utests/measure_tests.cpp b/src/engraving/utests/measure_tests.cpp index c1b5099c3f2b4..5a421fd4dc26e 100644 --- a/src/engraving/utests/measure_tests.cpp +++ b/src/engraving/utests/measure_tests.cpp @@ -525,7 +525,7 @@ TEST_F(MeasureTests, measureNumbers) // every 5 measures (default interval) score->startCmd(); - // to know wheter measure numbers are shown at regular intervals or on every system, + // to know whether measure numbers are shown at regular intervals or on every system, // musescore simply checks if measure numbers are shown at system or not. score->undo(new ChangeStyleVal(score, Sid::measureNumberSystem, false)); score->setLayoutAll(); @@ -550,7 +550,7 @@ TEST_F(MeasureTests, measureNumbers) // Disable measure numbers score->startCmd(); - // to know wheter measure numbers are shown at regular intervals or on every system, + // to know whether measure numbers are shown at regular intervals or on every system, // musescore simply checks if measure numbers are shown at system or not. score->undo(new ChangeStyleVal(score, Sid::showMeasureNumber, false)); score->setLayoutAll(); diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/META-INF/container.xml b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/META-INF/container.xml deleted file mode 100644 index 5d83fb9d2d826..0000000000000 --- a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/META-INF/container.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/META-INF/container.xml b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/META-INF/container.xml deleted file mode 100644 index bb8af3795ad66..0000000000000 --- a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/META-INF/container.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/META-INF/container.xml b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/META-INF/container.xml new file mode 100644 index 0000000000000..c8dd1a409050f --- /dev/null +++ b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/META-INF/container.xml @@ -0,0 +1 @@ + diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/Thumbnails/thumbnail.png b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/Thumbnails/thumbnail.png similarity index 100% rename from src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/Thumbnails/thumbnail.png rename to src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/Thumbnails/thumbnail.png diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/audiosettings.json b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/audiosettings.json similarity index 100% rename from src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/audiosettings.json rename to src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/audiosettings.json diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/score_style.mss b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/score_style.mss similarity index 100% rename from src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/score_style.mss rename to src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/score_style.mss diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/two_notes_continous_glissando.mscx b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/two_notes_continuous_glissando.mscx similarity index 100% rename from src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/two_notes_continous_glissando.mscx rename to src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/two_notes_continuous_glissando.mscx diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/viewsettings.json b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/viewsettings.json similarity index 100% rename from src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando/viewsettings.json rename to src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando/viewsettings.json diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/META-INF/container.xml b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/META-INF/container.xml new file mode 100644 index 0000000000000..b4e03af475406 --- /dev/null +++ b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/META-INF/container.xml @@ -0,0 +1 @@ + diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/Thumbnails/thumbnail.png b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/Thumbnails/thumbnail.png similarity index 100% rename from src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/Thumbnails/thumbnail.png rename to src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/Thumbnails/thumbnail.png diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/audiosettings.json b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/audiosettings.json similarity index 100% rename from src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/audiosettings.json rename to src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/audiosettings.json diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/score_style.mss b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/score_style.mss similarity index 100% rename from src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/score_style.mss rename to src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/score_style.mss diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/two_notes_continous_glissando_no_play.mscx b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/two_notes_continuous_glissando_no_play.mscx similarity index 100% rename from src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/two_notes_continous_glissando_no_play.mscx rename to src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/two_notes_continuous_glissando_no_play.mscx diff --git a/src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/viewsettings.json b/src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/viewsettings.json similarity index 100% rename from src/engraving/utests/playbackeventsrenderer_data/two_notes_continous_glissando_no_play/viewsettings.json rename to src/engraving/utests/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/viewsettings.json diff --git a/src/engraving/utests/playbackeventsrendering_tests.cpp b/src/engraving/utests/playbackeventsrendering_tests.cpp index f81536199fef1..06cd0d19a81a1 100644 --- a/src/engraving/utests/playbackeventsrendering_tests.cpp +++ b/src/engraving/utests/playbackeventsrendering_tests.cpp @@ -739,7 +739,7 @@ TEST_F(PlaybackEventsRendererTests, TwoNotes_Continuous_Glissando) { // [GIVEN] Simple piece of score (piano, 4/4, 120 bpm, Treble Cleff) Ms::Score* score - = ScoreRW::readScore(PLAYBACK_EVENTS_RENDERING_DIR + "two_notes_continous_glissando/two_notes_continous_glissando.mscx"); + = ScoreRW::readScore(PLAYBACK_EVENTS_RENDERING_DIR + "two_notes_continuous_glissando/two_notes_continuous_glissando.mscx"); Ms::Measure* firstMeasure = score->firstMeasure(); ASSERT_TRUE(firstMeasure); @@ -777,7 +777,7 @@ TEST_F(PlaybackEventsRendererTests, TwoNotes_Continuous_Glissando) for (size_t i = 0; i < pair.second.size(); ++i) { const NoteEvent& noteEvent = std::get(pair.second.at(i)); - // [THEN] We expect that each note event has only one articulation applied - Continous Glissando + // [THEN] We expect that each note event has only one articulation applied - Continuous Glissando EXPECT_EQ(noteEvent.expressionCtx().articulations.size(), 1); EXPECT_TRUE(noteEvent.expressionCtx().articulations.contains(ArticulationType::ContinuousGlissando)); @@ -801,7 +801,7 @@ TEST_F(PlaybackEventsRendererTests, TwoNotes_Glissando_NoPlay) { // [GIVEN] Simple piece of score (piano, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore( - PLAYBACK_EVENTS_RENDERING_DIR + "two_notes_continous_glissando_no_play/two_notes_continous_glissando_no_play.mscx"); + PLAYBACK_EVENTS_RENDERING_DIR + "two_notes_continuous_glissando_no_play/two_notes_continuous_glissando_no_play.mscx"); Ms::Measure* firstMeasure = score->firstMeasure(); ASSERT_TRUE(firstMeasure); diff --git a/src/engraving/utests/playbackmodel_tests.cpp b/src/engraving/utests/playbackmodel_tests.cpp index bfb1727a6d379..35e37e71bb01f 100644 --- a/src/engraving/utests/playbackmodel_tests.cpp +++ b/src/engraving/utests/playbackmodel_tests.cpp @@ -72,12 +72,12 @@ class PlaybackModelTests : public ::testing::Test, public async::Asyncable /** * @brief PlaybackModelTests_SimpleRepeat - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 4 measures + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 4 measures * Additionally, there is a simple repeat from measure 2 up to measure 3. In total, we'll be playing 6 measures overall */ TEST_F(PlaybackModelTests, SimpleRepeat) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "repeat_range/repeat_range.mscx"); ASSERT_TRUE(score); @@ -106,13 +106,13 @@ TEST_F(PlaybackModelTests, SimpleRepeat) /** * @brief PlaybackModelTests_Two_Ending_Repeat - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 6 measures + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 6 measures * Additionally, there is a repeat at the end of the second measure. Measure 2 is the first ending of the repeat. * Measure 3 is the second ending of the repeat. In total, we'll be playing 7 measures overall */ TEST_F(PlaybackModelTests, Two_Ending_Repeat) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "repeat_with_2_voltas/repeat_with_2_voltas.mscx"); ASSERT_TRUE(score); @@ -141,13 +141,13 @@ TEST_F(PlaybackModelTests, Two_Ending_Repeat) /** * @brief PlaybackModelTests_Da_Capo_Al_Fine - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 6 measures + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 6 measures * Additionally, there is a "D.C. Al Fine" marking at the end of the 6-th measure. Measure 2 is marked by "Fine" * In total, we'll be playing 8 measures overall */ TEST_F(PlaybackModelTests, Da_Capo_Al_Fine) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "da_capo_al_fine/da_capo_al_fine.mscx"); ASSERT_TRUE(score); @@ -176,14 +176,14 @@ TEST_F(PlaybackModelTests, Da_Capo_Al_Fine) /** * @brief PlaybackModelTests_Dal_Segno_Al_Coda - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 6 measures + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 6 measures * Additionally, there is a "D.S. Al Coda" marking at the end of the 4-th measure. Measure 2 is marked by "Segno" marking. * The end of the 3-rd measure is marked by "To Coda" marking. The beginning of the 5-th measure is marked by "Coda" sign * In total, we'll be playing 8 measures overall */ TEST_F(PlaybackModelTests, Dal_Segno_Al_Coda) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "dal_segno_al_coda/dal_segno_al_coda.mscx"); ASSERT_TRUE(score); @@ -212,13 +212,13 @@ TEST_F(PlaybackModelTests, Dal_Segno_Al_Coda) /** * @brief PlaybackModelTests_Dal_Segno_Al_Fine - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 6 measures + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 6 measures * Additionally, there is a "D.S. Al Fine" marking at the end of the 6-th measure. Measure 2 is marked by "Segno" marking. * The end of the 4-th measure is marked by "Fine" marking. In total, we'll be playing 9 measures overall */ TEST_F(PlaybackModelTests, Dal_Segno_Al_Fine) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "dal_segno_al_fine/dal_segno_al_fine.mscx"); ASSERT_TRUE(score); @@ -247,13 +247,13 @@ TEST_F(PlaybackModelTests, Dal_Segno_Al_Fine) /** * @brief PlaybackModelTests_Da_Capo_Al_Coda - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 6 measures + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 6 measures * Additionally, there is a "D.C. Al Coda" marking at the end of the 6-th measure. The end of the measure 2 is marked by "To Coda". * The beginning of the 4-th measure is marked by "Coda" sign. In total, we'll be playing 11 measures overall */ TEST_F(PlaybackModelTests, Da_Capo_Al_Coda) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "da_capo_al_coda/da_capo_al_coda.mscx"); ASSERT_TRUE(score); @@ -282,13 +282,13 @@ TEST_F(PlaybackModelTests, Da_Capo_Al_Coda) /** * @brief PlaybackModelTests_Da_Capo_Al_Coda - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 1 measure + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 1 measure * Additionally, the first note is marked by "pizzicato" + "stacattissimo". The 3-rd note is marked by "arco" * We'll be playing 4 events overall */ TEST_F(PlaybackModelTests, Pizz_To_Arco_Technique) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "pizz_to_arco/pizz_to_arco.mscx"); ASSERT_TRUE(score); @@ -338,7 +338,7 @@ TEST_F(PlaybackModelTests, Pizz_To_Arco_Technique) /** * @brief PlaybackModelTests_Repeat_Last_Measure - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 6 measures + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 6 measures * Additionally, there is a "repeat last measure" sign on the 6-th measure. In total, we'll be playing 7 measures overall * * @bug The test is currently disabled. At the moment it shows a flaw in libmscore - repeatSegments. RepeatSegments calculations don't @@ -347,7 +347,7 @@ TEST_F(PlaybackModelTests, Pizz_To_Arco_Technique) */ TEST_F(PlaybackModelTests, DISABLED_Repeat_Last_Measure) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "repeat_last_measure/repeat_last_measure.mscx"); ASSERT_TRUE(score); @@ -376,7 +376,7 @@ TEST_F(PlaybackModelTests, DISABLED_Repeat_Last_Measure) /** * @brief PlaybackModelTests_SimpleRepeat_Changes_Notification - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 4 measures + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 4 measures * Additionally, there is a simple repeat from measure 2 up to measure 3. In total, we'll be playing 6 measures overall * * When the model will be loaded we'll emulate a change notification on the 2-nd measure, so that there will be updated events @@ -384,7 +384,7 @@ TEST_F(PlaybackModelTests, DISABLED_Repeat_Last_Measure) */ TEST_F(PlaybackModelTests, SimpleRepeat_Changes_Notification) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "repeat_range/repeat_range.mscx"); ASSERT_TRUE(score); @@ -425,13 +425,13 @@ TEST_F(PlaybackModelTests, SimpleRepeat_Changes_Notification) /** * @brief PlaybackModelTests_Metronome_4_4 - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 4 measures - * Measure 1: 4 quarter notes, Measure 2: full measure rest, Measure 3: 8 eigth-notes, Measure 4: 16 sixteen-notes + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 4 measures + * Measure 1: 4 quarter notes, Measure 2: full measure rest, Measure 3: 8 eighth-notes, Measure 4: 16 sixteen-notes * So that we'll be playing 16 beats in total */ TEST_F(PlaybackModelTests, Metronome_4_4) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "metronome_4_4/metronome_4_4.mscx"); ASSERT_TRUE(score); @@ -460,12 +460,12 @@ TEST_F(PlaybackModelTests, Metronome_4_4) /** * @brief PlaybackModelTests_Metronome_6_4_Repeat - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 4 measures + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 4 measures * Additionally, there is a simple repeat on measure 2. In total, we'll be playing 30 beats, including repeated measure */ TEST_F(PlaybackModelTests, Metronome_6_4_Repeat) { - // [GIVEN] Simple piece of score (Viollin, 6/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 6/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "metronome_6_4_with_repeat/metronome_6_4_with_repeat.mscx"); ASSERT_TRUE(score); @@ -494,13 +494,13 @@ TEST_F(PlaybackModelTests, Metronome_6_4_Repeat) /** * @brief PlaybackModelTests_Note_Entry_Playback_Note - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 1 measure + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 1 measure * Additionally, we'll emulate the situation where user clicks on the first note, so that we should playback it * */ TEST_F(PlaybackModelTests, Note_Entry_Playback_Note) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "note_entry_playback_note/note_entry_playback_note.mscx"); ASSERT_TRUE(score); @@ -558,14 +558,14 @@ TEST_F(PlaybackModelTests, Note_Entry_Playback_Note) /** * @brief PlaybackModelTests_Note_Entry_Playback_Chord - * @details In this case we're building up a playback model of a simple score - Viollin, 4/4, 120bpm, Treble Cleff, 1 measure + * @details In this case we're building up a playback model of a simple score - Violin, 4/4, 120bpm, Treble Cleff, 1 measure * Additionally, we'll emulate the situation where user wants to playback the third chord and make sure that we'll sent * all the necessary events into audio-engine * */ TEST_F(PlaybackModelTests, Note_Entry_Playback_Chord) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(PLAYBACK_MODEL_TEST_FILES_DIR + "note_entry_playback_chord/note_entry_playback_chord.mscx"); ASSERT_TRUE(score); diff --git a/src/engraving/utests/tempomap_tests.cpp b/src/engraving/utests/tempomap_tests.cpp index 3bde2421b333f..cbf9711faa40b 100644 --- a/src/engraving/utests/tempomap_tests.cpp +++ b/src/engraving/utests/tempomap_tests.cpp @@ -40,12 +40,12 @@ class TempoMapTests : public ::testing::Test /** * @brief TempoMapTests_DEFAULT_TEMPO - * @details In this case we're loading a simple score with 8 measures (Viollin, 4/4, 120 bpm, Treble Cleff) + * @details In this case we're loading a simple score with 8 measures (Violin, 4/4, 120 bpm, Treble Cleff) * There is no visible tempo marking on the score, so default tempo will be applied 120BPM */ TEST_F(TempoMapTests, DEFAULT_TEMPO) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(TEMPOMAP_TEST_FILES_DIR + "default_tempo/default_tempo.mscx"); ASSERT_TRUE(score); @@ -65,12 +65,12 @@ TEST_F(TempoMapTests, DEFAULT_TEMPO) /** * @brief TempoMapTests_ABSOLUTE_TEMPO_80_BPM - * @details In this case we're loading a simple score with 8 measures (Viollin, 4/4, 80 bpm, Treble Cleff) + * @details In this case we're loading a simple score with 8 measures (Violin, 4/4, 80 bpm, Treble Cleff) * Tempo marking (80 BPM) should be applied on the entire score */ TEST_F(TempoMapTests, ABSOLUTE_TEMPO_80_BPM) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(TEMPOMAP_TEST_FILES_DIR + "custom_tempo_80_bpm/custom_tempo_80_bpm.mscx"); ASSERT_TRUE(score); @@ -90,12 +90,12 @@ TEST_F(TempoMapTests, ABSOLUTE_TEMPO_80_BPM) /** * @brief TempoMapTests_ABSOLUTE_TEMPO_FROM_80_TO_120_BPM - * @details In this case we're loading a simple score with 8 measures (Viollin, 4/4, 80 bpm, Treble Cleff) + * @details In this case we're loading a simple score with 8 measures (Violin, 4/4, 80 bpm, Treble Cleff) * There is a tempo marking (80 BPM) on the very first measure. The 4-th measure marked by 120BPM tempo */ TEST_F(TempoMapTests, ABSOLUTE_TEMPO_FROM_80_TO_120_BPM) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 80 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 80 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(TEMPOMAP_TEST_FILES_DIR + "absolute_tempo_80_to_120_bpm/absolute_tempo_80_to_120_bpm.mscx"); ASSERT_TRUE(score); @@ -118,13 +118,13 @@ TEST_F(TempoMapTests, ABSOLUTE_TEMPO_FROM_80_TO_120_BPM) /** * @brief TempoMapTests_GRADUAL_TEMPO_CHANGE_ACCELERANDO - * @details In this case we're loading a simple score with 8 measures (Viollin, 4/4, 120 bpm, Treble Cleff) + * @details In this case we're loading a simple score with 8 measures (Violin, 4/4, 120 bpm, Treble Cleff) * There is a tempo marking (120 BPM) on the very first measure. Additionally, there is "accelerando" tempo annotation * above measures 5 and 6 */ TEST_F(TempoMapTests, GRADUAL_TEMPO_CHANGE_ACCELERANDO) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(TEMPOMAP_TEST_FILES_DIR + "gradual_tempo_change_accelerando/gradual_tempo_change_accelerando.mscx"); @@ -148,13 +148,13 @@ TEST_F(TempoMapTests, GRADUAL_TEMPO_CHANGE_ACCELERANDO) /** * @brief TempoMapTests_GRADUAL_TEMPO_CHANGE_RALLENTANDO - * @details In this case we're loading a simple score with 8 measures (Viollin, 4/4, 120 bpm, Treble Cleff) + * @details In this case we're loading a simple score with 8 measures (Violin, 4/4, 120 bpm, Treble Cleff) * There is a tempo marking (120 BPM) on the very first measure. Additionally, there is "rallentando" tempo annotation * above measures 5 and 6 */ TEST_F(TempoMapTests, GRADUAL_TEMPO_CHANGE_RALLENTANDO) { - // [GIVEN] Simple piece of score (Viollin, 4/4, 120 bpm, Treble Cleff) + // [GIVEN] Simple piece of score (Violin, 4/4, 120 bpm, Treble Cleff) Ms::Score* score = ScoreRW::readScore(TEMPOMAP_TEST_FILES_DIR + "gradual_tempo_change_rallentando/gradual_tempo_change_rallentando.mscx"); diff --git a/src/engraving/utests/timesig_data/timesig-02-ref.mscx b/src/engraving/utests/timesig_data/timesig-02-ref.mscx index 0448153fab660..166468fdfe64f 100644 --- a/src/engraving/utests/timesig_data/timesig-02-ref.mscx +++ b/src/engraving/utests/timesig_data/timesig-02-ref.mscx @@ -73,7 +73,7 @@ - Attempt to convert a meaure in 4/4 with three minims as a triplet into 3/4 + Attempt to convert a measure in 4/4 with three minims as a triplet into 3/4 diff --git a/src/engraving/utests/timesig_data/timesig-02.mscx b/src/engraving/utests/timesig_data/timesig-02.mscx index 5cf9a93112053..26cd6ca7b090e 100644 --- a/src/engraving/utests/timesig_data/timesig-02.mscx +++ b/src/engraving/utests/timesig_data/timesig-02.mscx @@ -72,7 +72,7 @@ - Attempt to convert a meaure in 4/4 with three minims as a triplet into 3/4 + Attempt to convert a measure in 4/4 with three minims as a triplet into 3/4 diff --git a/src/framework/README.md b/src/framework/README.md index 11e9f5718870d..e9cc6dd997526 100644 --- a/src/framework/README.md +++ b/src/framework/README.md @@ -19,5 +19,5 @@ And should not contain or depend on such modules as: * Sequencer (view) * Piano roll * Mixer (view) -* User acount +* User account * and etc diff --git a/src/framework/accessibility/tests/accessibilitycontroller_tests.cpp b/src/framework/accessibility/tests/accessibilitycontroller_tests.cpp index 72529e111705b..776ef85997ee5 100644 --- a/src/framework/accessibility/tests/accessibilitycontroller_tests.cpp +++ b/src/framework/accessibility/tests/accessibilitycontroller_tests.cpp @@ -126,7 +126,7 @@ class AccessibilityControllerTests : public ::testing::Test void notExpectDispatchEventOnFocus() { - //! If accessibility is active then the sccessibility system should handle sended event, + //! If accessibility is active then the accessibility system should handle sended event, //! Otherwise, the item that is currently on focus will process the signal //! So, shouldn't dispatch event if accessibility is not active QWindow* window = new QWindow(); diff --git a/src/framework/audio/audioerrors.h b/src/framework/audio/audioerrors.h index 9dda63732b1b6..928527374288e 100644 --- a/src/framework/audio/audioerrors.h +++ b/src/framework/audio/audioerrors.h @@ -45,7 +45,7 @@ enum class Err { SoundFontFailedLoad = 332, SoundFontFailedUnload = 333, UndefinedSoundFontFormat = 334, - UknownSynthType = 335, + UnknownSynthType = 335, //common InvalidTrackId = 340, diff --git a/src/framework/audio/audiomodule.cpp b/src/framework/audio/audiomodule.cpp index c7b4639bb9e26..9c028dc37a9dc 100644 --- a/src/framework/audio/audiomodule.cpp +++ b/src/framework/audio/audiomodule.cpp @@ -152,7 +152,7 @@ void AudioModule::onInit(const framework::IApplication::RunMode& mode) in order to avoid problems associated with access data thread safety. Objects from different layers (threads) must interact only through: - * Asyncronous API (@see thirdparty/deto) - controls and pass midi data + * Asynchronous API (@see thirdparty/deto) - controls and pass midi data * AudioBuffer - pass audio data from worker to driver for play AudioEngine is in the worker and operates only with the buffer, diff --git a/src/framework/audio/internal/platform/win/wincoreaudiodriver.cpp b/src/framework/audio/internal/platform/win/wincoreaudiodriver.cpp index c998f59ac92fd..88d92b3b4a5a1 100644 --- a/src/framework/audio/internal/platform/win/wincoreaudiodriver.cpp +++ b/src/framework/audio/internal/platform/win/wincoreaudiodriver.cpp @@ -136,14 +136,14 @@ bool CoreAudioDriver::open(const IAudioDriver::Spec& spec, IAudioDriver::Spec* a do { Sleep((DWORD)(hnsActualDuration / REFTIMES_PER_MILLISEC / 2)); - UINT32 bufferFrameCount, bufferPading; + UINT32 bufferFrameCount, bufferPadding; hr = s_data->audioClient->GetBufferSize(&bufferFrameCount); logError(hr); - hr = s_data->audioClient->GetCurrentPadding(&bufferPading); + hr = s_data->audioClient->GetCurrentPadding(&bufferPadding); logError(hr); - auto bufferSize = bufferFrameCount - bufferPading; + auto bufferSize = bufferFrameCount - bufferPadding; hr = s_data->renderClient->GetBuffer(bufferSize, &pData); logError(hr); if (!pData || hr != S_OK) { diff --git a/src/framework/audio/internal/synthesizers/fluidsynth/sfcachedloader.h b/src/framework/audio/internal/synthesizers/fluidsynth/sfcachedloader.h index 228e76b88e79d..4ede63e1e6866 100644 --- a/src/framework/audio/internal/synthesizers/fluidsynth/sfcachedloader.h +++ b/src/framework/audio/internal/synthesizers/fluidsynth/sfcachedloader.h @@ -38,13 +38,13 @@ extern "C" { #include "log.h" namespace mu::audio::synth { -struct SounFontData +struct SoundFontData { fluid_sfont_t* soundFontPtr = nullptr; std::FILE* fileStream = nullptr; }; -struct SoundFontCache : public std::map { +struct SoundFontCache : public std::map { static SoundFontCache* instance() { static SoundFontCache s; @@ -82,7 +82,7 @@ void* openSoundFont(const char* filename) std::FILE* stream = std::fopen(filename, "r"); - SounFontData sfData; + SoundFontData sfData; sfData.fileStream = stream; SoundFontCache::instance()->emplace(filename, std::move(sfData)); @@ -166,7 +166,7 @@ fluid_sfont_t* loadSoundFont(fluid_sfloader_t* loader, const char* filename) return nullptr; } - SounFontData& sfData = SoundFontCache::instance()->operator[](filename); + SoundFontData& sfData = SoundFontCache::instance()->operator[](filename); sfData.soundFontPtr = result; return result; diff --git a/src/framework/audio/internal/synthesizers/fluidsynth/soundmapping.h b/src/framework/audio/internal/synthesizers/fluidsynth/soundmapping.h index 34a1ac09e32c5..72f9d2b90065b 100644 --- a/src/framework/audio/internal/synthesizers/fluidsynth/soundmapping.h +++ b/src/framework/audio/internal/synthesizers/fluidsynth/soundmapping.h @@ -184,7 +184,7 @@ static const auto& mappingByCategory(const mpe::SoundCategory category) { { mpe::SoundId::StringsGroup, { } }, { midi::Program(0, 48) } }, { { mpe::SoundId::Contrabass, { mpe::SoundSubCategory::Orchestral } }, { midi::Program(0, 43) } }, - { { mpe::SoundId::ContrabasseSection, { mpe::SoundSubCategory::Orchestral } }, { midi::Program(50, 48) } }, + { { mpe::SoundId::ContrabassSection, { mpe::SoundSubCategory::Orchestral } }, { midi::Program(50, 48) } }, { { mpe::SoundId::Violin, { mpe::SoundSubCategory::Orchestral } }, { midi::Program(0, 40) } }, { { mpe::SoundId::ViolinSection, { mpe::SoundSubCategory::Orchestral } }, { midi::Program(20, 48) } }, { { mpe::SoundId::Viola, { mpe::SoundSubCategory::Orchestral } }, { midi::Program(0, 41) } }, @@ -467,7 +467,7 @@ static const auto& mappingByCategory(const mpe::SoundCategory category) { { mpe::SoundId::Horagai, { mpe::SoundSubCategory::Japanese } }, { midi::Program(0, 60) } }, { { mpe::SoundId::Alphorn, { mpe::SoundSubCategory::Alpine } }, { midi::Program(0, 60) } }, - { { mpe::SoundId::RagDung, { mpe::SoundSubCategory::Tibetian } }, { midi::Program(0, 56), midi::Program(0, 59) } }, + { { mpe::SoundId::RagDung, { mpe::SoundSubCategory::Tibetan } }, { midi::Program(0, 56), midi::Program(0, 59) } }, { { mpe::SoundId::Didgeridoo, { mpe::SoundSubCategory::Australian } }, { midi::Program(0, 57) } }, { { mpe::SoundId::Shofar, {} }, { midi::Program(0, 60) } }, { { mpe::SoundId::Vuvuzela, {} }, { midi::Program(0, 56) } }, @@ -555,7 +555,7 @@ static const auto& mappingByCategory(const mpe::SoundCategory category) { { mpe::SoundId::Drum, { mpe::SoundSubCategory::Bass } }, { midi::Program(128, 48) } }, { { mpe::SoundId::Drum, { mpe::SoundSubCategory::Snare } }, { midi::Program(128, 56) } }, - { { mpe::SoundId::Drum, { mpe::SoundSubCategory::Millitary } }, { midi::Program(128, 48) } }, + { { mpe::SoundId::Drum, { mpe::SoundSubCategory::Military } }, { midi::Program(128, 48) } }, { { mpe::SoundId::Drum, { mpe::SoundSubCategory::Frame } }, { midi::Program(128, 0) } }, { { mpe::SoundId::Drum, { mpe::SoundSubCategory::Snare, mpe::SoundSubCategory::Piccolo } }, { midi::Program(128, 48) } }, @@ -817,7 +817,7 @@ inline const ArticulationMapping& articulationSounds(const mpe::PlaybackSetupDat return VIOLONCELLO_SECTION; } - if (setupData.id == mpe::SoundId::ContrabasseSection + if (setupData.id == mpe::SoundId::ContrabassSection || setupData.id == mpe::SoundId::Contrabass) { return CONTRABASS_SECTION; } diff --git a/src/framework/audio/internal/worker/audiostream.h b/src/framework/audio/internal/worker/audiostream.h index f525de33a12b4..e4ad63f6a0bd5 100644 --- a/src/framework/audio/internal/worker/audiostream.h +++ b/src/framework/audio/internal/worker/audiostream.h @@ -45,7 +45,7 @@ class AudioStream : public IAudioStream //! return sample rate of loaded data. Can be different than application's sample rate unsigned int sampleRate() const override; - //! copy samples with real time sample rate convertion if needed + //! copy samples with real time sample rate conversion if needed unsigned int copySamplesToBuffer(float* buffer, unsigned int fromSample, unsigned int sampleCount, unsigned int sampleRate) override; private: diff --git a/src/framework/audio/internal/worker/samplerateconvertor.cpp b/src/framework/audio/internal/worker/samplerateconvertor.cpp index 858a8f0c7987d..e86cdb38b23e9 100644 --- a/src/framework/audio/internal/worker/samplerateconvertor.cpp +++ b/src/framework/audio/internal/worker/samplerateconvertor.cpp @@ -140,7 +140,7 @@ bool SampleRateConvertor::availableSamples(unsigned int sample) const float currentOutputSampleTime = sample / static_cast(m_sampleRateOut); auto firstInputSample = std::floor(currentOutputSampleTime * m_sampleRateIn) - USE_SAMPLES / 2; - // first sample for convertion points out of the input buffer + // first sample for conversion points out of the input buffer if (firstInputSample * m_channelsCount >= m_data.size()) { return false; } diff --git a/src/framework/audio/internal/worker/samplerateconvertor.h b/src/framework/audio/internal/worker/samplerateconvertor.h index 00f30670750be..033fe71a4c049 100644 --- a/src/framework/audio/internal/worker/samplerateconvertor.h +++ b/src/framework/audio/internal/worker/samplerateconvertor.h @@ -46,7 +46,7 @@ class SampleRateConvertor private: - //! return value of sinc function (LPF) with considaration of used sampleRates + //! return value of sinc function (LPF) with consideration of used sampleRates double sinc(double value) const; //! output sample value @@ -54,7 +54,7 @@ class SampleRateConvertor float ySinc(unsigned int sample, unsigned int channel) const; float yFIR(unsigned int sample, unsigned int channel) const; - //! return true if there are samples in input buffer for convertion + //! return true if there are samples in input buffer for conversion bool availableSamples(unsigned int sample) const; //! calculate window function values diff --git a/src/framework/audio/qml/MuseScore/Audio/DevTools/SoundFontsPanel.qml b/src/framework/audio/qml/MuseScore/Audio/DevTools/SoundFontsPanel.qml index cf163aa6f8f20..a50901e47b327 100644 --- a/src/framework/audio/qml/MuseScore/Audio/DevTools/SoundFontsPanel.qml +++ b/src/framework/audio/qml/MuseScore/Audio/DevTools/SoundFontsPanel.qml @@ -29,7 +29,7 @@ Item { id: root property var selectedSoundFonts: [] - property var avalaibleSoundFonts: [] + property var availableSoundFonts: [] signal selectedUpClicked(var index) signal selectedDownClicked(var index) @@ -42,7 +42,7 @@ Item { } Item { - id: avalaiblePanel + id: availablePanel anchors.top: parent.top anchors.bottom: parent.bottom @@ -51,21 +51,21 @@ Item { width: (parent.width / 2) - 40 StyledTextLabel { - id: headerAvalaible + id: headerAvailable anchors.left: parent.left anchors.leftMargin: 8 width: parent.width height: 40 font: ui.theme.bodyBoldFont - text: "Avalaible" + text: "Available" } ListView { - anchors.top: headerAvalaible.bottom + anchors.top: headerAvailable.bottom anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom - model: root.avalaibleSoundFonts + model: root.availableSoundFonts delegate: Item { width: parent.width @@ -97,7 +97,7 @@ Item { id: separator anchors.top: parent.top anchors.bottom: parent.bottom - anchors.left: avalaiblePanel.right + anchors.left: availablePanel.right width: 4 color: "#666666" } @@ -111,7 +111,7 @@ Item { anchors.margins: 8 StyledTextLabel { - id: headerSelecetd + id: headerSelected anchors.left: parent.left anchors.leftMargin: 8 width: parent.width @@ -122,11 +122,11 @@ Item { ListView { id: selectedView - anchors.top: headerSelecetd.bottom + anchors.top: headerSelected.bottom anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom - model: root.avalaibleSoundFonts + model: root.availableSoundFonts delegate: Item { width: parent.width diff --git a/src/framework/audio/qml/MuseScore/Audio/DevTools/SynthSettings.qml b/src/framework/audio/qml/MuseScore/Audio/DevTools/SynthSettings.qml index 4d01a91a83365..196e3f2b3c6d8 100644 --- a/src/framework/audio/qml/MuseScore/Audio/DevTools/SynthSettings.qml +++ b/src/framework/audio/qml/MuseScore/Audio/DevTools/SynthSettings.qml @@ -76,7 +76,7 @@ Rectangle { SoundFontsPanel { id: fluidPanel selectedSoundFonts: settingsModel.selectedSoundFonts("Fluid") - avalaibleSoundFonts: settingsModel.avalaibleSoundFonts("Fluid") + availableSoundFonts: settingsModel.availableSoundFonts("Fluid") onSelectedUpClicked: function(index) { settingsModel.soundFontUp(index, "Fluid") } @@ -99,10 +99,10 @@ Rectangle { } } - onAvalaibleChanged: function(name) { + onAvailableChanged: function(name) { if (name === "Fluid") { - fluidPanel.avalaibleSoundFonts = [] - fluidPanel.avalaibleSoundFonts = settingsModel.avalaibleSoundFonts("Fluid") + fluidPanel.availableSoundFonts = [] + fluidPanel.availableSoundFonts = settingsModel.availableSoundFonts("Fluid") } } } diff --git a/src/framework/audio/view/synthssettingsmodel.cpp b/src/framework/audio/view/synthssettingsmodel.cpp index 61eb442b1c577..e1f602f5f1236 100644 --- a/src/framework/audio/view/synthssettingsmodel.cpp +++ b/src/framework/audio/view/synthssettingsmodel.cpp @@ -37,11 +37,11 @@ void SynthsSettingsModel::load() for (const auto& meta : resources) { if (meta.type == AudioResourceType::FluidSoundfont) { - m_avalaibleSoundFonts[name] << QString::fromStdString(meta.id); + m_availableSoundFonts[name] << QString::fromStdString(meta.id); } } - emit avalaibleChanged(name); + emit availableChanged(name); emit selectedChanged(name); }); } @@ -69,9 +69,9 @@ QStringList SynthsSettingsModel::selectedSoundFonts(const QString& synth) const return list; } -QStringList SynthsSettingsModel::avalaibleSoundFonts(const QString& synth) const +QStringList SynthsSettingsModel::availableSoundFonts(const QString& synth) const { - return m_avalaibleSoundFonts.value(synth); + return m_availableSoundFonts.value(synth); } void SynthsSettingsModel::soundFontUp(int selectedIndex_, const QString& synth) @@ -128,11 +128,11 @@ void SynthsSettingsModel::removeSoundFont(int selectedIndex_, const QString& syn emit selectedChanged(synth); } -void SynthsSettingsModel::addSoundFont(int avalableIndex_, const QString& synth) +void SynthsSettingsModel::addSoundFont(int availableIndex_, const QString& synth) { - int avalableIndex = avalableIndex_; - const QStringList& avalaible = m_avalaibleSoundFonts[synth]; - std::string name = avalaible.at(avalableIndex).toStdString(); + int availableIndex = availableIndex_; + const QStringList& available = m_availableSoundFonts[synth]; + std::string name = available.at(availableIndex).toStdString(); auto it = m_state.groups.find(synth.toStdString()); if (it == m_state.groups.end()) { diff --git a/src/framework/audio/view/synthssettingsmodel.h b/src/framework/audio/view/synthssettingsmodel.h index dc436ec9ebcf2..5214a01e6147e 100644 --- a/src/framework/audio/view/synthssettingsmodel.h +++ b/src/framework/audio/view/synthssettingsmodel.h @@ -50,21 +50,21 @@ class SynthsSettingsModel : public QObject, public async::Asyncable Q_INVOKABLE void apply(); Q_INVOKABLE QStringList selectedSoundFonts(const QString& synth) const; - Q_INVOKABLE QStringList avalaibleSoundFonts(const QString& synth) const; + Q_INVOKABLE QStringList availableSoundFonts(const QString& synth) const; Q_INVOKABLE void soundFontUp(int selectedIndex, const QString& synth); Q_INVOKABLE void soundFontDown(int selectedIndex, const QString& synth); Q_INVOKABLE void removeSoundFont(int selectedIndex, const QString& synth); - Q_INVOKABLE void addSoundFont(int avalableIndex, const QString& synth); + Q_INVOKABLE void addSoundFont(int availableIndex, const QString& synth); signals: void selectedChanged(const QString& name); - void avalaibleChanged(const QString& name); + void availableChanged(const QString& name); private: SynthesizerState m_state; - QMap m_avalaibleSoundFonts; + QMap m_availableSoundFonts; }; } diff --git a/src/framework/global/settings.cpp b/src/framework/global/settings.cpp index 94f65420c6121..37db81ffbacf6 100644 --- a/src/framework/global/settings.cpp +++ b/src/framework/global/settings.cpp @@ -200,14 +200,14 @@ void Settings::setDefaultValue(const Key& key, const Val& value) } } -void Settings::setCanBeMannualyEdited(const Settings::Key& key, bool canBeMannualyEdited) +void Settings::setCanBeManuallyEdited(const Settings::Key& key, bool canBeManuallyEdited) { Item& item = findItem(key); if (item.isNull()) { - m_items[key] = Item{ key, Val(), Val(), canBeMannualyEdited }; + m_items[key] = Item{ key, Val(), Val(), canBeManuallyEdited }; } else { - item.canBeMannualyEdited = canBeMannualyEdited; + item.canBeManuallyEdited = canBeManuallyEdited; } } diff --git a/src/framework/global/settings.h b/src/framework/global/settings.h index c9ae8d51cad64..50a961151f4b1 100644 --- a/src/framework/global/settings.h +++ b/src/framework/global/settings.h @@ -65,7 +65,7 @@ class Settings Key key; Val value; Val defaultValue; - bool canBeMannualyEdited = false; + bool canBeManuallyEdited = false; bool isNull() const { return key.isNull(); } }; @@ -89,7 +89,7 @@ class Settings void setLocalValue(const Key& key, const Val& value); void setDefaultValue(const Key& key, const Val& value); - void setCanBeMannualyEdited(const Settings::Key& key, bool canBeMannualyEdited); + void setCanBeManuallyEdited(const Settings::Key& key, bool canBeManuallyEdited); void beginTransaction(bool notifyToOtherInstances = true); void commitTransaction(bool notifyToOtherInstances = true); diff --git a/src/framework/global/stringutils.cpp b/src/framework/global/stringutils.cpp index 5e93511d94d1e..74df79873155e 100644 --- a/src/framework/global/stringutils.cpp +++ b/src/framework/global/stringutils.cpp @@ -104,8 +104,8 @@ std::string mu::strings::leftJustified(const std::string& val, size_t width) { std::string str; str.resize(width, ' '); - size_t lenght = width < val.size() ? width : val.size(); - for (size_t i = 0; i < lenght; ++i) { + size_t length = width < val.size() ? width : val.size(); + for (size_t i = 0; i < length; ++i) { str[i] = val[i]; } return str; diff --git a/src/framework/midi/internal/platform/win/winmidiinport.cpp b/src/framework/midi/internal/platform/win/winmidiinport.cpp index 13903db046f13..7729f4e1b5089 100644 --- a/src/framework/midi/internal/platform/win/winmidiinport.cpp +++ b/src/framework/midi/internal/platform/win/winmidiinport.cpp @@ -107,7 +107,7 @@ mu::async::Notification WinMidiInPort::devicesChanged() const return m_devicesChanged; } -static void CALLBACK proccess(HMIDIIN hMidiIn, UINT wMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +static void CALLBACK process(HMIDIIN hMidiIn, UINT wMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { UNUSED(hMidiIn); @@ -140,7 +140,7 @@ mu::Ret WinMidiInPort::connect(const MidiDeviceID& deviceID) m_win->deviceID = std::stoi(deviceID); MMRESULT ret = midiInOpen(&m_win->midiIn, m_win->deviceID, - reinterpret_cast(&proccess), + reinterpret_cast(&process), reinterpret_cast(this), CALLBACK_FUNCTION | MIDI_IO_STATUS); diff --git a/src/framework/midi/midievent.h b/src/framework/midi/midievent.h index 9de9296ca6aed..e94fabb5a4370 100644 --- a/src/framework/midi/midievent.h +++ b/src/framework/midi/midievent.h @@ -956,7 +956,7 @@ struct Event { dataToStr(); break; case MessageType::SystemExclusiveData: - str += "MIDI System Exlusive"; + str += "MIDI System Exclusive"; dataToStr(); break; case MessageType::Data: diff --git a/src/framework/mpe/qml/MuseScore/Mpe/ArticulationPatternPlot.qml b/src/framework/mpe/qml/MuseScore/Mpe/ArticulationPatternPlot.qml index 42371565a410f..c30bd1a3369cd 100644 --- a/src/framework/mpe/qml/MuseScore/Mpe/ArticulationPatternPlot.qml +++ b/src/framework/mpe/qml/MuseScore/Mpe/ArticulationPatternPlot.qml @@ -88,7 +88,7 @@ Item { return steps * prv.valuePerStep } - function applyXShiftToCoordindates(curvePoint, xShift, xSpanFactor) { + function applyXShiftToCoordinates(curvePoint, xShift, xSpanFactor) { return Qt.point(curvePoint.x * coordinateValueToSteps(xSpanFactor) / 100 + xShift, curvePoint.y) @@ -229,7 +229,7 @@ Item { ctx.beginPath() for (var i = 0; i < points.length; ++i) { - var position = prv.coordinatesToPixels(prv.applyXShiftToCoordindates(points[i], posXShift, spanFactor)) + var position = prv.coordinatesToPixels(prv.applyXShiftToCoordinates(points[i], posXShift, spanFactor)) if (i == 0) { ctx.moveTo(position.x, position.y) @@ -247,7 +247,7 @@ Item { } for (var i = 0; i < points.length; ++i) { - var position = prv.coordinatesToPixels(prv.applyXShiftToCoordindates(points[i], posXShift, spanFactor)) + var position = prv.coordinatesToPixels(prv.applyXShiftToCoordinates(points[i], posXShift, spanFactor)) var outerDiameter = prv.pointHandleDiameter var innerDiameter = prv.pointHandleDiameter / 2 diff --git a/src/framework/mpe/soundid.h b/src/framework/mpe/soundid.h index 26a36e72295fd..0dba8c7368eda 100644 --- a/src/framework/mpe/soundid.h +++ b/src/framework/mpe/soundid.h @@ -85,7 +85,7 @@ enum class SoundId Nyckelharpa, Erhu, Contrabass, - ContrabasseSection, + ContrabassSection, Octobass, WindsGroup, @@ -244,7 +244,7 @@ enum class SoundSubCategory Vienna, Greek, Japanese, - Tibetian, + Tibetan, African, Indian, Spanish, @@ -277,7 +277,7 @@ enum class SoundSubCategory Female, Temple, - Millitary, + Military, Ride, Sleigh, Cow, diff --git a/src/framework/mpe/tests/multinotearticulationstest.cpp b/src/framework/mpe/tests/multinotearticulationstest.cpp index 8254074b81f27..21385d85aaa0b 100644 --- a/src/framework/mpe/tests/multinotearticulationstest.cpp +++ b/src/framework/mpe/tests/multinotearticulationstest.cpp @@ -127,11 +127,11 @@ TEST_F(MultiNoteArticulationsTest, StandardPattern) } for (const auto& pair : noteEvents) { - // [THEN] We expect that nominal timestamp of every note will be equal to the actual timestamp, since there is no arrangement modificators + // [THEN] We expect that nominal timestamp of every note will be equal to the actual timestamp, since there is no arrangement modifiers EXPECT_EQ(pair.second.arrangementCtx().nominalTimestamp, pair.second.arrangementCtx().actualTimestamp); - // [THEN] We expect that nominal duration of every note will be equal to the actual duration, since there is no arrangement modificators + // [THEN] We expect that nominal duration of every note will be equal to the actual duration, since there is no arrangement modifiers EXPECT_EQ(pair.second.arrangementCtx().nominalDuration, pair.second.arrangementCtx().actualDuration); diff --git a/src/framework/mpe/tests/singlenotearticulationstest.cpp b/src/framework/mpe/tests/singlenotearticulationstest.cpp index 81cf69d2ac2a5..e9369c9018bdf 100644 --- a/src/framework/mpe/tests/singlenotearticulationstest.cpp +++ b/src/framework/mpe/tests/singlenotearticulationstest.cpp @@ -43,7 +43,7 @@ class SingleNoteArticulationsTest : public ::testing::Test m_pitchClass = PitchClass::A; m_octave = 4; - // [GIVEN] Expression data of the note - no dynamic/articulations modificators + // [GIVEN] Expression data of the note - no dynamic/articulations modifiers m_nominalDynamic = dynamicLevelFromType(DynamicType::Natural); // [GIVEN] Articulation pattern "None", which means that note should be played without any modifications diff --git a/src/framework/mpe/view/articulationpatternitem.h b/src/framework/mpe/view/articulationpatternitem.h index e078271d698a8..6b53bc89f48a3 100644 --- a/src/framework/mpe/view/articulationpatternitem.h +++ b/src/framework/mpe/view/articulationpatternitem.h @@ -76,7 +76,6 @@ class ArticulationPatternItem : public QAbstractListModel signals: void titleChanged(); void currentPatternSegmentChanged(); - void avaiableArticulationTypesChanged(); void requestedToBeRemoved(); void isActiveChanged(); diff --git a/src/framework/network/inetworkmanager.h b/src/framework/network/inetworkmanager.h index 3f015bc568a8d..3d5f144953865 100644 --- a/src/framework/network/inetworkmanager.h +++ b/src/framework/network/inetworkmanager.h @@ -35,13 +35,13 @@ class INetworkManager public: virtual ~INetworkManager() = default; - virtual Ret get(const QUrl& url, IncomingDevice* incommingData, const RequestHeaders& headers = RequestHeaders()) = 0; + virtual Ret get(const QUrl& url, IncomingDevice* incomingData, const RequestHeaders& headers = RequestHeaders()) = 0; virtual Ret head(const QUrl& url, const RequestHeaders& headers = RequestHeaders()) = 0; - virtual Ret post(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incommingData, + virtual Ret post(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incomingData, const RequestHeaders& headers = RequestHeaders()) = 0; - virtual Ret put(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incommingData, + virtual Ret put(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incomingData, const RequestHeaders& headers = RequestHeaders()) = 0; - virtual Ret del(const QUrl& url, IncomingDevice* incommingData, const RequestHeaders& headers = RequestHeaders()) = 0; + virtual Ret del(const QUrl& url, IncomingDevice* incomingData, const RequestHeaders& headers = RequestHeaders()) = 0; virtual framework::ProgressChannel progressChannel() const = 0; diff --git a/src/framework/network/internal/networkmanager.cpp b/src/framework/network/internal/networkmanager.cpp index b5c41fdd41593..8e40c2bd0c97c 100644 --- a/src/framework/network/internal/networkmanager.cpp +++ b/src/framework/network/internal/networkmanager.cpp @@ -50,9 +50,9 @@ NetworkManager::~NetworkManager() } } -Ret NetworkManager::get(const QUrl& url, IncomingDevice* incommingData, const RequestHeaders& headers) +Ret NetworkManager::get(const QUrl& url, IncomingDevice* incomingData, const RequestHeaders& headers) { - return execRequest(GET_REQUEST, url, incommingData, nullptr, headers); + return execRequest(GET_REQUEST, url, incomingData, nullptr, headers); } Ret NetworkManager::head(const QUrl& url, const RequestHeaders& headers) @@ -60,22 +60,22 @@ Ret NetworkManager::head(const QUrl& url, const RequestHeaders& headers) return execRequest(HEAD_REQUEST, url, nullptr, nullptr, headers); } -Ret NetworkManager::post(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incommingData, const RequestHeaders& headers) +Ret NetworkManager::post(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incomingData, const RequestHeaders& headers) { - return execRequest(POST_REQUEST, url, incommingData, outgoingData, headers); + return execRequest(POST_REQUEST, url, incomingData, outgoingData, headers); } -Ret NetworkManager::put(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incommingData, const RequestHeaders& headers) +Ret NetworkManager::put(const QUrl& url, OutgoingDevice* outgoingData, IncomingDevice* incomingData, const RequestHeaders& headers) { - return execRequest(PUT_REQUEST, url, incommingData, outgoingData, headers); + return execRequest(PUT_REQUEST, url, incomingData, outgoingData, headers); } -Ret NetworkManager::del(const QUrl& url, IncomingDevice* incommingData, const RequestHeaders& headers) +Ret NetworkManager::del(const QUrl& url, IncomingDevice* incomingData, const RequestHeaders& headers) { - return execRequest(DELETE_REQUEST, url, incommingData, nullptr, headers); + return execRequest(DELETE_REQUEST, url, incomingData, nullptr, headers); } -Ret NetworkManager::execRequest(RequestType requestType, const QUrl& url, IncomingDevice* incommingData, OutgoingDevice* outgoingData, +Ret NetworkManager::execRequest(RequestType requestType, const QUrl& url, IncomingDevice* incomingData, OutgoingDevice* outgoingData, const RequestHeaders& headers) { if (outgoingData && outgoingData->device()) { @@ -84,11 +84,11 @@ Ret NetworkManager::execRequest(RequestType requestType, const QUrl& url, Incomi } } - if (incommingData) { - if (!openDevice(incommingData, Device::WriteOnly)) { + if (incomingData) { + if (!openDevice(incomingData, Device::WriteOnly)) { return make_ret(Err::FiledOpenIODeviceWrite); } - m_incommingData = incommingData; + m_incomingData = incomingData; } QNetworkRequest request(url); @@ -107,8 +107,8 @@ Ret NetworkManager::execRequest(RequestType requestType, const QUrl& url, Incomi prepareReplyTransmit(reply); } - if (incommingData) { - prepareReplyReceive(reply, m_incommingData); + if (incomingData) { + prepareReplyReceive(reply, m_incomingData); } Ret ret = waitForReplyFinished(reply, NET_TIMEOUT_MS); @@ -120,8 +120,8 @@ Ret NetworkManager::execRequest(RequestType requestType, const QUrl& url, Incomi closeDevice(outgoingData->device()); } - closeDevice(m_incommingData); - m_incommingData = nullptr; + closeDevice(m_incomingData); + m_incomingData = nullptr; return ret; } @@ -192,15 +192,15 @@ bool NetworkManager::isAborted() const return m_isAborted; } -void NetworkManager::prepareReplyReceive(QNetworkReply* reply, IncomingDevice* incommingData) +void NetworkManager::prepareReplyReceive(QNetworkReply* reply, IncomingDevice* incomingData) { - if (incommingData) { + if (incomingData) { connect(reply, &QNetworkReply::downloadProgress, this, [this](const qint64 curr, const qint64 total) { m_progressCh.send(Progress(curr, total)); }); connect(reply, &QNetworkReply::readyRead, this, [this]() { - IF_ASSERT_FAILED(m_incommingData) { + IF_ASSERT_FAILED(m_incomingData) { return; } @@ -209,7 +209,7 @@ void NetworkManager::prepareReplyReceive(QNetworkReply* reply, IncomingDevice* i return; } - m_incommingData->write(reply->readAll()); + m_incomingData->write(reply->readAll()); }); } } diff --git a/src/framework/network/internal/networkmanager.h b/src/framework/network/internal/networkmanager.h index 477e78dffc58d..29589d3121161 100644 --- a/src/framework/network/internal/networkmanager.h +++ b/src/framework/network/internal/networkmanager.h @@ -37,13 +37,13 @@ class NetworkManager : public QObject, public INetworkManager explicit NetworkManager(QObject* parent = nullptr); ~NetworkManager() override; - 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; @@ -61,7 +61,7 @@ class NetworkManager : public QObject, public INetworkManager DELETE_REQUEST }; - Ret execRequest(RequestType requestType, const QUrl& url, IncomingDevice* incommingData = nullptr, + Ret execRequest(RequestType requestType, const QUrl& url, IncomingDevice* incomingData = nullptr, OutgoingDevice* outgoingData = nullptr, const RequestHeaders& headers = RequestHeaders()); QNetworkReply* receiveReply(RequestType requestType, const QNetworkRequest& request, OutgoingDevice* outgoingData = nullptr); @@ -71,7 +71,7 @@ class NetworkManager : public QObject, public INetworkManager bool isAborted() const; - void prepareReplyReceive(QNetworkReply* reply, IncomingDevice* incommingData); + void prepareReplyReceive(QNetworkReply* reply, IncomingDevice* incomingData); void prepareReplyTransmit(QNetworkReply* reply); Ret waitForReplyFinished(QNetworkReply* reply, int timeoutMs); @@ -79,7 +79,7 @@ class NetworkManager : public QObject, public INetworkManager private: QNetworkAccessManager* m_manager = nullptr; - IncomingDevice* m_incommingData = nullptr; + IncomingDevice* m_incomingData = nullptr; QNetworkReply* m_reply = nullptr; framework::ProgressChannel m_progressCh; diff --git a/src/framework/shortcuts/imidiremote.h b/src/framework/shortcuts/imidiremote.h index d21a3f5d2d04a..27d1ccc375367 100644 --- a/src/framework/shortcuts/imidiremote.h +++ b/src/framework/shortcuts/imidiremote.h @@ -37,7 +37,7 @@ class IMidiRemote : MODULE_EXPORT_INTERFACE virtual const MidiMappingList& midiMappings() const = 0; virtual Ret setMidiMappings(const MidiMappingList& midiMappings) = 0; virtual void resetMidiMappings() = 0; - virtual async::Notification midiMappinsChanged() const = 0; + virtual async::Notification midiMappingsChanged() const = 0; // Setting virtual void setIsSettingMode(bool arg) = 0; diff --git a/src/framework/shortcuts/internal/midiremote.cpp b/src/framework/shortcuts/internal/midiremote.cpp index 77f6f97d4d4d4..3cbc5dde235a9 100644 --- a/src/framework/shortcuts/internal/midiremote.cpp +++ b/src/framework/shortcuts/internal/midiremote.cpp @@ -83,7 +83,7 @@ void MidiRemote::resetMidiMappings() m_midiMappingsChanged.notify(); } -mu::async::Notification MidiRemote::midiMappinsChanged() const +mu::async::Notification MidiRemote::midiMappingsChanged() const { return m_midiMappingsChanged; } diff --git a/src/framework/shortcuts/internal/midiremote.h b/src/framework/shortcuts/internal/midiremote.h index 89ec701ad72d6..79289fef9ffeb 100644 --- a/src/framework/shortcuts/internal/midiremote.h +++ b/src/framework/shortcuts/internal/midiremote.h @@ -54,7 +54,7 @@ class MidiRemote : public IMidiRemote, public async::Asyncable const MidiMappingList& midiMappings() const override; Ret setMidiMappings(const MidiMappingList& midiMappings) override; void resetMidiMappings() override; - async::Notification midiMappinsChanged() const override; + async::Notification midiMappingsChanged() const override; // Setting void setIsSettingMode(bool arg) override; diff --git a/src/framework/shortcuts/qml/MuseScore/Shortcuts/EditMidiMappingDialog.qml b/src/framework/shortcuts/qml/MuseScore/Shortcuts/EditMidiMappingDialog.qml index 2cad0951dee6d..bc1909d5697fe 100644 --- a/src/framework/shortcuts/qml/MuseScore/Shortcuts/EditMidiMappingDialog.qml +++ b/src/framework/shortcuts/qml/MuseScore/Shortcuts/EditMidiMappingDialog.qml @@ -117,7 +117,7 @@ Dialog { enabled: mappingField.hasText onClicked: { - root.mapToEventRequested(model.inputedEvent()) + root.mapToEventRequested(model.inputtedEvent()) root.close() } } diff --git a/src/framework/shortcuts/qml/MuseScore/Shortcuts/EditShortcutDialog.qml b/src/framework/shortcuts/qml/MuseScore/Shortcuts/EditShortcutDialog.qml index 01d791adb7517..4bcea53783605 100644 --- a/src/framework/shortcuts/qml/MuseScore/Shortcuts/EditShortcutDialog.qml +++ b/src/framework/shortcuts/qml/MuseScore/Shortcuts/EditShortcutDialog.qml @@ -129,7 +129,7 @@ Dialog { hint: qsTrc("shortcuts", "Type to set shortcut") readOnly: true - currentText: model.inputedSequence + currentText: model.inputtedSequence onActiveFocusChanged: { if (activeFocus) { @@ -162,7 +162,7 @@ Dialog { width: parent.buttonWidth text: qsTrc("global", "Add") - enabled: model.canApplyInputedSequence + enabled: model.canApplyInputtedSequence onClicked: { model.addToOriginSequence() @@ -173,7 +173,7 @@ Dialog { width: parent.buttonWidth text: qsTrc("global", "Replace") - enabled: model.canApplyInputedSequence + enabled: model.canApplyInputtedSequence onClicked: { model.replaceOriginSequence() diff --git a/src/framework/shortcuts/view/editmidimappingmodel.cpp b/src/framework/shortcuts/view/editmidimappingmodel.cpp index 58d04537062c7..2d22a55fb5ecc 100644 --- a/src/framework/shortcuts/view/editmidimappingmodel.cpp +++ b/src/framework/shortcuts/view/editmidimappingmodel.cpp @@ -64,7 +64,7 @@ QString EditMidiMappingModel::mappingTitle() const return deviceName(currentMidiInDeviceId) + " > " + eventName(m_event); } -QVariant EditMidiMappingModel::inputedEvent() const +QVariant EditMidiMappingModel::inputtedEvent() const { QVariantMap obj; obj["type"] = static_cast(m_event.type); diff --git a/src/framework/shortcuts/view/editmidimappingmodel.h b/src/framework/shortcuts/view/editmidimappingmodel.h index 60111e72b2fe4..b27722e225c88 100644 --- a/src/framework/shortcuts/view/editmidimappingmodel.h +++ b/src/framework/shortcuts/view/editmidimappingmodel.h @@ -47,7 +47,7 @@ class EditMidiMappingModel : public QObject, public async::Asyncable QString mappingTitle() const; Q_INVOKABLE void load(int originType, int originValue); - Q_INVOKABLE QVariant inputedEvent() const; + Q_INVOKABLE QVariant inputtedEvent() const; signals: void mappingTitleChanged(const QString& title); diff --git a/src/framework/shortcuts/view/editshortcutmodel.cpp b/src/framework/shortcuts/view/editshortcutmodel.cpp index 5fd42079c3265..7e2e66b8c90b8 100644 --- a/src/framework/shortcuts/view/editshortcutmodel.cpp +++ b/src/framework/shortcuts/view/editshortcutmodel.cpp @@ -71,10 +71,10 @@ void EditShortcutModel::load(const QVariant& originShortcut, const QVariantList& void EditShortcutModel::clear() { - m_inputedSequence = QKeySequence(); + m_inputtedSequence = QKeySequence(); m_errorMessage.clear(); - emit inputedSequenceChanged(QString()); + emit inputtedSequenceChanged(QString()); } void EditShortcutModel::inputKey(int key, Qt::KeyboardModifiers modifiers) @@ -89,37 +89,37 @@ void EditShortcutModel::inputKey(int key, Qt::KeyboardModifiers modifiers) newKey += newModifiers; - for (int i = 0; i < m_inputedSequence.count(); i++) { - if (m_inputedSequence[i] == key) { + for (int i = 0; i < m_inputtedSequence.count(); i++) { + if (m_inputtedSequence[i] == key) { return; } } - switch (m_inputedSequence.count()) { + switch (m_inputtedSequence.count()) { case 0: - m_inputedSequence = QKeySequence(newKey); + m_inputtedSequence = QKeySequence(newKey); break; case 1: - m_inputedSequence = QKeySequence(m_inputedSequence[0], newKey); + m_inputtedSequence = QKeySequence(m_inputtedSequence[0], newKey); break; case 2: - m_inputedSequence = QKeySequence(m_inputedSequence[0], m_inputedSequence[1], newKey); + m_inputtedSequence = QKeySequence(m_inputtedSequence[0], m_inputtedSequence[1], newKey); break; case 3: - m_inputedSequence = QKeySequence(m_inputedSequence[0], m_inputedSequence[1], m_inputedSequence[2], newKey); + m_inputtedSequence = QKeySequence(m_inputtedSequence[0], m_inputtedSequence[1], m_inputtedSequence[2], newKey); break; } - validateInputedSequence(); + validateInputtedSequence(); - emit inputedSequenceChanged(inputedSequenceInNativeFormat()); + emit inputtedSequenceChanged(inputtedSequenceInNativeFormat()); } -void EditShortcutModel::validateInputedSequence() +void EditShortcutModel::validateInputtedSequence() { m_errorMessage.clear(); - QString input = inputedSequence(); + QString input = inputtedSequence(); for (const QVariant& shortcut : m_potentialConflictShortcuts) { QVariantMap sc = shortcut.toMap(); @@ -139,9 +139,9 @@ QString EditShortcutModel::originSequenceInNativeFormat() const return sequencesToNativeText(sequences); } -QString EditShortcutModel::inputedSequenceInNativeFormat() const +QString EditShortcutModel::inputtedSequenceInNativeFormat() const { - return m_inputedSequence.toString(QKeySequence::NativeText); + return m_inputtedSequence.toString(QKeySequence::NativeText); } QString EditShortcutModel::errorMessage() const @@ -149,14 +149,14 @@ QString EditShortcutModel::errorMessage() const return m_errorMessage; } -bool EditShortcutModel::canApplyInputedSequence() const +bool EditShortcutModel::canApplyInputtedSequence() const { - return m_errorMessage.isEmpty() && !m_inputedSequence.isEmpty(); + return m_errorMessage.isEmpty() && !m_inputtedSequence.isEmpty(); } void EditShortcutModel::replaceOriginSequence() { - m_originSequence = inputedSequence(); + m_originSequence = inputtedSequence(); emit applyNewSequenceRequested(m_originSequence); } @@ -165,12 +165,12 @@ void EditShortcutModel::addToOriginSequence() if (!m_originSequence.isEmpty()) { m_originSequence += "; "; } - m_originSequence += inputedSequence(); + m_originSequence += inputtedSequence(); emit applyNewSequenceRequested(m_originSequence); } -QString EditShortcutModel::inputedSequence() const +QString EditShortcutModel::inputtedSequence() const { - return m_inputedSequence.toString(); + return m_inputtedSequence.toString(); } diff --git a/src/framework/shortcuts/view/editshortcutmodel.h b/src/framework/shortcuts/view/editshortcutmodel.h index 07231e5a389d7..a3ee34caac11f 100644 --- a/src/framework/shortcuts/view/editshortcutmodel.h +++ b/src/framework/shortcuts/view/editshortcutmodel.h @@ -34,17 +34,17 @@ class EditShortcutModel : public QObject Q_OBJECT Q_PROPERTY(QString originSequence READ originSequenceInNativeFormat NOTIFY originSequenceChanged) - Q_PROPERTY(QString inputedSequence READ inputedSequenceInNativeFormat NOTIFY inputedSequenceChanged) - Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY inputedSequenceChanged) - Q_PROPERTY(bool canApplyInputedSequence READ canApplyInputedSequence NOTIFY inputedSequenceChanged) + Q_PROPERTY(QString inputtedSequence READ inputtedSequenceInNativeFormat NOTIFY inputtedSequenceChanged) + Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY inputtedSequenceChanged) + Q_PROPERTY(bool canApplyInputtedSequence READ canApplyInputtedSequence NOTIFY inputtedSequenceChanged) public: explicit EditShortcutModel(QObject* parent = nullptr); QString originSequenceInNativeFormat() const; - QString inputedSequenceInNativeFormat() const; + QString inputtedSequenceInNativeFormat() const; QString errorMessage() const; - bool canApplyInputedSequence() const; + bool canApplyInputtedSequence() const; Q_INVOKABLE void load(const QVariant& shortcut, const QVariantList& allShortcuts); Q_INVOKABLE void clear(); @@ -57,17 +57,17 @@ class EditShortcutModel : public QObject signals: void allShortcutsChanged(const QVariantList& shortcuts); void originSequenceChanged(const QString& sequence); - void inputedSequenceChanged(const QString& sequence); + void inputtedSequenceChanged(const QString& sequence); void applyNewSequenceRequested(const QString& newSequence); private: - QString inputedSequence() const; + QString inputtedSequence() const; - void validateInputedSequence(); + void validateInputtedSequence(); QVariantList m_potentialConflictShortcuts; - QKeySequence m_inputedSequence; + QKeySequence m_inputtedSequence; QString m_originSequence; QString m_errorMessage; }; diff --git a/src/framework/shortcuts/view/mididevicemappingmodel.cpp b/src/framework/shortcuts/view/mididevicemappingmodel.cpp index 18e0208309e4d..5899efe8889a4 100644 --- a/src/framework/shortcuts/view/mididevicemappingmodel.cpp +++ b/src/framework/shortcuts/view/mididevicemappingmodel.cpp @@ -148,7 +148,7 @@ void MidiDeviceMappingModel::load() } } - midiRemote()->midiMappinsChanged().onNotify(this, [this](){ + midiRemote()->midiMappingsChanged().onNotify(this, [this](){ load(); }); diff --git a/src/framework/shortcuts/view/shortcutsmodel.cpp b/src/framework/shortcuts/view/shortcutsmodel.cpp index 2bacd9f30df44..dc62942011aca 100644 --- a/src/framework/shortcuts/view/shortcutsmodel.cpp +++ b/src/framework/shortcuts/view/shortcutsmodel.cpp @@ -29,7 +29,7 @@ using namespace mu::shortcuts; using namespace mu::ui; -static QString shorcutsFileFilter() +static QString shortcutsFileFilter() { return mu::qtrc("shortcuts", "MuseScore Shortcuts File") + " (*.xml)"; } @@ -179,7 +179,7 @@ void ShortcutsModel::importShortcutsFromFile() io::path path = interactive()->selectOpeningFile( qtrc("shortcuts", "Import shortcuts"), globalConfiguration()->homePath(), - shorcutsFileFilter()); + shortcutsFileFilter()); if (!path.empty()) { shortcutsRegister()->importFromFile(path); @@ -191,7 +191,7 @@ void ShortcutsModel::exportShortcutsToFile() io::path path = interactive()->selectSavingFile( qtrc("shortcuts", "Export shortcuts"), globalConfiguration()->homePath(), - shorcutsFileFilter()); + shortcutsFileFilter()); if (path.empty()) { return; diff --git a/src/framework/ui/dev/interactivetestsmodel.cpp b/src/framework/ui/dev/interactivetestsmodel.cpp index 4dccd6d629749..5612619d54ac5 100644 --- a/src/framework/ui/dev/interactivetestsmodel.cpp +++ b/src/framework/ui/dev/interactivetestsmodel.cpp @@ -156,7 +156,7 @@ void InteractiveTestsModel::warning() void InteractiveTestsModel::critical() { IInteractive::Result result = interactive()->error("Cannot read file C:/Users/Username/Desktop/Composition.mscz", - "An error has occured when trying to open this file", {}, 0, + "An error has occurred when trying to open this file", {}, 0, IInteractive::Option::WithIcon); LOGD() << interactive()->buttonData(result.standardButton()).text; } diff --git a/src/framework/ui/iinteractiveuriregister.h b/src/framework/ui/iinteractiveuriregister.h index 8459c53155a7f..26de6b1466fb6 100644 --- a/src/framework/ui/iinteractiveuriregister.h +++ b/src/framework/ui/iinteractiveuriregister.h @@ -37,7 +37,7 @@ class IInteractiveUriRegister : MODULE_EXPORT_INTERFACE virtual void registerUri(const Uri& uri, const ContainerMeta& meta) = 0; virtual ContainerMeta meta(const Uri& uri) const = 0; - // userfull + // useful void registerQmlUri(const Uri& uri, const QString& qmlPath) { registerUri(uri, ContainerMeta(ContainerType::Type::QmlDialog, qmlPath)); diff --git a/src/framework/ui/qml/MuseScore/Ui/internal/StandardDialogPanel.qml b/src/framework/ui/qml/MuseScore/Ui/internal/StandardDialogPanel.qml index 6a29596339b39..7b075f9735a22 100644 --- a/src/framework/ui/qml/MuseScore/Ui/internal/StandardDialogPanel.qml +++ b/src/framework/ui/qml/MuseScore/Ui/internal/StandardDialogPanel.qml @@ -98,7 +98,7 @@ RowLayout { } //! NOTE By default accessibility for buttons ignored. - // On dialog open, set focus on accissibleInfo item, so Screen Reader reads completed info for dialog. + // On dialog open, set focus on accessibleInfo item, so Screen Reader reads completed info for dialog. // On button navigation active turned on accessibility for button. AccessibleItem { id: accessibleInfo diff --git a/src/framework/ui/tests/navigationcontroller_tests.cpp b/src/framework/ui/tests/navigationcontroller_tests.cpp index 748569e066f4e..ecb567ff44b13 100644 --- a/src/framework/ui/tests/navigationcontroller_tests.cpp +++ b/src/framework/ui/tests/navigationcontroller_tests.cpp @@ -105,7 +105,7 @@ class NavigationControllerTests : public ::testing::Test NavigationSection* section = nullptr; std::vector panels; std::set ipanels; - OnActiveRequested actveCallback; + OnActiveRequested activeCallback; ~Section() { diff --git a/src/framework/ui/view/uitheme.cpp b/src/framework/ui/view/uitheme.cpp index 42998fe5fdb62..cd42b1d878f00 100644 --- a/src/framework/ui/view/uitheme.cpp +++ b/src/framework/ui/view/uitheme.cpp @@ -559,7 +559,7 @@ void UiTheme::drawPrimitive(QStyle::PrimitiveElement element, const QStyleOption drawRoundedRect(painter, option->rect, 1, NO_FILL, QPen(fontPrimaryColor(), navCtrlBorderWidth())); } - //! NOTE: need for removing frame focus recangle + //! NOTE: need for removing frame focus rectangle } break; // Indicator icons diff --git a/src/framework/uicomponents/qml/MuseScore/UiComponents/FocusableControl.qml b/src/framework/uicomponents/qml/MuseScore/UiComponents/FocusableControl.qml index 6c2b10cec2a9c..07b24674537e9 100644 --- a/src/framework/uicomponents/qml/MuseScore/UiComponents/FocusableControl.qml +++ b/src/framework/uicomponents/qml/MuseScore/UiComponents/FocusableControl.qml @@ -25,8 +25,8 @@ import MuseScore.Ui 1.0 FocusScope { id: root - default property alias content: contentItemContaner.data - property alias contentItem: contentItemContaner + default property alias content: contentItemContainer.data + property alias contentItem: contentItemContainer property alias background: focusRectItem property alias focusBorder: focusBorderItem @@ -34,7 +34,7 @@ FocusScope { property alias navigation: navCtrl - signal navigationActived() + signal navigationActivated() signal navigationTriggered() function ensureActiveFocus() { @@ -59,7 +59,7 @@ FocusScope { onActiveChanged: { if (navCtrl.active) { root.ensureActiveFocus() - root.navigationActived() + root.navigationActivated() } } @@ -94,7 +94,7 @@ FocusScope { } Item { - id: contentItemContaner + id: contentItemContainer objectName: "FocusableControlContent" anchors.fill: focusRectItem } diff --git a/src/framework/uicomponents/qml/MuseScore/UiComponents/StyledMenuItem.qml b/src/framework/uicomponents/qml/MuseScore/UiComponents/StyledMenuItem.qml index d16202e970e00..984821a209405 100644 --- a/src/framework/uicomponents/qml/MuseScore/UiComponents/StyledMenuItem.qml +++ b/src/framework/uicomponents/qml/MuseScore/UiComponents/StyledMenuItem.qml @@ -303,15 +303,15 @@ ListItemBlank { return } - var mouseGlogalPos = mapToGlobal(Qt.point(mouseX, mouseY)) + var mouseGlobalPos = mapToGlobal(Qt.point(mouseX, mouseY)) var showedSubMenuGlobalPos = itemPrv.showedSubMenu.contentItem.mapToGlobal(0, 0) var eps = 8 var subMenuWidth = itemPrv.showedSubMenu.width var subMenuHeight = itemPrv.showedSubMenu.height - var isHoveredOnShowedSubMenu = (showedSubMenuGlobalPos.x < mouseGlogalPos.x + eps && mouseGlogalPos.x - eps < showedSubMenuGlobalPos.x + subMenuWidth) - && (showedSubMenuGlobalPos.y < mouseGlogalPos.y + eps && mouseGlogalPos.y - eps < showedSubMenuGlobalPos.y + subMenuHeight) + var isHoveredOnShowedSubMenu = (showedSubMenuGlobalPos.x < mouseGlobalPos.x + eps && mouseGlobalPos.x - eps < showedSubMenuGlobalPos.x + subMenuWidth) + && (showedSubMenuGlobalPos.y < mouseGlobalPos.y + eps && mouseGlobalPos.y - eps < showedSubMenuGlobalPos.y + subMenuHeight) if (isHoveredOnShowedSubMenu) { return diff --git a/src/framework/uicomponents/qml/MuseScore/UiComponents/Utils.js b/src/framework/uicomponents/qml/MuseScore/UiComponents/Utils.js index a96440ff352ff..6f10b48d5469f 100644 --- a/src/framework/uicomponents/qml/MuseScore/UiComponents/Utils.js +++ b/src/framework/uicomponents/qml/MuseScore/UiComponents/Utils.js @@ -86,7 +86,7 @@ function getItemValue(model, index, roleName, def) { function makeMnemonicText(text) { var index = text.indexOf("&") if (index !== -1) { - if (index === text.lenght - 1) { + if (index === text.length - 1) { text = removeAmpersands(text) } else { text = text.replace(text.substr(index, 2), ("" + text.substr(index + 1, 1) + "")) diff --git a/src/framework/vst/internal/vstmodulesrepository.cpp b/src/framework/vst/internal/vstmodulesrepository.cpp index 76703616a434f..d1aaba4bcb6e4 100644 --- a/src/framework/vst/internal/vstmodulesrepository.cpp +++ b/src/framework/vst/internal/vstmodulesrepository.cpp @@ -186,7 +186,7 @@ io::paths VstModulesRepository::pluginPathsFromCustomLocations(const io::paths& } /** - * @brief Scanning for plugins in the default VST locations, considering the current architechture (i386, x86_64, arm, etc.) + * @brief Scanning for plugins in the default VST locations, considering the current architecture (i386, x86_64, arm, etc.) * @see https://developer.steinberg.help/pages/viewpage.action?pageId=9798275 **/ PluginModule::PathList VstModulesRepository::pluginPathsFromDefaultLocation() const diff --git a/src/framework/vst/internal/vstpluginsregister.cpp b/src/framework/vst/internal/vstpluginsregister.cpp index 256488ce49f53..5b00a7fd1220e 100644 --- a/src/framework/vst/internal/vstpluginsregister.cpp +++ b/src/framework/vst/internal/vstpluginsregister.cpp @@ -66,7 +66,7 @@ VstPluginPtr VstPluginsRegister::instrumentPlugin(const audio::TrackId trackId, auto mapSearch = m_vstiPluginsMap.find(trackId); if (mapSearch == m_vstiPluginsMap.end()) { - LOGE() << "Unable to find intrument plugin, trackId: " << trackId + LOGE() << "Unable to find instrument plugin, trackId: " << trackId << " , resourceId: " << resourceId; return nullptr; diff --git a/src/framework/vst/view/abstractvsteditorview.cpp b/src/framework/vst/view/abstractvsteditorview.cpp index cb257475a5abe..c3388bae9d578 100644 --- a/src/framework/vst/view/abstractvsteditorview.cpp +++ b/src/framework/vst/view/abstractvsteditorview.cpp @@ -101,7 +101,7 @@ void AbstractVstEditorView::attachView(VstPluginPtr pluginPtr) return; } - FUnknownPtr scalingHandler(m_view); + FUnknownPtr scalingHandler(m_view); if (scalingHandler) { scalingHandler->setContentScaleFactor(m_scalingFactor); } diff --git a/src/framework/vst/vsttypes.h b/src/framework/vst/vsttypes.h index 4e45efc3849db..ea87440037944 100644 --- a/src/framework/vst/vsttypes.h +++ b/src/framework/vst/vsttypes.h @@ -63,7 +63,7 @@ using PluginParamValue = Steinberg::Vst::ParamValue; using IAudioProcessorPtr = Steinberg::FUnknownPtr; using IComponentHandler = Steinberg::Vst::IComponentHandler; using IAdvancedComponentHandler = Steinberg::Vst::IComponentHandler2; -using IPlugingContentScaleHandler = Steinberg::IPlugViewContentScaleSupport; +using IPluginContentScaleHandler = Steinberg::IPlugViewContentScaleSupport; using FIDString = Steinberg::FIDString; using BusInfo = Steinberg::Vst::BusInfo; using BusDirection = Steinberg::Vst::BusDirections; diff --git a/src/importexport/braille/internal/exportbraille.cpp b/src/importexport/braille/internal/exportbraille.cpp index c705819fc7951..9de040234d2a7 100644 --- a/src/importexport/braille/internal/exportbraille.cpp +++ b/src/importexport/braille/internal/exportbraille.cpp @@ -99,7 +99,7 @@ namespace mu::iex::braille { #define BRAILLE_ACC_FLAT QString("<") #define BRAILLE_ACC_QUARTER_STEP QString("@") #define BRAILLE_ACC_3QUARTER_STEP QString("_") -#define BRAILLE_ACC_5QUARTER_STEP QString(".") //extrapollated from octave marks. not sure. +#define BRAILLE_ACC_5QUARTER_STEP QString(".") //extrapolated from octave marks. not sure. // Table 2. Page 4. Music Braille Code 2015 //8th and 128th notes have the same representation in Braille @@ -128,7 +128,7 @@ namespace mu::iex::braille { #define BRAILLE_B_32ND_HALF 't' //16th and whole notes have the same representation in Braille. // Breve has the same representation, but with an extra suffix; -// 256th has the same represantation, but with an extra prefix; +// 256th has the same representation, but with an extra prefix; #define BRAILLE_C_16TH_WHOLE 'Y' #define BRAILLE_D_16TH_WHOLE 'Z' #define BRAILLE_E_16TH_WHOLE '&' @@ -258,11 +258,11 @@ namespace mu::iex::braille { // Table 16.F. Page 14. Music Braille Code 2015 #define BRAILLE_MORDENT_WITH_UPPER_FIX QString("4;6") #define BRAILLE_UP_PRALL QString("4l;6") -#define BRAILLE_UP_MORDENT QString("4l;6l") //extrapollated. not sure -#define BRAILLE_DOWN_MORDENT QString("4;6") //extrapollated. not sure -#define BRAILLE_PRALL_DOWN QString(";64l") //extrapollated. not sure -#define BRAILLE_PRALL_UP QString(";64") //extrapollated. not sure -#define BRAILLE_LINE_PRALL QString(";6l4") //extrapollated. not sure +#define BRAILLE_UP_MORDENT QString("4l;6l") //extrapolated. not sure +#define BRAILLE_DOWN_MORDENT QString("4;6") //extrapolated. not sure +#define BRAILLE_PRALL_DOWN QString(";64l") //extrapolated. not sure +#define BRAILLE_PRALL_UP QString(";64") //extrapolated. not sure +#define BRAILLE_LINE_PRALL QString(";6l4") //extrapolated. not sure // Table 17. Page 15.x Music Braille Code 2015 #define BRAILLE_BARLINE_START_REPEAT QString("<7") @@ -328,7 +328,7 @@ namespace mu::iex::braille { #define BRAILLE_UP_BOW QString("<'") #define BRAILLE_LEFT_HAND_PIZZICATO QString("_>") -//This class currently supports just a limited coversion from text to braille +//This class currently supports just a limited conversion from text to braille //TODO: enhance it to have full support from text to UEB, including contractions //http://www.brailleauthority.org/learn/braillebasic.pdf //https://www.teachingvisuallyimpaired.com/uploads/1/4/1/2/14122361/ueb_braille_chart.pdf @@ -630,7 +630,7 @@ bool ExportBrailleImpl::write(io::Device& device) size_t nrStaves = score->staves().size(); std::vector measureBraille(nrStaves); std::vector line(nrStaves + 1); - int currentLineLenght = 0; + int currentLineLength = 0; int currentMeasureMaxLength = 0; bool measureAboveMax = false; @@ -642,7 +642,7 @@ bool ExportBrailleImpl::write(io::Device& device) Measure* m = toMeasure(mb); // if we are at the beginning of the line // we write the measure number - if (currentLineLenght == 0) { + if (currentLineLength == 0) { TextToUEBBraille textToBraille; QString measureNumber = textToBraille.braille(QString::number(m->no() + 1)).remove(0, 1) + " "; int measureNumberLen = measureNumber.size(); @@ -650,7 +650,7 @@ bool ExportBrailleImpl::write(io::Device& device) for (size_t i = 1; i < nrStaves; i++) { line[i] += QString("").leftJustified(measureNumberLen); } - currentLineLenght += measureNumberLen; + currentLineLength += measureNumberLen; } if (m->hasMMRest() && score->styleB(Sid::createMultiMeasureRests)) { @@ -671,14 +671,14 @@ bool ExportBrailleImpl::write(io::Device& device) // TODO handle better the case when the size of the current measure // by itself is larger than the MAX_CHARS_PER_LINE. The measure will // have to be split on multiple lines based on specific rules - if ((currentMeasureMaxLength + currentLineLenght > MAX_CHARS_PER_LINE) && !measureAboveMax) { + if ((currentMeasureMaxLength + currentLineLength > MAX_CHARS_PER_LINE) && !measureAboveMax) { QTextStream out(&device); for (size_t i = 0; i < nrStaves; ++i) { out << line[i].toUtf8() << Qt::endl; line[i] = QString(); } out.flush(); - currentLineLenght = 0; + currentLineLength = 0; // We need to re-render the current measure // as it will be on a new line. mb = mb->prev(); @@ -691,7 +691,7 @@ bool ExportBrailleImpl::write(io::Device& device) continue; } - currentLineLenght += currentMeasureMaxLength; + currentLineLength += currentMeasureMaxLength; for (size_t i = 0; i < nrStaves; ++i) { line[i] += measureBraille[i].leftJustified(currentMeasureMaxLength); measureBraille[i] = QString(); @@ -703,7 +703,7 @@ bool ExportBrailleImpl::write(io::Device& device) out << line[i].toUtf8() << Qt::endl; line[i] = QString(); } - currentLineLenght = 0; + currentLineLength = 0; // 3.2.1. Page 53. Music Braille Code 2015. // The octave is always marked for the first note of a braille line resetOctaves(); @@ -1105,7 +1105,7 @@ QString ExportBrailleImpl::brailleMeasure(Measure* measure, int staffCount) for (size_t i = 1; i < VOICES; ++i) { if (measure->hasVoice(staffCount * VOICES + i)) { // 11.1.1. Page 87. Music Braille Code 2015. - // All voices must be complete when writting the other voices in Braille. + // All voices must be complete when writing the other voices in Braille. // We exchange the voices to voice 0 and back for MuseScore to add the missing beats as rests // Then we undo the change, so we don't have an altered score. // TODO: Braille dot 5 should be put before the rests that appear in Braille, but are not originally in the score @@ -1211,8 +1211,8 @@ QString ExportBrailleImpl::brailleAccidentalType(AccidentalType accidental) case AccidentalType::SHARP: return BRAILLE_ACC_SHARP; case AccidentalType::SHARP2: return BRAILLE_ACC_SHARP + BRAILLE_ACC_SHARP; case AccidentalType::FLAT2: return BRAILLE_ACC_FLAT + BRAILLE_ACC_FLAT; - case AccidentalType::NATURAL_FLAT: return BRAILLE_ACC_NATURAL + BRAILLE_ACC_FLAT; //extrapollated - case AccidentalType::NATURAL_SHARP: return BRAILLE_ACC_NATURAL + BRAILLE_ACC_SHARP; //extrapollated + case AccidentalType::NATURAL_FLAT: return BRAILLE_ACC_NATURAL + BRAILLE_ACC_FLAT; //extrapolated + case AccidentalType::NATURAL_SHARP: return BRAILLE_ACC_NATURAL + BRAILLE_ACC_SHARP; //extrapolated case AccidentalType::SHARP_SHARP: return BRAILLE_ACC_SHARP + BRAILLE_ACC_SHARP; case AccidentalType::FLAT_ARROW_UP: return BRAILLE_ACC_QUARTER_STEP + BRAILLE_ACC_FLAT; case AccidentalType::FLAT_ARROW_DOWN: return BRAILLE_ACC_3QUARTER_STEP + BRAILLE_ACC_FLAT; @@ -1220,10 +1220,10 @@ QString ExportBrailleImpl::brailleAccidentalType(AccidentalType accidental) case AccidentalType::NATURAL_ARROW_DOWN: return BRAILLE_ACC_QUARTER_STEP + BRAILLE_ACC_FLAT; case AccidentalType::SHARP_ARROW_UP: return BRAILLE_ACC_3QUARTER_STEP + BRAILLE_ACC_SHARP; case AccidentalType::SHARP_ARROW_DOWN: return BRAILLE_ACC_QUARTER_STEP + BRAILLE_ACC_SHARP; - case AccidentalType::SHARP2_ARROW_UP: return BRAILLE_ACC_5QUARTER_STEP + BRAILLE_ACC_SHARP; //extrapollated. not sure + case AccidentalType::SHARP2_ARROW_UP: return BRAILLE_ACC_5QUARTER_STEP + BRAILLE_ACC_SHARP; //extrapolated. not sure case AccidentalType::SHARP2_ARROW_DOWN: return BRAILLE_ACC_3QUARTER_STEP + BRAILLE_ACC_SHARP; case AccidentalType::FLAT2_ARROW_UP: return BRAILLE_ACC_3QUARTER_STEP + BRAILLE_ACC_FLAT; - case AccidentalType::FLAT2_ARROW_DOWN: return BRAILLE_ACC_5QUARTER_STEP + BRAILLE_ACC_FLAT; //extrapollated. not sure + case AccidentalType::FLAT2_ARROW_DOWN: return BRAILLE_ACC_5QUARTER_STEP + BRAILLE_ACC_FLAT; //extrapolated. not sure case AccidentalType::MIRRORED_FLAT: return BRAILLE_ACC_QUARTER_STEP + BRAILLE_ACC_FLAT; case AccidentalType::MIRRORED_FLAT2: return BRAILLE_ACC_3QUARTER_STEP + BRAILLE_ACC_FLAT; case AccidentalType::SHARP_SLASH: return BRAILLE_ACC_QUARTER_STEP + BRAILLE_ACC_SHARP; @@ -1280,7 +1280,7 @@ QString ExportBrailleImpl::brailleNote(const QString& pitchName, DurationType du //16th and whole notes have the same representation in Braille. // Breve has the same representation, but with an extra suffix; - // 256th has the same represantation, but with an extra prefix; + // 256th has the same representation, but with an extra prefix; noteToBraille[DurationType::V_256TH]["C"] = noteToBraille[DurationType::V_16TH]["C"] =noteToBraille[DurationType::V_WHOLE]["C"] = noteToBraille[DurationType::V_BREVE]["C"] @@ -1575,7 +1575,7 @@ QString ExportBrailleImpl::brailleChord(Chord* chord) QString hairpinBrailleAfter = brailleHairpinAfter(chord, chordHairpins); QString arpeggio = brailleArpeggio(chord->arpeggio()); - QString tremolloBraille = brailleTremolo(chord); + QString tremoloBraille = brailleTremolo(chord); QString glissandoLastNoteBraille = brailleGlissando(notes.back()); // In Braille the order of elements is clearly defined @@ -1589,7 +1589,7 @@ QString ExportBrailleImpl::brailleChord(Chord* chord) result += tupletBraille; result += rootNoteBraille; result += intervals; - result += tremolloBraille; + result += tremoloBraille; result += chordTieBraille; result += slurBrailleAfter; result += glissandoLastNoteBraille; @@ -1793,7 +1793,7 @@ QString ExportBrailleImpl::brailleKeySig(KeySig* keySig) QString brailleKeySig = QString(); if (keySig->isCustom()) { - //Sectioon 6.5.1. Page 62. Music Braille Code 2015. + //Section 6.5.1. Page 62. Music Braille Code 2015. //TODO } else { //Section 6.5. Page 61. Music Braille Code 2015. @@ -1984,10 +1984,10 @@ QString ExportBrailleImpl::brailleArticulation(Articulation* artic) return BRAILLE_ARTIC_STACCATO; case SymId::articStaccatissimoAbove: case SymId::articStaccatissimoBelow: - case SymId::articStaccatissimoStrokeAbove: //extrapollated - case SymId::articStaccatissimoStrokeBelow: //extrapollated - case SymId::articStaccatissimoWedgeAbove: //extrapollated - case SymId::articStaccatissimoWedgeBelow: //extrapollated + case SymId::articStaccatissimoStrokeAbove: //extrapolated + case SymId::articStaccatissimoStrokeBelow: //extrapolated + case SymId::articStaccatissimoWedgeAbove: //extrapolated + case SymId::articStaccatissimoWedgeBelow: //extrapolated return BRAILLE_ARTIC_STACCATISSIMO; case SymId::articTenutoAbove: case SymId::articTenutoBelow: @@ -2000,19 +2000,19 @@ QString ExportBrailleImpl::brailleArticulation(Articulation* artic) return BRAILLE_ARTIC_MARCATO; case SymId::articAccentStaccatoAbove: case SymId::articAccentStaccatoBelow: - return BRAILLE_ARTIC_STACCATO + BRAILLE_ARTIC_ACCENT; //extrapollated + return BRAILLE_ARTIC_STACCATO + BRAILLE_ARTIC_ACCENT; //extrapolated case SymId::articMarcatoStaccatoAbove: case SymId::articMarcatoStaccatoBelow: - return BRAILLE_ARTIC_STACCATO + BRAILLE_ARTIC_MARCATO; //extrapollated + return BRAILLE_ARTIC_STACCATO + BRAILLE_ARTIC_MARCATO; //extrapolated case SymId::articMarcatoTenutoAbove: case SymId::articMarcatoTenutoBelow: - return BRAILLE_ARTIC_MARCATO + BRAILLE_ARTIC_TENUTO; //extrapollated + return BRAILLE_ARTIC_MARCATO + BRAILLE_ARTIC_TENUTO; //extrapolated case SymId::articStressAbove: case SymId::articStressBelow: return QString(); //TODO case SymId::articTenutoAccentAbove: case SymId::articTenutoAccentBelow: - return BRAILLE_ARTIC_TENUTO + BRAILLE_ARTIC_ACCENT; //extrapollated + return BRAILLE_ARTIC_TENUTO + BRAILLE_ARTIC_ACCENT; //extrapolated case SymId::articUnstressAbove: case SymId::articUnstressBelow: return QString(); //TODO @@ -2039,9 +2039,9 @@ QString ExportBrailleImpl::brailleArticulation(Articulation* artic) case SymId::stringsUpBow: return BRAILLE_UP_BOW; case SymId::pluckedLeftHandPizzicato: - case SymId::pluckedBuzzPizzicato: // extrapollated. not sure - case SymId::pluckedSnapPizzicatoAbove: // extrapollated. not sure - case SymId::pluckedSnapPizzicatoBelow: // extrapollated. not sure + case SymId::pluckedBuzzPizzicato: // extrapolated. not sure + case SymId::pluckedSnapPizzicatoAbove: // extrapolated. not sure + case SymId::pluckedSnapPizzicatoBelow: // extrapolated. not sure return BRAILLE_LEFT_HAND_PIZZICATO; case SymId::ornamentTurn: return BRAILLE_TURN_NOTE; @@ -2357,7 +2357,7 @@ QString ExportBrailleImpl::brailleHairpinBefore(ChordRest* chordRest, const std: if (!chordRest) { return QString(); } - //TODO we are supposed to use line continuation 1 and 2 if there are multiple lines overlaping + //TODO we are supposed to use line continuation 1 and 2 if there are multiple lines overlapping QString result = QString(); for (Hairpin* hairpin : hairpins) { if (!hairpin || hairpin->startCR() != chordRest) { @@ -2404,7 +2404,7 @@ QString ExportBrailleImpl::brailleHairpinAfter(ChordRest* chordRest, const std:: if (!chordRest) { return QString(); } - //TODO we are supposed to use line continuation 1 and 2 if there are multiple lines overlaping + //TODO we are supposed to use line continuation 1 and 2 if there are multiple lines overlapping // 23.3.3.C says end of *may* be omitted in some specific cases, // but since it is not mandatory, we don't do it for simplicity. diff --git a/src/importexport/braille/tests/data/testGlisando_Example_16.6.1_MBC2015.mscx b/src/importexport/braille/tests/data/testGlissando_Example_16.6.1_MBC2015.mscx similarity index 100% rename from src/importexport/braille/tests/data/testGlisando_Example_16.6.1_MBC2015.mscx rename to src/importexport/braille/tests/data/testGlissando_Example_16.6.1_MBC2015.mscx diff --git a/src/importexport/braille/tests/data/testGlisando_Example_16.6.1_MBC2015_ref.brf b/src/importexport/braille/tests/data/testGlissando_Example_16.6.1_MBC2015_ref.brf similarity index 100% rename from src/importexport/braille/tests/data/testGlisando_Example_16.6.1_MBC2015_ref.brf rename to src/importexport/braille/tests/data/testGlissando_Example_16.6.1_MBC2015_ref.brf diff --git a/src/importexport/braille/tests/tst_braille_io.cpp b/src/importexport/braille/tests/tst_braille_io.cpp index bab8468314bc3..da80d552f2a9e 100644 --- a/src/importexport/braille/tests/tst_braille_io.cpp +++ b/src/importexport/braille/tests/tst_braille_io.cpp @@ -87,7 +87,7 @@ private slots: void slursWithRest() { brailleMscxExportTestRef("testSlur_Example_13.3.2_MBC2015"); } // the Braille ref uses bracket slurs even if layered instead of doubled-slur void slursLayered() { brailleMscxExportTestRef("testSlur_Example_13.3.3_MBC2015"); } - void slursShortCovergence() { brailleMscxExportTestRef("testSlur_Example_13.4.1_MBC2015"); } + void slursShortConvergence() { brailleMscxExportTestRef("testSlur_Example_13.4.1_MBC2015"); } void slursMixConvergence() { brailleMscxExportTestRef("testSlur_Example_13.4.2_b_MBC2015"); } void slursMixAndTies() { brailleMscxExportTestRef("testSlur_Example_13.5.1_b_MBC2015"); } void tremolo() { brailleMscxExportTestRef("testTremolo_Example_14.2.1_MBC2015"); } @@ -98,7 +98,7 @@ private slots: void graceNotes() { brailleMscxExportTestRef("testGrace_Example_16.2.1_MBC2015"); } void graceChords() { brailleMscxExportTestRef("testGrace_Example_16.2.1.1_MBC2015"); } void ornaments() { brailleMscxExportTestRef("testOrnaments_Example_16.5_MBC2015"); } - void glissando() { brailleMscxExportTestRef("testGlisando_Example_16.6.1_MBC2015"); } + void glissando() { brailleMscxExportTestRef("testGlissando_Example_16.6.1_MBC2015"); } void repeats() { brailleMscxExportTestRef("testRepeats_Example_17.1.1_MBC2015"); } void voltas1() { brailleMscxExportTestRef("testVolta_Example_17.1.1.1_MBC2015"); } void voltas2() { brailleMscxExportTestRef("testVolta_Example_17.1.1.2_MBC2015"); } diff --git a/src/importexport/capella/internal/capella.cpp b/src/importexport/capella/internal/capella.cpp index e25dd373c29a3..210b4a4d0abdf 100644 --- a/src/importexport/capella/internal/capella.cpp +++ b/src/importexport/capella/internal/capella.cpp @@ -2303,7 +2303,7 @@ void Capella::readStaveLayout(CapStaffLayout* sl, int idx) sl->abbrev = readQString(); sl->intermediateName = readQString(); sl->intermediateAbbrev = readQString(); - LOGD(" descr <%s> name <%s> abbrev <%s> iname <%s> iabrev <%s>", + LOGD(" descr <%s> name <%s> abbrev <%s> iname <%s> iabbrev <%s>", qPrintable(sl->descr), qPrintable(sl->name), qPrintable(sl->abbrev), qPrintable(sl->intermediateName), qPrintable(sl->intermediateAbbrev)); } @@ -2740,7 +2740,7 @@ void Capella::read(QFile* fp) bAllowCompression = b & 2; bPrintLandscape = b & 16; - // LOGD(" nRel %d nAbs %d useRealSize %d compresseion %d", nRel, nAbs, bUseRealSize, bAllowCompression); + // LOGD(" nRel %d nAbs %d useRealSize %d compression %d", nRel, nAbs, bUseRealSize, bAllowCompression); readLayout(); diff --git a/src/importexport/capella/internal/capellareader.cpp b/src/importexport/capella/internal/capellareader.cpp index 32f530e927d27..1d7448b528680 100644 --- a/src/importexport/capella/internal/capellareader.cpp +++ b/src/importexport/capella/internal/capellareader.cpp @@ -35,10 +35,10 @@ using namespace mu::iex::capella; mu::Ret CapellaReader::read(Ms::MasterScore* score, const io::path& path, const Options&) { Ms::Score::FileError err = Ms::Score::FileError::FILE_UNKNOWN_TYPE; - std::string syffix = mu::io::suffix(path); - if (syffix == "cap") { + std::string suffix = mu::io::suffix(path); + if (suffix == "cap") { err = Ms::importCapella(score, path.toQString()); - } else if (syffix == "capx") { + } else if (suffix == "capx") { err = Ms::importCapXml(score, path.toQString()); } return mu::notation::scoreFileErrorToRet(err, path); diff --git a/src/importexport/guitarpro/CMakeLists.txt b/src/importexport/guitarpro/CMakeLists.txt index ea5708804a349..0eabb6e91f109 100644 --- a/src/importexport/guitarpro/CMakeLists.txt +++ b/src/importexport/guitarpro/CMakeLists.txt @@ -60,8 +60,8 @@ set(MODULE_SRC ${CMAKE_CURRENT_LIST_DIR}/internal/gtp/gpmastertracks.h ${CMAKE_CURRENT_LIST_DIR}/internal/gtp/gpnote.cpp ${CMAKE_CURRENT_LIST_DIR}/internal/gtp/gpnote.h - ${CMAKE_CURRENT_LIST_DIR}/internal/gtp/gprhytm.cpp - ${CMAKE_CURRENT_LIST_DIR}/internal/gtp/gprhytm.h + ${CMAKE_CURRENT_LIST_DIR}/internal/gtp/gprhythm.cpp + ${CMAKE_CURRENT_LIST_DIR}/internal/gtp/gprhythm.h ${CMAKE_CURRENT_LIST_DIR}/internal/gtp/gpscore.cpp ${CMAKE_CURRENT_LIST_DIR}/internal/gtp/gpscore.h ${CMAKE_CURRENT_LIST_DIR}/internal/gtp/gptrack.cpp diff --git a/src/importexport/guitarpro/internal/gtp/gp67dombuilder.cpp b/src/importexport/guitarpro/internal/gtp/gp67dombuilder.cpp index 89a88f633fb51..8e90a003218f4 100644 --- a/src/importexport/guitarpro/internal/gtp/gp67dombuilder.cpp +++ b/src/importexport/guitarpro/internal/gtp/gp67dombuilder.cpp @@ -53,7 +53,6 @@ void GP67DomBuilder::buildGPDomModel(QDomElement* qdomElem) assignMap(current); } - std::unordered_map > rhytms; buildGPRhythms(&rhythms); buildGPNotes(¬es); buildGPBeats(&beats); @@ -250,19 +249,19 @@ void GP67DomBuilder::buildGPNotes(QDomNode* notesNode) void GP67DomBuilder::buildGPRhythms(QDomNode* rhythmsNode) { - std::unordered_map > rhytms; + std::unordered_map > rhythms; QDomNode innerNode = rhythmsNode->firstChild(); while (!innerNode.isNull()) { auto nodeName = innerNode.nodeName(); if (nodeName == "Rhythm") { - rhytms.insert(createGPRhythm(&innerNode)); + rhythms.insert(createGPRhythm(&innerNode)); } innerNode = innerNode.nextSibling(); } - _rhytms.swap(rhytms); + _rhythms.swap(rhythms); } std::vector GP67DomBuilder::readTempoMap(QDomNode* currentNode) @@ -351,8 +350,8 @@ std::unique_ptr GP67DomBuilder::createGPMasterBar(QDomNode* masterB } else if (nodeName == "Key") { masterBar->setKeySig(readKeySig(&innerNode)); } else if (nodeName == "Bars") { - const auto& barsElemet = innerNode.toElement().text(); - const auto& bars = barsElemet.split(" "); + const auto& barsElement = innerNode.toElement().text(); + const auto& bars = barsElement.split(" "); for (const auto& barIdx : bars) { int idx = barIdx.toInt(); std::unique_ptr bar; @@ -449,8 +448,8 @@ std::pair > GP67DomBuilder::createGPBar(QDomNode* ba } else if (nodeName == "SimileMark") { bar->setSimileMark(simileMarkType(innerNode.toElement().text())); } else if (nodeName == "Voices") { - auto voicesElemet = innerNode.toElement().text(); - auto voices = voicesElemet.split(" "); + auto voicesElement = innerNode.toElement().text(); + auto voices = voicesElement.split(" "); for (const auto& voiceIdx : voices) { int idx = voiceIdx.toInt(); if (idx == -1) { @@ -483,8 +482,8 @@ std::pair > GP67DomBuilder::createGPVoice(QDomNode while (!innerNode.isNull()) { auto nodeName = innerNode.nodeName(); if (nodeName == "Beats") { - auto beatsElemet = innerNode.toElement().text(); - auto beats = beatsElemet.split(" "); + auto beatsElement = innerNode.toElement().text(); + auto beats = beatsElement.split(" "); for (const auto& beatIdx : beats) { int idx = beatIdx.toInt(); std::shared_ptr beat; @@ -614,7 +613,7 @@ std::pair > GP67DomBuilder::createGPBeat(QDomNode* beat->setLegatoType(legato); } else if (nodeName == "Rhythm") { auto rIdx = innerNode.attributes().namedItem("ref").toAttr().value().toInt(); - beat->addGPRhytm(_rhytms.at(rIdx)); + beat->addGPRhythm(_rhythms.at(rIdx)); } else if (nodeName == "Notes") { auto notesStr = innerNode.toElement().text(); auto strList = notesStr.split(" "); @@ -642,8 +641,8 @@ std::pair > GP67DomBuilder::createGPBeat(QDomNode* beat->setHairpin(hairpinType(innerNode.toElement().text())); } else if (nodeName == "Tremolo") { GPBeat::Tremolo tr; - tr.enumerator = innerNode.toElement().text().split("/").at(0).toInt(); - tr.denumerator = innerNode.toElement().text().split("/").at(1).toInt(); + tr.numerator = innerNode.toElement().text().split("/").at(0).toInt(); + tr.denominator = innerNode.toElement().text().split("/").at(1).toInt(); beat->setTremolo(tr); } else if (nodeName == "Wah") { beat->setWah(wahType(innerNode.toElement().text())); @@ -692,7 +691,7 @@ std::pair > GP67DomBuilder::createGPNote(QDomNode* return GPNote::VibratoType::None; } }; - auto ornametType = [](const auto& str) { + auto ornamentType = [](const auto& str) { if (str == "UpperMordent") { return GPNote::Ornament::UpperMordent; } else if (str == "LowerMordent") { @@ -756,7 +755,7 @@ std::pair > GP67DomBuilder::createGPNote(QDomNode* } else if (nodeName == "Trill") { note->setTrillFret(innerNode.toElement().text().toInt()); } else if (nodeName == "Ornament") { - note->setOrnament(ornametType(innerNode.toElement().text())); + note->setOrnament(ornamentType(innerNode.toElement().text())); } else { LOGD() << "unknown GP Note Tag" << nodeName << "\n"; } @@ -767,27 +766,27 @@ std::pair > GP67DomBuilder::createGPNote(QDomNode* return std::make_pair(noteIdx, std::move(note)); } -std::pair > GP67DomBuilder::createGPRhythm(QDomNode* rhythmNode) +std::pair > GP67DomBuilder::createGPRhythm(QDomNode* rhythmNode) { - auto rhythmType = [](const QString& str) -> GPRhytm::RhytmType { + auto rhythmType = [](const QString& str) -> GPRhythm::RhytmType { if (str == "Whole") { - return GPRhytm::RhytmType::Whole; + return GPRhythm::RhytmType::Whole; } else if (str == "Half") { - return GPRhytm::RhytmType::Half; + return GPRhythm::RhytmType::Half; } else if (str == "Quarter") { - return GPRhytm::RhytmType::Quarter; + return GPRhythm::RhytmType::Quarter; } else if (str == "Eighth") { - return GPRhytm::RhytmType::Eighth; + return GPRhythm::RhytmType::Eighth; } else if (str == "16th") { - return GPRhytm::RhytmType::Sixteenth; + return GPRhythm::RhytmType::Sixteenth; } else if (str == "32nd") { - return GPRhytm::RhytmType::ThirtySecond; + return GPRhythm::RhytmType::ThirtySecond; } else { - return GPRhytm::RhytmType::SixtyFourth; + return GPRhythm::RhytmType::SixtyFourth; } }; - std::shared_ptr rhythm = std::make_shared(); + std::shared_ptr rhythm = std::make_shared(); auto innerNode = rhythmNode->firstChild(); int rhythmIdx = rhythmNode->attributes().namedItem("id").toAttr().value().toInt(); @@ -801,8 +800,8 @@ std::pair > GP67DomBuilder::createGPRhythm(QDomNod rhythm->setDotCount(innerNode.attributes().namedItem("count").toAttr().value().toInt()); } else if (nodeName == "PrimaryTuplet") { int num = innerNode.attributes().namedItem("num").toAttr().value().toInt(); - int denum = innerNode.attributes().namedItem("den").toAttr().value().toInt(); - rhythm->setTuplet({ num, denum }); + int denom = innerNode.attributes().namedItem("den").toAttr().value().toInt(); + rhythm->setTuplet({ num, denom }); } else { LOGD() << "unknown GP Rhytms tag" << nodeName << "\n"; } @@ -1125,7 +1124,7 @@ void GP67DomBuilder::readTrackProperties(QDomNode* propertiesNode, GPTrack* trac } property.tunning.swap(tunning); } else if (propertyName == "DiagramCollection" || propertyName == "DiagramWorkingSet") { - readDiagramm(propertyNode.firstChild(), track); + readDiagram(propertyNode.firstChild(), track); } else { LOGD() << "unknown GP trackProperty info tag: " << propertyName << "\n"; } @@ -1136,7 +1135,7 @@ void GP67DomBuilder::readTrackProperties(QDomNode* propertiesNode, GPTrack* trac track->addStaffProperty(property); } -void GP67DomBuilder::readDiagramm(const QDomNode& items, GPTrack* track) const +void GP67DomBuilder::readDiagram(const QDomNode& items, GPTrack* track) const { auto item = items.firstChild(); @@ -1146,12 +1145,12 @@ void GP67DomBuilder::readDiagramm(const QDomNode& items, GPTrack* track) const diagram.id = item.attributes().namedItem("id").toAttr().value().toInt(); diagram.name = item.attributes().namedItem("name").toAttr().value(); - auto diagrammNode = item.firstChild(); - diagram.stringCount = diagrammNode.attributes().namedItem("stringCount").toAttr().value().toInt(); - diagram.fretCount = diagrammNode.attributes().namedItem("fretCount").toAttr().value().toInt(); - diagram.baseFret = diagrammNode.attributes().namedItem("baseFret").toAttr().value().toInt(); + auto diagramNode = item.firstChild(); + diagram.stringCount = diagramNode.attributes().namedItem("stringCount").toAttr().value().toInt(); + diagram.fretCount = diagramNode.attributes().namedItem("fretCount").toAttr().value().toInt(); + diagram.baseFret = diagramNode.attributes().namedItem("baseFret").toAttr().value().toInt(); - auto fretNode = diagrammNode.firstChild(); + auto fretNode = diagramNode.firstChild(); while (!fretNode.isNull()) { if (fretNode.nodeName() == "Fret") { int string = fretNode.attributes().namedItem("string").toAttr().value().toInt(); @@ -1268,10 +1267,10 @@ std::vector GP67DomBuilder::readFermatas(QDomNode* fermata } else if (nodeName == "Offset") { auto str = fermataProperty.toElement().text(); auto numbers = str.split("/"); - fermata.offsetEnum = numbers[0].toInt(); - fermata.offsetDenum = numbers[1].toInt(); + fermata.offsetNum = numbers[0].toInt(); + fermata.offsetDenom = numbers[1].toInt(); } else if (nodeName == "Length") { - fermata.lenght = fermataProperty.toElement().text().toFloat(); + fermata.length = fermataProperty.toElement().text().toFloat(); } fermataProperty = fermataProperty.nextSibling(); diff --git a/src/importexport/guitarpro/internal/gtp/gp67dombuilder.h b/src/importexport/guitarpro/internal/gtp/gp67dombuilder.h index 239cf0de8ab5b..a51233299cab5 100644 --- a/src/importexport/guitarpro/internal/gtp/gp67dombuilder.h +++ b/src/importexport/guitarpro/internal/gtp/gp67dombuilder.h @@ -42,7 +42,7 @@ class GP67DomBuilder : public IGPDomBuilder std::pair > createGPVoice(QDomNode* voiceNode); std::pair > createGPBeat(QDomNode* beatNode); std::pair > createGPNote(QDomNode* noteNode); - std::pair > createGPRhythm(QDomNode* rhythmNode); + std::pair > createGPRhythm(QDomNode* rhythmNode); void readNoteXProperties(const QDomNode& propertiesNode, GPNote* n); void readNoteProperties(QDomNode* propertiesNode, GPNote* n); @@ -56,7 +56,7 @@ class GP67DomBuilder : public IGPDomBuilder GPMasterBar::TimeSig readTimeSig(QDomNode* timeNode) const; void readTrackProperties(QDomNode* propertiesNode, GPTrack* track) const; void readBeatProperties(const QDomNode& propertiesNode, GPBeat* beat) const; - void readDiagramm(const QDomNode& items, GPTrack* track) const; + void readDiagram(const QDomNode& items, GPTrack* track) const; void readLyrics(const QDomNode& items, GPTrack* track) const; std::vector readFermatas(QDomNode* fermatasNode) const; std::pair readMasterBarSection(const QDomNode& sectionNode) const; @@ -64,12 +64,12 @@ class GP67DomBuilder : public IGPDomBuilder std::vector readEnding(QDomNode* endNode) const; std::unordered_map > _notes; - std::unordered_map > _rhytms; + std::unordered_map > _rhythms; std::unordered_map > _beats; std::unordered_map > _voices; std::unordered_map > _bars; std::unique_ptr _gpDom; }; -} // end Ms namepsace +} // end Ms namespace #endif // GPDOMBUILDER_H diff --git a/src/importexport/guitarpro/internal/gtp/gp6dombuilder.cpp b/src/importexport/guitarpro/internal/gtp/gp6dombuilder.cpp index e5c99b79e475a..e1c3bc8f874e6 100644 --- a/src/importexport/guitarpro/internal/gtp/gp6dombuilder.cpp +++ b/src/importexport/guitarpro/internal/gtp/gp6dombuilder.cpp @@ -66,8 +66,8 @@ void GP6DomBuilder::setUpInstrument(QDomNode* trackChildNode, GPTrack* track) } if (ref.contains("gtr") || ref.contains("bass")) { - //! NOTE Guitar notation is transponced to octave by default (see music grammar) - track->setTransponce(-12); + //! NOTE Guitar notation is transposed to octave by default (see music grammar) + track->setTranspose(-12); track->setIsGuitar(true); } diff --git a/src/importexport/guitarpro/internal/gtp/gp7dombuilder.cpp b/src/importexport/guitarpro/internal/gtp/gp7dombuilder.cpp index 1e4a02c41ac59..a607ecfbe8ecd 100644 --- a/src/importexport/guitarpro/internal/gtp/gp7dombuilder.cpp +++ b/src/importexport/guitarpro/internal/gtp/gp7dombuilder.cpp @@ -49,8 +49,8 @@ std::pair > GP7DomBuilder::createGPTrack(QDomNode* int octave = octaveNode.toElement().text().toInt(); auto chromaticNode = trackChildNode.firstChildElement("Chromatic"); int chromatic = chromaticNode.toElement().text().toInt(); - int transponce = 12 * octave + chromatic; - track->setTransponce(transponce); + int transpose = 12 * octave + chromatic; + track->setTranspose(transpose); } else if ("Lyrics" == nodeName) { readLyrics(trackChildNode, track.get()); } else if (sUnused.find(nodeName) != sUnused.end()) { diff --git a/src/importexport/guitarpro/internal/gtp/gpbeat.cpp b/src/importexport/guitarpro/internal/gtp/gpbeat.cpp index 7204e8c6fa31d..a1ad2ca2a14e4 100644 --- a/src/importexport/guitarpro/internal/gtp/gpbeat.cpp +++ b/src/importexport/guitarpro/internal/gtp/gpbeat.cpp @@ -1,13 +1,13 @@ #include "gpbeat.h" namespace Ms { -std::pair GPBeat::lenth() const +std::pair GPBeat::lenth() const { - return _rhytm->length(); + return _rhythm->length(); } -GPRhytm::Tuplet GPBeat::tuplet() const +GPRhythm::Tuplet GPBeat::tuplet() const { - return _rhytm->tuplet(); + return _rhythm->tuplet(); } } diff --git a/src/importexport/guitarpro/internal/gtp/gpbeat.h b/src/importexport/guitarpro/internal/gtp/gpbeat.h index 7fd89f5bd0ff7..63a08c1d42ba1 100644 --- a/src/importexport/guitarpro/internal/gtp/gpbeat.h +++ b/src/importexport/guitarpro/internal/gtp/gpbeat.h @@ -6,7 +6,7 @@ #include #include "gpnote.h" -#include "gprhytm.h" +#include "gprhythm.h" namespace Ms { class GPBeat @@ -52,8 +52,8 @@ class GPBeat }; struct Tremolo { - int enumerator{ -1 }; - int denumerator{ -1 }; + int numerator{ -1 }; + int denominator{ -1 }; }; struct Barre { @@ -62,7 +62,7 @@ class GPBeat }; void addGPNote(const std::shared_ptr& n) { _notes.push_back(n); } - void addGPRhytm(const std::shared_ptr& n) { _rhytm = n; } + void addGPRhythm(const std::shared_ptr& n) { _rhythm = n; } void setDynamic(GPBeat::DynamicType t) { _dynamic = t; } void setLegatoType(GPBeat::LegatoType t) { _legato = t; } void setOttavaType(GPBeat::OttavaType ottavaType) { _ottavaType = ottavaType; } @@ -73,8 +73,8 @@ class GPBeat DynamicType dynamic() const { return _dynamic; } LegatoType legatoType() const { return _legato; } - std::pair lenth() const; - GPRhytm::Tuplet tuplet() const; + std::pair lenth() const; + GPRhythm::Tuplet tuplet() const; void setSlapped(bool s) { _slapped = s; } bool slapped() const { return _slapped; } @@ -109,8 +109,8 @@ class GPBeat void setHairpin(Hairpin h) { _hairpin = h; } Hairpin hairpin() const { return _hairpin; } - void setRasgueado(Rasgueado r) { _rasqueado = r; } - Rasgueado rasgueado() const { return _rasqueado; } + void setRasgueado(Rasgueado r) { _rasgueado = r; } + Rasgueado rasgueado() const { return _rasgueado; } void setPickStroke(PickStroke p) { _pickStroke = p; } PickStroke pickStroke() const { return _pickStroke; } @@ -192,7 +192,7 @@ class GPBeat std::vector > _notes; std::map _lyrics; std::map _diagramIdx; - std::shared_ptr _rhytm; + std::shared_ptr _rhythm; DynamicType _dynamic{ DynamicType::MF }; LegatoType _legato{ LegatoType::None }; OttavaType _ottavaType = OttavaType::None; @@ -206,7 +206,7 @@ class GPBeat VibratoWTremBar _vibrato{ VibratoWTremBar::None }; Fadding _fadding{ Fadding::None }; Hairpin _hairpin{ Hairpin::None }; - Rasgueado _rasqueado{ Rasgueado::None }; + Rasgueado _rasgueado{ Rasgueado::None }; PickStroke _pickStroke{ PickStroke::None }; Tremolo _tremolo; Wah _wah{ Wah::None }; diff --git a/src/importexport/guitarpro/internal/gtp/gpconverter.cpp b/src/importexport/guitarpro/internal/gtp/gpconverter.cpp index 2ea31c3fd85ad..50c687d0c25d6 100644 --- a/src/importexport/guitarpro/internal/gtp/gpconverter.cpp +++ b/src/importexport/guitarpro/internal/gtp/gpconverter.cpp @@ -204,7 +204,7 @@ void GPConverter::convert(const std::vector >& mast addTempoMap(); addFermatas(); - addContiniousSlideHammerOn(); + addContinuousSlideHammerOn(); } void GPConverter::convertMasterBar(const GPMasterBar* mB, Context ctx) @@ -263,7 +263,7 @@ void GPConverter::addBarline(const GPMasterBar* mB, Measure* measure) } GPMasterBar::TimeSig sig = mB->timeSig(); - auto scoreTimeSig = Fraction(sig.enumerator, sig.denumerator); + auto scoreTimeSig = Fraction(sig.numerator, sig.denominator); if (mB->freeTime()) { if (mB->barlineType() != GPMasterBar::BarlineType::DOUBLE) { @@ -283,8 +283,8 @@ void GPConverter::addBarline(const GPMasterBar* mB, Measure* measure) s->add(st); // if timeSig is different, it was added before, here we handle "freetime" - if (_lastTimeSig.enumerator != sig.enumerator - || _lastTimeSig.denumerator != sig.denumerator) { + if (_lastTimeSig.numerator != sig.numerator + || _lastTimeSig.denominator != sig.denominator) { return; } TimeSig* ts = Factory::createTimeSig(s); @@ -297,8 +297,8 @@ void GPConverter::addBarline(const GPMasterBar* mB, Measure* measure) } else { insideFreeTime = false; } - _lastTimeSig.enumerator = sig.enumerator; - _lastTimeSig.denumerator = sig.denumerator; + _lastTimeSig.numerator = sig.numerator; + _lastTimeSig.denominator = sig.denominator; } void GPConverter::convertVoices(const std::vector >& voices, Context ctx) @@ -435,25 +435,25 @@ void GPConverter::configureGraceChord(const GPBeat* beat, ChordRest* cr) { convertNotes(beat->notes(), cr); - auto rhytm = [](GPRhytm::RhytmType rhytm) { - if (rhytm == GPRhytm::RhytmType::Whole) { + auto rhythm = [](GPRhythm::RhytmType rhythm) { + if (rhythm == GPRhythm::RhytmType::Whole) { return 1; - } else if (rhytm == GPRhytm::RhytmType::Half) { + } else if (rhythm == GPRhythm::RhytmType::Half) { return 2; - } else if (rhytm == GPRhytm::RhytmType::Quarter) { + } else if (rhythm == GPRhythm::RhytmType::Quarter) { return 4; - } else if (rhytm == GPRhytm::RhytmType::Eighth) { + } else if (rhythm == GPRhythm::RhytmType::Eighth) { return 8; - } else if (rhytm == GPRhytm::RhytmType::Sixteenth) { + } else if (rhythm == GPRhythm::RhytmType::Sixteenth) { return 16; - } else if (rhytm == GPRhytm::RhytmType::ThirtySecond) { + } else if (rhythm == GPRhythm::RhytmType::ThirtySecond) { return 32; } else { return 64; } }; - Fraction fr(1, rhytm(beat->lenth().second)); + Fraction fr(1, rhythm(beat->lenth().second)); cr->setDurationType(TDuration(fr)); if (cr->type() == ElementType::CHORD) { @@ -471,16 +471,16 @@ void GPConverter::addTimeSig(const GPMasterBar* mB, Measure* measure) { GPMasterBar::TimeSig sig = mB->timeSig(); Fraction tick = measure->tick(); - auto scoreTimeSig = Fraction(sig.enumerator, sig.denumerator); + auto scoreTimeSig = Fraction(sig.numerator, sig.denominator); measure->setTicks(scoreTimeSig); size_t staves = _score->staves().size(); - if (_lastTimeSig.enumerator == sig.enumerator - && _lastTimeSig.denumerator == sig.denumerator) { + if (_lastTimeSig.numerator == sig.numerator + && _lastTimeSig.denominator == sig.denominator) { return; } - _lastTimeSig.enumerator = sig.enumerator; - _lastTimeSig.denumerator = sig.denumerator; + _lastTimeSig.numerator = sig.numerator; + _lastTimeSig.denominator = sig.denominator; for (size_t staffIdx = 0; staffIdx < staves; ++staffIdx) { Staff* staff = _score->staff(staffIdx); @@ -818,7 +818,7 @@ void GPConverter::setUpTrack(const std::unique_ptr& tR) tunning = standartTuning; } - int transpose = tR->transponce(); + int transpose = tR->transpose(); for (auto& t : tunning) { t -= transpose; } @@ -840,7 +840,7 @@ void GPConverter::setUpTrack(const std::unique_ptr& tR) // if (_score->OffLyrics.isEmpty()) // _score->OffLyrics = tR->lyrics(); - part->instrument()->setTranspose(tR->transponce()); + part->instrument()->setTranspose(tR->transpose()); } void GPConverter::collectTempoMap(const GPMasterTracks* mTr) @@ -866,7 +866,7 @@ void GPConverter::fillUncompletedMeasure(const Context& ctx) } } -void GPConverter::addContiniousSlideHammerOn() +void GPConverter::addContinuousSlideHammerOn() { auto searchEndNote = [] (Note* start) -> Note* { ChordRest* nextCr; @@ -1011,9 +1011,9 @@ void GPConverter::addFermatas() for (const auto& fr : _fermatas) { const auto& measure = fr.first; const auto& gpFermata = fr.second; - Fraction tick = Fraction::fromTicks(Ms::Constant::division * gpFermata.offsetEnum / gpFermata.offsetDenum); + Fraction tick = Fraction::fromTicks(Ms::Constant::division * gpFermata.offsetNum / gpFermata.offsetDenom); // bellow how gtp fermata timeStretch converting to MU timeStretch - float convertingLength = 1.5f - gpFermata.lenght * 0.5f + gpFermata.lenght * gpFermata.lenght * 3; + float convertingLength = 1.5f - gpFermata.length * 0.5f + gpFermata.length * gpFermata.length * 3; Segment* seg = measure->getSegmentR(SegmentType::ChordRest, tick); for (size_t staffIdx = 0; staffIdx < _score->staves().size(); staffIdx++) { @@ -1207,7 +1207,7 @@ Measure* GPConverter::addMeasure(const GPMasterBar* mB) Measure* measure = Factory::createMeasure(_score->dummy()->system()); measure->setTick(tick); GPMasterBar::TimeSig sig = mB->timeSig(); - auto scoreTimeSig = Fraction(sig.enumerator, sig.denumerator); + auto scoreTimeSig = Fraction(sig.numerator, sig.denominator); measure->setTimesig(scoreTimeSig); measure->setTicks(scoreTimeSig); _score->measures()->add(measure); @@ -1217,18 +1217,18 @@ Measure* GPConverter::addMeasure(const GPMasterBar* mB) ChordRest* GPConverter::addChordRest(const GPBeat* beat, const Context& ctx) { - auto rhytm = [](GPRhytm::RhytmType rhytm) { - if (rhytm == GPRhytm::RhytmType::Whole) { + auto rhythm = [](GPRhythm::RhytmType rhythm) { + if (rhythm == GPRhythm::RhytmType::Whole) { return 1; - } else if (rhytm == GPRhytm::RhytmType::Half) { + } else if (rhythm == GPRhythm::RhytmType::Half) { return 2; - } else if (rhytm == GPRhytm::RhytmType::Quarter) { + } else if (rhythm == GPRhythm::RhytmType::Quarter) { return 4; - } else if (rhytm == GPRhytm::RhytmType::Eighth) { + } else if (rhythm == GPRhythm::RhytmType::Eighth) { return 8; - } else if (rhytm == GPRhytm::RhytmType::Sixteenth) { + } else if (rhythm == GPRhythm::RhytmType::Sixteenth) { return 16; - } else if (rhytm == GPRhytm::RhytmType::ThirtySecond) { + } else if (rhythm == GPRhythm::RhytmType::ThirtySecond) { return 32; } else { return 64; @@ -1244,9 +1244,9 @@ ChordRest* GPConverter::addChordRest(const GPBeat* beat, const Context& ctx) cr->setTrack(ctx.curTrack); - Fraction fr(1, rhytm(beat->lenth().second)); + Fraction fr(1, rhythm(beat->lenth().second)); for (int dot = 1; dot <= beat->lenth().first; dot++) { - fr += Fraction(1, rhytm(beat->lenth().second) * 2 * dot); + fr += Fraction(1, rhythm(beat->lenth().second) * 2 * dot); } cr->setDurationType(TDuration(fr)); @@ -1467,7 +1467,7 @@ void GPConverter::addSlide(const GPNote* gpnote, Note* note) } addSingleSlide(gpnote, note); - collectContiniousSlide(gpnote, note); + collectContinuousSlide(gpnote, note); } void GPConverter::addSingleSlide(const GPNote* gpnote, Note* note) @@ -1500,7 +1500,7 @@ void GPConverter::addSingleSlide(const GPNote* gpnote, Note* note) } } -void GPConverter::collectContiniousSlide(const GPNote* gpnote, Note* note) +void GPConverter::collectContinuousSlide(const GPNote* gpnote, Note* note) { if (gpnote->slides()[0]) { _slideHammerOnMap.push_back(std::pair(note, SlideHammerOn::Slide)); @@ -1548,7 +1548,7 @@ void GPConverter::addBend(const GPNote* gpnote, Note* note) } if (gpBend->middleOffset1 == -1 && gpBend->middleOffset2 == -1 && gpBend->middleValue != -1) { - //!@NOTE It seems when middle point is places exatly in the middle + //!@NOTE It seems when middle point is places exactly in the middle //!of bend GP6 stores this value equal -1 if (gpBend->destinationOffset > 50 || gpBend->destinationOffset == -1) { bend->points().push_back(PitchValue(50, gpBend->middleValue)); @@ -2156,8 +2156,8 @@ void GPConverter::addTuplet(const GPBeat* beat, ChordRest* cr) _lastTuplet->setParent(cr->measure()); _lastTuplet->setTrack(cr->track()); _lastTuplet->setBaseLen(cr->actualDurationType()); - _lastTuplet->setRatio(Fraction(beat->tuplet().num, beat->tuplet().denum)); - _lastTuplet->setTicks(cr->actualDurationType().ticks() * beat->tuplet().denum); + _lastTuplet->setRatio(Fraction(beat->tuplet().num, beat->tuplet().denom)); + _lastTuplet->setTicks(cr->actualDurationType().ticks() * beat->tuplet().denom); } setupTupletStyle(_lastTuplet); @@ -2327,15 +2327,15 @@ void GPConverter::addPickStroke(const GPBeat* beat, ChordRest* cr) void GPConverter::addTremolo(const GPBeat* beat, ChordRest* cr) { - if (!cr->isChord() || beat->tremolo().enumerator == -1) { + if (!cr->isChord() || beat->tremolo().numerator == -1) { return; } auto scoreTremolo = [](const GPBeat::Tremolo tr) { - if (tr.denumerator == 2) { + if (tr.denominator == 2) { return TremoloType::R8; } - if (tr.denumerator == 4) { + if (tr.denominator == 4) { return TremoloType::R16; } else { return TremoloType::R32; diff --git a/src/importexport/guitarpro/internal/gtp/gpconverter.h b/src/importexport/guitarpro/internal/gtp/gpconverter.h index 2de5dadb9151b..d65ed5eea1539 100644 --- a/src/importexport/guitarpro/internal/gtp/gpconverter.h +++ b/src/importexport/guitarpro/internal/gtp/gpconverter.h @@ -102,7 +102,7 @@ class GPConverter void addTapping(const GPNote* gpnote, Note* note); void addSlide(const GPNote* gpnote, Note* note); void addSingleSlide(const GPNote* gpnote, Note* note); - void collectContiniousSlide(const GPNote* gpnote, Note* note); + void collectContinuousSlide(const GPNote* gpnote, Note* note); void collectHammerOn(const GPNote* gpnote, Note* note); void addBend(const GPNote* gpnote, Note* note); void addLetRing(const GPNote* gpnote, Note* note); @@ -133,7 +133,7 @@ class GPConverter void addLyrics(const GPBeat* beat, ChordRest* cr, const Context& ctx); void clearDefectedGraceChord(ChordRestContainer& graceGhords); - void addContiniousSlideHammerOn(); + void addContinuousSlideHammerOn(); void addFermatas(); void addTempoMap(); void fillUncompletedMeasure(const Context& ctx); diff --git a/src/importexport/guitarpro/internal/gtp/gpmasterbar.h b/src/importexport/guitarpro/internal/gtp/gpmasterbar.h index 7bfb890d4f607..181ec994d0980 100644 --- a/src/importexport/guitarpro/internal/gtp/gpmasterbar.h +++ b/src/importexport/guitarpro/internal/gtp/gpmasterbar.h @@ -35,8 +35,8 @@ class GPMasterBar }; struct TimeSig { - int enumerator{ 0 }; - int denumerator{ 0 }; + int numerator{ 0 }; + int denominator{ 0 }; }; struct Fermata { @@ -44,9 +44,9 @@ class GPMasterBar Short, Medium, Long }; Type type{ Type::Medium }; - float lenght{ 0 }; - int offsetEnum; //enumerator of offset field in GP - int offsetDenum; //denumerator of offset field in GP + float length{ 0 }; + int offsetNum; //numerator of offset field in GP + int offsetDenom; //denominator of offset field in GP }; struct Direction { QString target; diff --git a/src/importexport/guitarpro/internal/gtp/gprhythm.cpp b/src/importexport/guitarpro/internal/gtp/gprhythm.cpp new file mode 100644 index 0000000000000..4d39d7512eb0d --- /dev/null +++ b/src/importexport/guitarpro/internal/gtp/gprhythm.cpp @@ -0,0 +1,4 @@ +#include "gprhythm.h" + +namespace Ms { +} diff --git a/src/importexport/guitarpro/internal/gtp/gprhytm.h b/src/importexport/guitarpro/internal/gtp/gprhythm.h similarity index 66% rename from src/importexport/guitarpro/internal/gtp/gprhytm.h rename to src/importexport/guitarpro/internal/gtp/gprhythm.h index fe11e38b24683..42080456c8cd7 100644 --- a/src/importexport/guitarpro/internal/gtp/gprhytm.h +++ b/src/importexport/guitarpro/internal/gtp/gprhythm.h @@ -1,8 +1,8 @@ -#ifndef GPRHYTM_H -#define GPRHYTM_H +#ifndef GPRHYTHM_H +#define GPRHYTHM_H namespace Ms { -class GPRhytm +class GPRhythm { public: enum class RhytmType { @@ -10,14 +10,14 @@ class GPRhytm }; struct Tuplet { int num{ -1 }; - int denum{ -1 }; + int denom{ -1 }; }; - void setRhytm(RhytmType t) { _rhytm = t; } + void setRhytm(RhytmType t) { _rhythm = t; } - std::pair length() const { return { _dotCount, _rhytm }; } + std::pair length() const { return { _dotCount, _rhythm }; } - RhytmType type() const { return _rhytm; } + RhytmType type() const { return _rhythm; } void setTuplet(Tuplet t) { _tuplet = t; } Tuplet tuplet() const { return _tuplet; } @@ -26,9 +26,9 @@ class GPRhytm int dotCount() const { return _dotCount; } private: - RhytmType _rhytm{ RhytmType::Whole }; + RhytmType _rhythm{ RhytmType::Whole }; Tuplet _tuplet; int _dotCount{ 0 }; }; } -#endif // GPRHYTM_H +#endif // GPRHYTHM_H diff --git a/src/importexport/guitarpro/internal/gtp/gprhytm.cpp b/src/importexport/guitarpro/internal/gtp/gprhytm.cpp deleted file mode 100644 index e487988018228..0000000000000 --- a/src/importexport/guitarpro/internal/gtp/gprhytm.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "gprhytm.h" - -namespace Ms { -} diff --git a/src/importexport/guitarpro/internal/gtp/gptrack.h b/src/importexport/guitarpro/internal/gtp/gptrack.h index 11f2b64b94686..321bfc01a72a2 100644 --- a/src/importexport/guitarpro/internal/gtp/gptrack.h +++ b/src/importexport/guitarpro/internal/gtp/gptrack.h @@ -85,8 +85,8 @@ class GPTrack void setStaffCount(size_t n) { _staffCount = n; } size_t staffCount() const { return _staffCount; } - void setTransponce(int t) { _transponce = t; } - int transponce() const { return _transponce; } + void setTranspose(int t) { _transpose = t; } + int transpose() const { return _transpose; } void addDiagram(std::pair&& d) { _diagrams.insert(d); } const std::unordered_map& diagram() const { return _diagrams; } @@ -111,7 +111,7 @@ class GPTrack int _idx{ -1 }; size_t _staffCount{ 1 }; std::vector _staffProperty; - int _transponce{ 0 }; + int _transpose{ 0 }; std::unordered_map _diagrams; std::string _lyrics; int _lyricsOffset = { 0 }; diff --git a/src/importexport/guitarpro/internal/importgtp-gp4.cpp b/src/importexport/guitarpro/internal/importgtp-gp4.cpp index f8e6b6822b623..802e0bd55a03d 100644 --- a/src/importexport/guitarpro/internal/importgtp-gp4.cpp +++ b/src/importexport/guitarpro/internal/importgtp-gp4.cpp @@ -376,7 +376,7 @@ bool GuitarPro4::readNote(int string, int staffIdx, Note* note) score->undoAddElement(slur1); } } - if (modMask2 & EFFECT_STACATTO) { // staccato + if (modMask2 & EFFECT_STACCATO) { // staccato Chord* chord = note->chord(); Articulation* a = Factory::createArticulation(chord); a->setSymId(SymId::articStaccatoAbove); diff --git a/src/importexport/guitarpro/internal/importgtp-gp5.cpp b/src/importexport/guitarpro/internal/importgtp-gp5.cpp index 8ac3365a46141..9cd474924a498 100644 --- a/src/importexport/guitarpro/internal/importgtp-gp5.cpp +++ b/src/importexport/guitarpro/internal/importgtp-gp5.cpp @@ -1012,7 +1012,7 @@ bool GuitarPro5::readNoteEffects(Note* note) //note->setSlideNote(gn); } } - if (modMask2 & EFFECT_STACATTO) { + if (modMask2 & EFFECT_STACCATO) { Chord* chord = note->chord(); Articulation* a = Factory::createArticulation(chord); a->setSymId(SymId::articStaccatoAbove); diff --git a/src/importexport/guitarpro/internal/importgtp-gp6.cpp b/src/importexport/guitarpro/internal/importgtp-gp6.cpp index ec51be3aae6d0..215e4e5fd5efb 100644 --- a/src/importexport/guitarpro/internal/importgtp-gp6.cpp +++ b/src/importexport/guitarpro/internal/importgtp-gp6.cpp @@ -141,7 +141,7 @@ const std::map GuitarPro6::instrumentMapping = { { "flt-g", "alto-flute" }, { "flt-whstl", "tin-whistle" }, { "fr-horn", "horn" }, - { "grcss", "bass-drum" }, //grancassa is an alterantive name for bass drum + { "grcss", "bass-drum" }, //grancassa is an alternative name for bass drum { "guiro", "guiro" }, { "harp-gs", "harp" }, { "harp-ss", "harp" }, diff --git a/src/importexport/guitarpro/internal/importgtp.cpp b/src/importexport/guitarpro/internal/importgtp.cpp index 5955a1d7ed545..8041cea303ce9 100644 --- a/src/importexport/guitarpro/internal/importgtp.cpp +++ b/src/importexport/guitarpro/internal/importgtp.cpp @@ -694,7 +694,7 @@ void GuitarPro::readVolta(GPVolta* gpVolta, Measure* m) Ms::Volta* volta = new Ms::Volta(score->dummy()); volta->endings().clear(); QString voltaTextString = ""; - // initialise count to 1 as the first bit processed with represesnt first time volta + // initialise count to 1 as the first bit processed with represent first time volta int count = 0; int binaryNumber = 0; // iterate through the volta information and determine the decimal numbers for voltas @@ -751,7 +751,7 @@ void GuitarPro::readVolta(GPVolta* gpVolta, Measure* m) void GuitarPro::readBend(Note* note) { readUChar(); // icon - /*int amplitude =*/ readInt(); // shown aplitude + /*int amplitude =*/ readInt(); // shown amplitude int numPoints = readInt(); // the number of points in the bend // there are no notes in the bend, exit the function @@ -2069,7 +2069,7 @@ bool GuitarPro1::readNote(int string, Note* note) } if (version >= 400) { - if (modMask2 & EFFECT_STACATTO) { + if (modMask2 & EFFECT_STACCATO) { } if (modMask2 & EFFECT_PALM_MUTE) { //note->setPalmMute(true); diff --git a/src/importexport/guitarpro/internal/importgtp.h b/src/importexport/guitarpro/internal/importgtp.h index aa2ff8241e7ab..a0fd99216021e 100644 --- a/src/importexport/guitarpro/internal/importgtp.h +++ b/src/importexport/guitarpro/internal/importgtp.h @@ -125,7 +125,7 @@ class GuitarPro // note effect bit masks static const uchar EFFECT_BEND = 0x1; - static const uchar EFFECT_STACATTO = 0x1; + static const uchar EFFECT_STACCATO = 0x1; static const uchar EFFECT_HAMMER = 0x2; static const uchar EFFECT_PALM_MUTE = 0x2; static const uchar EFFECT_TREMOLO = 0x4; diff --git a/src/importexport/guitarpro/internal/importptb.cpp b/src/importexport/guitarpro/internal/importptb.cpp index 1a8f80487431e..e74e34a291e1a 100644 --- a/src/importexport/guitarpro/internal/importptb.cpp +++ b/src/importexport/guitarpro/internal/importptb.cpp @@ -155,7 +155,7 @@ void PowerTab::readSongInfo(ptSongInfo& info) info.lyricist = readString(); } - info.arrenger = readString(); + info.arranger = readString(); info.guitarTranscriber = readString(); info.bassTranscriber = readString(); info.copyright = readString(); @@ -327,7 +327,7 @@ void PowerTab::readRhytmSlash(ptSection& sec) rs.is_rest = data & 0x04; - sec.rhytm.emplace_back(rs); + sec.rhythm.emplace_back(rs); } void PowerTab::readGuitarIn(ptTrack& info) @@ -336,7 +336,7 @@ void PowerTab::readGuitarIn(ptTrack& info) gin.section = readShort(); gin.staff = readUChar() + staffInc; gin.position = readUChar(); - gin.rhytmSlash = readUChar(); + gin.rhythmSlash = readUChar(); gin.trackinfo = readUChar(); info.guitar_ins.push_back(gin); } @@ -413,8 +413,8 @@ void PowerTab::readNote(ptBeat* beat) ptNote note; auto position = readUChar(); auto simpleData = readShort(); - auto symboCount = readUChar(); - for (int i = 0; i < symboCount; ++i) { + auto symbolCount = readUChar(); + for (int i = 0; i < symbolCount; ++i) { skip(2); auto data3 = readUChar(); auto data4 = readUChar(); @@ -498,8 +498,8 @@ void PowerTab::readPosition(int staff, int voice, ptSection& sec) beat->duration = durationValue; //beat->duration == 0 ? durationValue : std::min(beat->duration, (int)durationValue); beat->dotted = (data1 & 0x01); beat->doubleDotted = (data1 & 0x02); - beat->arpegioUp = (data1 & 0x20); - beat->arpegioDown = (data1 & 0x40); + beat->arpeggioUp = (data1 & 0x20); + beat->arpeggioDown = (data1 & 0x40); beat->enters = ((beaming - (beaming % 8)) / 8) + 1; beat->times = (beaming % 8) + 1; beat->isRest = (data1 & 0x04); @@ -531,9 +531,9 @@ std::vector PowerTab::getStaffMap(ptSection& sec) } } - if (first.rhytmSlash) { + if (first.rhythmSlash) { for (unsigned int i = 0; i < curTrack->infos.size(); ++i) { - if ((i << 1) & first.rhytmSlash) { + if ((i << 1) & first.rhythmSlash) { slash.push_back(-1 - i); } } @@ -957,7 +957,7 @@ void PowerTab::ptSection::copyTracks(ptTrack* track) continue; } - for (const auto& rt : rhytm) { + for (const auto& rt : rhythm) { auto newSig = chordTextMap.find(rt.position); if (newSig != chordTextMap.end()) { signature = newSig; diff --git a/src/importexport/guitarpro/internal/importptb.h b/src/importexport/guitarpro/internal/importptb.h index 21c1060b4380a..31dbc8a5029c5 100644 --- a/src/importexport/guitarpro/internal/importptb.h +++ b/src/importexport/guitarpro/internal/importptb.h @@ -67,7 +67,7 @@ class PowerTab std::string album; std::string author; std::string lyricist; - std::string arrenger; + std::string arranger; std::string guitarTranscriber; std::string bassTranscriber; std::string lyrics; @@ -107,7 +107,7 @@ class PowerTab }; struct ptGuitarIn final : public ptComponent { - int rhytmSlash{ true }; + int rhythmSlash{ true }; int staff{ 0 }; int trackinfo{ 0 }; int section{ 0 }; @@ -187,8 +187,8 @@ class PowerTab bool doubleDotted{ false }; bool vibrato{ false }; bool grace{ false }; - bool arpegioUp{ false }; - bool arpegioDown{ false }; + bool arpeggioUp{ false }; + bool arpeggioDown{ false }; bool palmMute{ false }; bool accent{ false }; bool staccato{ false }; @@ -283,7 +283,7 @@ class PowerTab int tempo { 0 }; - std::list rhytm; + std::list rhythm; std::map chordTextMap; std::vector beats; diff --git a/src/importexport/guitarpro/tests/data/high-pitch.gp-ref.mscx b/src/importexport/guitarpro/tests/data/high-pitch.gp-ref.mscx index cc1ed6893acdc..c81a89bb044f0 100644 --- a/src/importexport/guitarpro/tests/data/high-pitch.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/high-pitch.gp-ref.mscx @@ -60,7 +60,7 @@ - Boria & Freinds + Boria & Friends Puki Kuki @@ -335,7 +335,7 @@ Puki Kuki - Boria & Freinds + Boria & Friends Puki Kuki diff --git a/src/importexport/guitarpro/tests/data/high-pitch.gp3-ref.mscx b/src/importexport/guitarpro/tests/data/high-pitch.gp3-ref.mscx index f80a274faaf6d..e04678e44161e 100644 --- a/src/importexport/guitarpro/tests/data/high-pitch.gp3-ref.mscx +++ b/src/importexport/guitarpro/tests/data/high-pitch.gp3-ref.mscx @@ -63,7 +63,7 @@ - Boria & Freinds + Boria & Friends Puki Kuki @@ -337,7 +337,7 @@ Puki Kuki - Boria & Freinds + Boria & Friends Puki Kuki diff --git a/src/importexport/guitarpro/tests/data/high-pitch.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/high-pitch.gpx-ref.mscx index 739d839582a0a..e2868c4ca0db9 100644 --- a/src/importexport/guitarpro/tests/data/high-pitch.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/high-pitch.gpx-ref.mscx @@ -120,7 +120,7 @@ - Boria & Freinds + Boria & Friends Puki Kuki @@ -449,7 +449,7 @@ Puki Kuki - Boria & Freinds + Boria & Friends Puki Kuki diff --git a/src/importexport/guitarpro_old/internal/importgtp-gp4.cpp b/src/importexport/guitarpro_old/internal/importgtp-gp4.cpp index 6bb4e82549f9e..423e2f5fc9f2b 100644 --- a/src/importexport/guitarpro_old/internal/importgtp-gp4.cpp +++ b/src/importexport/guitarpro_old/internal/importgtp-gp4.cpp @@ -373,7 +373,7 @@ bool GuitarPro4::readNote(int string, int staffIdx, Note* note) score->undoAddElement(slur1); } } - if (modMask2 & EFFECT_STACATTO) { // staccato + if (modMask2 & EFFECT_STACCATO) { // staccato Chord* chord = note->chord(); Articulation* a = Factory::createArticulation(chord); a->setSymId(SymId::articStaccatoAbove); diff --git a/src/importexport/guitarpro_old/internal/importgtp-gp5.cpp b/src/importexport/guitarpro_old/internal/importgtp-gp5.cpp index 18b1a7721ea3a..bbf0613014fc5 100644 --- a/src/importexport/guitarpro_old/internal/importgtp-gp5.cpp +++ b/src/importexport/guitarpro_old/internal/importgtp-gp5.cpp @@ -1006,7 +1006,7 @@ bool GuitarPro5::readNoteEffects(Note* note) //note->setSlideNote(gn); } } - if (modMask2 & EFFECT_STACATTO) { + if (modMask2 & EFFECT_STACCATO) { Chord* chord = note->chord(); Articulation* a = Factory::createArticulation(chord); a->setSymId(SymId::articStaccatoAbove); diff --git a/src/importexport/guitarpro_old/internal/importgtp-gp6.cpp b/src/importexport/guitarpro_old/internal/importgtp-gp6.cpp index ef942887a32c6..7f07b473c49c4 100644 --- a/src/importexport/guitarpro_old/internal/importgtp-gp6.cpp +++ b/src/importexport/guitarpro_old/internal/importgtp-gp6.cpp @@ -135,7 +135,7 @@ const std::map GuitarPro6::instrumentMapping = { { "flt-g", "alto-flute" }, { "flt-whstl", "tin-whistle" }, { "fr-horn", "horn" }, - { "grcss", "bass-drum" }, //grancassa is an alterantive name for bass drum + { "grcss", "bass-drum" }, //grancassa is an alternative name for bass drum { "guiro", "guiro" }, { "harp-gs", "harp" }, { "harp-ss", "harp" }, @@ -677,7 +677,7 @@ int GuitarPro6::findNumMeasures(GPPartInfo* partInfo) masterBar = masterBar.nextSibling(); } QString b = masterBar.lastChildElement("Bars").toElement().text(); - //work out the number of measures (add 1 as couning from 0, and divide by number of parts) + //work out the number of measures (add 1 as counting from 0, and divide by number of parts) int numMeasures = (b.split(" ").last().toInt() + 1) / score->parts().length(); if (numMeasures > b.size()) { @@ -905,9 +905,9 @@ Fraction GuitarPro6::readBeats(QString beats, GPPartInfo* partInfo, Measure* mea cr->setDurationType(d); if (cr->isChord()) { - auto lyrchord = toChord(cr); - if (lyrchord && lyrchord->notes().size()) { - lyrNote = lyrchord->notes().front(); + auto lyrChord = toChord(cr); + if (lyrChord && lyrChord->notes().size()) { + lyrNote = lyrChord->notes().front(); } } @@ -1352,7 +1352,7 @@ Fraction GuitarPro6::readBeats(QString beats, GPPartInfo* partInfo, Measure* mea } } else if (!argument.compare("Brush")) { Arpeggio* a = Factory::createArpeggio(chord); - // directions in arpeggion type are reversed, they are correct below + // directions in arpeggio type are reversed, they are correct below if (!currentProperty1.firstChild().toElement().text().compare("Up")) { a->setArpeggioType(ArpeggioType::DOWN_STRAIGHT); } else if (!currentProperty1.firstChild().toElement().text().compare("Down")) { @@ -1916,7 +1916,7 @@ void GuitarPro6::readBars(QDomNode* barList, Measure* measure, ClefType oldClefI segment->add(r); measure->setMeasureRepeatCount(2, staffIdx); } else { - qDebug() << "WARNING: unhandle similie mark type: " << currentNode.toElement().text(); + qDebug() << "WARNING: unhandled simile mark type: " << currentNode.toElement().text(); } } // new voice specification diff --git a/src/importexport/guitarpro_old/internal/importgtp-gp7.cpp b/src/importexport/guitarpro_old/internal/importgtp-gp7.cpp index 8d73ebeda51d1..dd31da79b8da5 100644 --- a/src/importexport/guitarpro_old/internal/importgtp-gp7.cpp +++ b/src/importexport/guitarpro_old/internal/importgtp-gp7.cpp @@ -55,7 +55,7 @@ void GuitarPro7::readTracks(QDomNode* track) part->setPartName(currentNode.toElement().text()); } else if (nodeName == "Color") { } - // this is a typo is guitar pro - 'defaut' is correct here + // this is a typo in guitar pro - 'defaut' is correct here else if (nodeName == "SystemsDefautLayout") { } else if (nodeName == "SystemsLayout") { } else if (nodeName == "RSE") { diff --git a/src/importexport/guitarpro_old/internal/importgtp.cpp b/src/importexport/guitarpro_old/internal/importgtp.cpp index b8a9b3dbd9e7b..03d3f8abc8559 100644 --- a/src/importexport/guitarpro_old/internal/importgtp.cpp +++ b/src/importexport/guitarpro_old/internal/importgtp.cpp @@ -693,7 +693,7 @@ void GuitarPro::readVolta(GPVolta* gpVolta, Measure* m) Ms::Volta* volta = new Ms::Volta(score->dummy()); volta->endings().clear(); QString voltaTextString = ""; - // initialise count to 1 as the first bit processed with represesnt first time volta + // initialise count to 1 as the first bit processed with represent first time volta int count = 0; int binaryNumber = 0; // iterate through the volta information and determine the decimal numbers for voltas @@ -750,7 +750,7 @@ void GuitarPro::readVolta(GPVolta* gpVolta, Measure* m) void GuitarPro::readBend(Note* note) { readUChar(); // icon - /*int amplitude =*/ readInt(); // shown aplitude + /*int amplitude =*/ readInt(); // shown amplitude int numPoints = readInt(); // the number of points in the bend // there are no notes in the bend, exit the function @@ -2035,7 +2035,7 @@ bool GuitarPro1::readNote(int string, Note* note) } if (version >= 400) { - if (modMask2 & EFFECT_STACATTO) { + if (modMask2 & EFFECT_STACCATO) { } if (modMask2 & EFFECT_PALM_MUTE) { //note->setPalmMute(true); diff --git a/src/importexport/guitarpro_old/internal/importgtp.h b/src/importexport/guitarpro_old/internal/importgtp.h index bc5cb8cf89aa4..a4336fc6ae490 100644 --- a/src/importexport/guitarpro_old/internal/importgtp.h +++ b/src/importexport/guitarpro_old/internal/importgtp.h @@ -124,7 +124,7 @@ class GuitarPro // note effect bit masks static const uchar EFFECT_BEND = 0x1; - static const uchar EFFECT_STACATTO = 0x1; + static const uchar EFFECT_STACCATO = 0x1; static const uchar EFFECT_HAMMER = 0x2; static const uchar EFFECT_PALM_MUTE = 0x2; static const uchar EFFECT_TREMOLO = 0x4; diff --git a/src/importexport/guitarpro_old/internal/importptb.cpp b/src/importexport/guitarpro_old/internal/importptb.cpp index dcdd2c5791fb8..7d50c0b28f7b2 100644 --- a/src/importexport/guitarpro_old/internal/importptb.cpp +++ b/src/importexport/guitarpro_old/internal/importptb.cpp @@ -154,7 +154,7 @@ void PowerTab::readSongInfo(ptSongInfo& info) info.lyricist = readString(); } - info.arrenger = readString(); + info.arranger = readString(); info.guitarTranscriber = readString(); info.bassTranscriber = readString(); info.copyright = readString(); @@ -326,7 +326,7 @@ void PowerTab::readRhytmSlash(ptSection& sec) rs.is_rest = data & 0x04; - sec.rhytm.emplace_back(rs); + sec.rhythm.emplace_back(rs); } void PowerTab::readGuitarIn(ptTrack& info) @@ -335,7 +335,7 @@ void PowerTab::readGuitarIn(ptTrack& info) gin.section = readShort(); gin.staff = readUChar() + staffInc; gin.position = readUChar(); - gin.rhytmSlash = readUChar(); + gin.rhythmSlash = readUChar(); gin.trackinfo = readUChar(); info.guitar_ins.push_back(gin); } @@ -412,8 +412,8 @@ void PowerTab::readNote(ptBeat* beat) ptNote note; auto position = readUChar(); auto simpleData = readShort(); - auto symboCount = readUChar(); - for (int i = 0; i < symboCount; ++i) { + auto symbolCount = readUChar(); + for (int i = 0; i < symbolCount; ++i) { skip(2); auto data3 = readUChar(); auto data4 = readUChar(); @@ -497,8 +497,8 @@ void PowerTab::readPosition(int staff, int voice, ptSection& sec) beat->duration = durationValue; //beat->duration == 0 ? durationValue : std::min(beat->duration, (int)durationValue); beat->dotted = (data1 & 0x01); beat->doubleDotted = (data1 & 0x02); - beat->arpegioUp = (data1 & 0x20); - beat->arpegioDown = (data1 & 0x40); + beat->arpeggioUp = (data1 & 0x20); + beat->arpeggioDown = (data1 & 0x40); beat->enters = ((beaming - (beaming % 8)) / 8) + 1; beat->times = (beaming % 8) + 1; beat->isRest = (data1 & 0x04); @@ -530,9 +530,9 @@ std::vector PowerTab::getStaffMap(ptSection& sec) } } - if (first.rhytmSlash) { + if (first.rhythmSlash) { for (unsigned int i = 0; i < curTrack->infos.size(); ++i) { - if ((i << 1) & first.rhytmSlash) { + if ((i << 1) & first.rhythmSlash) { slash.push_back(-1 - i); } } @@ -956,7 +956,7 @@ void PowerTab::ptSection::copyTracks(ptTrack* track) continue; } - for (const auto& rt : rhytm) { + for (const auto& rt : rhythm) { auto newSig = chordTextMap.find(rt.position); if (newSig != chordTextMap.end()) { signature = newSig; diff --git a/src/importexport/guitarpro_old/internal/importptb.h b/src/importexport/guitarpro_old/internal/importptb.h index 08784db8fa3f5..f5c0d04cfefa0 100644 --- a/src/importexport/guitarpro_old/internal/importptb.h +++ b/src/importexport/guitarpro_old/internal/importptb.h @@ -67,7 +67,7 @@ class PowerTab std::string album; std::string author; std::string lyricist; - std::string arrenger; + std::string arranger; std::string guitarTranscriber; std::string bassTranscriber; std::string lyrics; @@ -107,7 +107,7 @@ class PowerTab }; struct ptGuitarIn final : public ptComponent { - int rhytmSlash{ true }; + int rhythmSlash{ true }; int staff{ 0 }; int trackinfo{ 0 }; int section{ 0 }; @@ -187,8 +187,8 @@ class PowerTab bool doubleDotted{ false }; bool vibrato{ false }; bool grace{ false }; - bool arpegioUp{ false }; - bool arpegioDown{ false }; + bool arpeggioUp{ false }; + bool arpeggioDown{ false }; bool palmMute{ false }; bool accent{ false }; bool staccato{ false }; @@ -283,7 +283,7 @@ class PowerTab int tempo { 0 }; - std::list rhytm; + std::list rhythm; std::map chordTextMap; std::vector beats; diff --git a/src/importexport/guitarpro_old/tests/data/high-pitch.gp-ref.mscx b/src/importexport/guitarpro_old/tests/data/high-pitch.gp-ref.mscx index cc1ed6893acdc..c81a89bb044f0 100644 --- a/src/importexport/guitarpro_old/tests/data/high-pitch.gp-ref.mscx +++ b/src/importexport/guitarpro_old/tests/data/high-pitch.gp-ref.mscx @@ -60,7 +60,7 @@ - Boria & Freinds + Boria & Friends Puki Kuki @@ -335,7 +335,7 @@ Puki Kuki - Boria & Freinds + Boria & Friends Puki Kuki diff --git a/src/importexport/guitarpro_old/tests/data/high-pitch.gp3-ref.mscx b/src/importexport/guitarpro_old/tests/data/high-pitch.gp3-ref.mscx index f80a274faaf6d..e04678e44161e 100644 --- a/src/importexport/guitarpro_old/tests/data/high-pitch.gp3-ref.mscx +++ b/src/importexport/guitarpro_old/tests/data/high-pitch.gp3-ref.mscx @@ -63,7 +63,7 @@ - Boria & Freinds + Boria & Friends Puki Kuki @@ -337,7 +337,7 @@ Puki Kuki - Boria & Freinds + Boria & Friends Puki Kuki diff --git a/src/importexport/guitarpro_old/tests/data/high-pitch.gpx-ref.mscx b/src/importexport/guitarpro_old/tests/data/high-pitch.gpx-ref.mscx index 739d839582a0a..e2868c4ca0db9 100644 --- a/src/importexport/guitarpro_old/tests/data/high-pitch.gpx-ref.mscx +++ b/src/importexport/guitarpro_old/tests/data/high-pitch.gpx-ref.mscx @@ -120,7 +120,7 @@ - Boria & Freinds + Boria & Friends Puki Kuki @@ -449,7 +449,7 @@ Puki Kuki - Boria & Freinds + Boria & Friends Puki Kuki diff --git a/src/importexport/midi/internal/midiimport/importmidi_lrhand.cpp b/src/importexport/midi/internal/midiimport/importmidi_lrhand.cpp index b121ead49b4d1..e19a59f0d1ca7 100644 --- a/src/importexport/midi/internal/midiimport/importmidi_lrhand.cpp +++ b/src/importexport/midi/internal/midiimport/importmidi_lrhand.cpp @@ -80,7 +80,7 @@ struct SplitTry { struct ChordSplitData { std::multimap::iterator chord; - std::vector possibleSplits; // each index correspoinds to the same note index + std::vector possibleSplits; // each index corresponds to the same note index }; int findLastSplitPoint(const std::vector& splits) @@ -432,7 +432,7 @@ void splitIntoLeftRightHands(std::multimap& tracks) } const auto& opers = midiImportOperations.data()->trackOpers; // iterator 'it' will change after track split to ++it - // C++11 guarantees that newely inserted item with equal key will go after: + // C++11 guarantees that newly inserted item with equal key will go after: // "The relative ordering of elements with equivalent keys is preserved, // and newly inserted elements follow those with equivalent keys // already in the container" diff --git a/src/importexport/midi/internal/midiimport/importmidi_meter.cpp b/src/importexport/midi/internal/midiimport/importmidi_meter.cpp index 38ccdfe800be8..d6aa57a43ca46 100644 --- a/src/importexport/midi/internal/midiimport/importmidi_meter.cpp +++ b/src/importexport/midi/internal/midiimport/importmidi_meter.cpp @@ -519,7 +519,7 @@ toDurationList(const ReducedFraction& startTickInBar, return QList >(); } - const auto divInfo = divisionInfo(barFraction, tupletsInBar); // mectric structure of bar + const auto divInfo = divisionInfo(barFraction, tupletsInBar); // metric structure of bar const auto minDuration = MChord::minAllowedDuration() * 2; // >= minAllowedDuration() after subdivision std::map nodes; // diff --git a/src/importexport/midi/tests/tst_importmidi.cpp b/src/importexport/midi/tests/tst_importmidi.cpp index 3fa6ed3ce893d..5e516b85cb6f6 100644 --- a/src/importexport/midi/tests/tst_importmidi.cpp +++ b/src/importexport/midi/tests/tst_importmidi.cpp @@ -457,8 +457,8 @@ void TestImportMidi::mf(const char* name) const QString TestImportMidi::midiFilePath(const QString& fileName) const { - const QString nameWithExtention = fileName + ".mid"; - return QString(QString(iex_midiimport_tests_DATA_ROOT) + "/" + MIDIIMPORT_DIR + nameWithExtention); + const QString nameWithExtension = fileName + ".mid"; + return QString(QString(iex_midiimport_tests_DATA_ROOT) + "/" + MIDIIMPORT_DIR + nameWithExtension); } QString TestImportMidi::midiFilePath(const char* fileName) const diff --git a/src/importexport/musicxml/internal/musicxml/exportxml.cpp b/src/importexport/musicxml/internal/musicxml/exportxml.cpp index daa63db99dd90..764aa4002ca42 100644 --- a/src/importexport/musicxml/internal/musicxml/exportxml.cpp +++ b/src/importexport/musicxml/internal/musicxml/exportxml.cpp @@ -31,7 +31,7 @@ //========================================================= // LVI FIXME // -// Evaluate paramenter handling between the various classes, could be simplified +// Evaluate parameter handling between the various classes, could be simplified //========================================================= // TODO LVI 2011-10-30: determine how to report export errors. @@ -4010,7 +4010,7 @@ static void directionTag(XmlWriter& xml, Attributes& attr, EngravingItem const* sys->pagePos().x(), sys->pagePos().y() ); - LOGD("directionTag() staf x=%g y=%g w=%g h=%g", + LOGD("directionTag() staff x=%g y=%g w=%g h=%g", bb.x(), bb.y(), bb.width(), bb.height()); // element is above the staff if center of bbox is above center of staff @@ -4033,7 +4033,7 @@ static void directionTag(XmlWriter& xml, Attributes& attr, EngravingItem const* tagname += "\""; } else { /* - LOGD("directionTag() staf ely=%g elh=%g bby=%g bbh=%g", + LOGD("directionTag() staff ely=%g elh=%g bby=%g bbh=%g", el->y(), el->height(), bb.y(), bb.height()); */ @@ -4252,12 +4252,12 @@ static void beatUnit(XmlWriter& xml, const TDuration dur) } //--------------------------------------------------------- -// wordsMetrome +// wordsMetronome //--------------------------------------------------------- -static void wordsMetrome(XmlWriter& xml, Score* s, TextBase const* const text, const int offset) +static void wordsMetronome(XmlWriter& xml, Score* s, TextBase const* const text, const int offset) { - //LOGD("wordsMetrome('%s')", qPrintable(text->xmlText())); + //LOGD("wordsMetronome('%s')", qPrintable(text->xmlText())); const std::list list = text->fragmentList(); std::list wordsLeft; // words left of metronome bool hasParen; // parenthesis @@ -4341,7 +4341,7 @@ void ExportMusicXml::tempoText(TempoText const* const text, staff_idx_t staff) */ _attr.doAttr(_xml, false); _xml.startObject(QString("direction placement=\"%1\"").arg((text->placement() == PlacementV::BELOW) ? "below" : "above")); - wordsMetrome(_xml, _score, text, offset); + wordsMetronome(_xml, _score, text, offset); if (staff) { _xml.tag("staff", static_cast(staff)); @@ -4378,7 +4378,7 @@ void ExportMusicXml::words(TextBase const* const text, staff_idx_t staff) } directionTag(_xml, _attr, text); - wordsMetrome(_xml, _score, text, offset); + wordsMetronome(_xml, _score, text, offset); directionETag(_xml, staff); } @@ -5503,7 +5503,7 @@ static void measureRepeat(XmlWriter& xml, Attributes& attr, const Measure* const // this is done at the first measure of a multimeasure rest // note: for a normal measure, mmRest1 is the measure itself, -// for a multi-meaure rest, it is the replacing measure +// for a multi-measure rest, it is the replacing measure static void measureStyle(XmlWriter& xml, Attributes& attr, const Measure* const m, const int partIndex) { @@ -6163,10 +6163,10 @@ void ExportMusicXml::print(const Measure* const m, const int partNr, const int f // System Layout - // For a multi-meaure rest positioning is valid only + // For a multi-measure rest positioning is valid only // in the replacing measure // note: for a normal measure, mmRest1 is the measure itself, - // for a multi-meaure rest, it is the replacing measure + // for a multi-measure rest, it is the replacing measure const Measure* mmR1 = m->mmRest1(); const System* system = mmR1->system(); diff --git a/src/importexport/musicxml/internal/musicxml/importmxmlpass1.cpp b/src/importexport/musicxml/internal/musicxml/importmxmlpass1.cpp index a71fea1213a31..7450d48ee3a0a 100644 --- a/src/importexport/musicxml/internal/musicxml/importmxmlpass1.cpp +++ b/src/importexport/musicxml/internal/musicxml/importmxmlpass1.cpp @@ -753,7 +753,7 @@ static VBox* addCreditWords(Score* const score, const CreditWordsList& crWords, std::vector words; if (pageNr == 1) { // if there are more credit words in the footer than in header, - // swap heaer and footer, assuming this will result in a vertical + // swap header and footer, assuming this will result in a vertical // frame with the title on top of the page. // Sibelius (direct export) typically exports no header // and puts the title etc. in the footer diff --git a/src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp b/src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp index eb131157a1f75..26739a0cebff3 100644 --- a/src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp +++ b/src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp @@ -420,7 +420,7 @@ static bool hasDrumset(const MusicXMLInstruments& instruments) */ // first determine if the part contains a drumset -// (this is assummed if any instrument has a valid midi-unpitched element, +// (this is assumed if any instrument has a valid midi-unpitched element, // which stored in the MusicXMLInstrument pitch field) // then if the part contains a drumset, Drumset drumset is initialized @@ -4229,15 +4229,15 @@ static void setNoteHead(Note* note, const QColor noteheadColor, const bool noteh } //--------------------------------------------------------- -// addFiguredBassElemens +// addFiguredBassElements //--------------------------------------------------------- /** Add the figured bass elements. */ -static void addFiguredBassElemens(FiguredBassList& fbl, const Fraction noteStartTime, const int msTrack, - const Fraction dura, Measure* measure) +static void addFiguredBassElements(FiguredBassList& fbl, const Fraction noteStartTime, const int msTrack, + const Fraction dura, Measure* measure) { if (!fbl.isEmpty()) { auto sTick = noteStartTime; // starting tick @@ -4804,7 +4804,7 @@ Note* MusicXMLParserPass2::note(const QString& partId, } // add figured bass element - addFiguredBassElemens(fbl, noteStartTime, msTrack, dura, measure); + addFiguredBassElements(fbl, noteStartTime, msTrack, dura, measure); // convert to slash or rhythmic notation if needed // TODO in the case of slash notation, we assume that given notes do in fact correspond to slash beats diff --git a/src/importexport/musicxml/internal/musicxml/importxmlfirstpass.cpp b/src/importexport/musicxml/internal/musicxml/importxmlfirstpass.cpp index 1642ba6ee2245..b268c96fa0326 100644 --- a/src/importexport/musicxml/internal/musicxml/importxmlfirstpass.cpp +++ b/src/importexport/musicxml/internal/musicxml/importxmlfirstpass.cpp @@ -233,7 +233,7 @@ void MusicXmlOctaveShiftList::calcOctaveShiftShifts() void LyricNumberHandler::addNumber(const QString number) { if (_numberToNo.find(number) == _numberToNo.end()) { - _numberToNo[number] = -1; // unassiged + _numberToNo[number] = -1; // unassigned } } diff --git a/src/importexport/musicxml/internal/musicxmlconfiguration.cpp b/src/importexport/musicxml/internal/musicxmlconfiguration.cpp index 111b05fa5edf7..cca06dc32e728 100644 --- a/src/importexport/musicxml/internal/musicxmlconfiguration.cpp +++ b/src/importexport/musicxml/internal/musicxmlconfiguration.cpp @@ -34,7 +34,7 @@ static const Settings::Key MUSICXML_EXPORT_LAYOUT_KEY(module_name, "export/music static const Settings::Key MUSICXML_EXPORT_BREAKS_TYPE_KEY(module_name, "export/musicXML/exportBreaks"); static const Settings::Key MUSICXML_EXPORT_INVISIBLE_ELEMENTS_KEY(module_name, "export/musicXML/exportInvisibleElements"); static const Settings::Key MIGRATION_APPLY_EDWIN_FOR_XML(module_name, "import/compatibility/apply_edwin_for_xml"); -static const Settings::Key MIGRATION_NOT_ASK_AGAING_KEY(module_name, "import/compatibility/do_not_ask_me_again"); +static const Settings::Key MIGRATION_NOT_ASK_AGAIN_KEY(module_name, "import/compatibility/do_not_ask_me_again"); static const Settings::Key STYLE_FILE_IMPORT_PATH_KEY(module_name, "import/style/styleFile"); void MusicXmlConfiguration::init() @@ -44,7 +44,7 @@ void MusicXmlConfiguration::init() settings()->setDefaultValue(MUSICXML_EXPORT_LAYOUT_KEY, Val(true)); settings()->setDefaultValue(MUSICXML_EXPORT_BREAKS_TYPE_KEY, Val(MusicxmlExportBreaksType::All)); settings()->setDefaultValue(MUSICXML_EXPORT_INVISIBLE_ELEMENTS_KEY, Val(false)); - settings()->setDefaultValue(MIGRATION_NOT_ASK_AGAING_KEY, Val(false)); + settings()->setDefaultValue(MIGRATION_NOT_ASK_AGAIN_KEY, Val(false)); } bool MusicXmlConfiguration::musicxmlImportBreaks() const @@ -109,12 +109,12 @@ void MusicXmlConfiguration::setNeedUseDefaultFont(bool value) bool MusicXmlConfiguration::needAskAboutApplyingNewStyle() const { - return !settings()->value(MIGRATION_NOT_ASK_AGAING_KEY).toBool(); + return !settings()->value(MIGRATION_NOT_ASK_AGAIN_KEY).toBool(); } void MusicXmlConfiguration::setNeedAskAboutApplyingNewStyle(bool value) { - settings()->setSharedValue(MIGRATION_NOT_ASK_AGAING_KEY, Val(!value)); + settings()->setSharedValue(MIGRATION_NOT_ASK_AGAIN_KEY, Val(!value)); } mu::io::path MusicXmlConfiguration::styleFileImportPath() const diff --git a/src/importexport/musicxml/internal/musicxmlreader.cpp b/src/importexport/musicxml/internal/musicxmlreader.cpp index db687de2057f0..461ca4ac17a8c 100644 --- a/src/importexport/musicxml/internal/musicxmlreader.cpp +++ b/src/importexport/musicxml/internal/musicxmlreader.cpp @@ -35,10 +35,10 @@ using namespace mu::iex::musicxml; mu::Ret MusicXmlReader::read(Ms::MasterScore* score, const io::path& path, const Options&) { Ms::Score::FileError err = Ms::Score::FileError::FILE_UNKNOWN_TYPE; - std::string syffix = mu::io::suffix(path); - if (syffix == "xml" || syffix == "musicxml") { + std::string suffix = mu::io::suffix(path); + if (suffix == "xml" || suffix == "musicxml") { err = Ms::importMusicXml(score, path.toQString()); - } else if (syffix == "mxl") { + } else if (suffix == "mxl") { err = Ms::importCompressedMusicXml(score, path.toQString()); } return mu::notation::scoreFileErrorToRet(err, path); diff --git a/src/importexport/musicxml/schema/musicxml.xsd b/src/importexport/musicxml/schema/musicxml.xsd index 2f2d116e94095..65bf0763f30cf 100644 --- a/src/importexport/musicxml/schema/musicxml.xsd +++ b/src/importexport/musicxml/schema/musicxml.xsd @@ -2361,7 +2361,7 @@ The staff-spacing attribute specifies spacing between multiple staves in tenths The link-attributes group includes all the simple XLink attributes supported in the MusicXML format. It is also used to connect a MusicXML score with MusicXML parts or a MusicXML opus. - + @@ -4421,7 +4421,7 @@ The optional latency attribute specifies a time in milliseconds that the listeni - The note-size type indicates the percentage of the regular note size to use for notes with a cue and large size as defined in the type element. The grace type is used for notes of cue size that that include a grace element. The cue type is used for all other notes with cue size, whether defined explicitly or implicitly via a cue element. The large type is used for notes of large size. The text content represent the numeric percentage. A value of 100 would be identical to the size of a regular note as defined by the music font. + The note-size type indicates the percentage of the regular note size to use for notes with a cue and large size as defined in the type element. The grace type is used for notes of cue size that include a grace element. The cue type is used for all other notes with cue size, whether defined explicitly or implicitly via a cue element. The large type is used for notes of large size. The text content represent the numeric percentage. A value of 100 would be identical to the size of a regular note as defined by the music font. diff --git a/src/importexport/musicxml/tests/data/testIncorrectStaffNumber2.xml b/src/importexport/musicxml/tests/data/testIncorrectStaffNumber2.xml index 7472c78788823..b9c3d1058fb9e 100644 --- a/src/importexport/musicxml/tests/data/testIncorrectStaffNumber2.xml +++ b/src/importexport/musicxml/tests/data/testIncorrectStaffNumber2.xml @@ -16,7 +16,7 @@ Cubase 9.5.10 exports multi-staff parts without including a staves element and uses voice 1 in both staves. Furthermore, many empty notations elements are present. - MuseScore will still corrctly interpret this as a two staff part. + MuseScore will still correctly interpret this as a two staff part. diff --git a/src/importexport/musicxml/tests/data/testMaxNumberLevel.mscx b/src/importexport/musicxml/tests/data/testMaxNumberLevel.mscx index 8faa3fb43d87c..e6268f398f0cf 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 13c4496d365ac..90a3313034f17 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 544892f1dae3d..baa2747c70459 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 c8e344515e3c0..6f35c03dfeda1 100644 --- a/src/importexport/ove/internal/importove.cpp +++ b/src/importexport/ove/internal/importove.cpp @@ -223,7 +223,7 @@ class OveToMScore 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 26e560cb14256..7ee46fb5982fc 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 044fc18dba7ee..bfc218b902c5a 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 @@ class Track 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 e4b25b8cb0526..27a17fccb4b9b 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 e3f2e2d7b73d4..073f0bbe2782f 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 @@ class HairpinSettingsModel : public TextLineSettingsModel PropertyItem* isNienteCircleVisible() const; PropertyItem* height() const; - PropertyItem* continiousHeight() const; + PropertyItem* continuousHeight() const; private: void createProperties() override; @@ -54,7 +54,7 @@ class HairpinSettingsModel : public TextLineSettingsModel 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 778998b7ecf33..3999811d7fee4 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 08b3ce6fa654c..b7047bd0aa576 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 5501cf4a040e2..7eaff8beff2f0 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 @@ class TextLineSettingsModel : public AbstractInspectorModel 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 @@ class TextLineSettingsModel : public AbstractInspectorModel protected: enum TextType { - BeginingText, - ContiniousText, + BeginningText, + ContinuousText, EndText }; @@ -136,11 +136,11 @@ class TextLineSettingsModel : public AbstractInspectorModel 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 fda9e0cc9f01b..3fbb88f4c5b4f 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 b3c795c329df2..516f34150e1b1 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 b0b508ad1f1a9..4350add80e9a5 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 115ae5a6d9a7c..dac13e2744e81 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 53ab532562cfd..86b9ab49cbabb 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 f3d3f4f68a5d1..fb028bfac9e90 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 32e31e774c081..94825ef9ce028 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 e0cbd1d50154e..5cc3ac592c7f3 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 24bd5bbcc3ea0..397108ea6da7d 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 53c951a9a57b1..35e43c29e8ab0 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 dabe49d0e4dcf..bab307259bfe0 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 9a9995b0cd9c3..aa7efa8245947 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 88c585f583f42..f523e571b6a4f 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 bd65aa4b4b578..d734abb344130 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 0f1518465b606..04f0252f094a7 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 bd1ef113ba918..6d046e78b0613 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 4b32656f55494..d4094448689ae 100644 --- a/src/multiinstances/internal/ipc/ipcchannel.h +++ b/src/multiinstances/internal/ipc/ipcchannel.h @@ -66,7 +66,7 @@ class IpcChannel : public async::Asyncable 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 e30c9c6a23a3c..087f1dd799a3a 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 2935019697328..fb58f16d509db 100644 --- a/src/multiinstances/internal/ipc/ipcsocket.h +++ b/src/multiinstances/internal/ipc/ipcsocket.h @@ -41,7 +41,7 @@ class IpcSocket : public async::Asyncable 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 @@ class IpcSocket : public async::Asyncable 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 8fa0e125449cd..3abe83fcab46d 100644 --- a/src/notation/inotationconfiguration.h +++ b/src/notation/inotationconfiguration.h @@ -76,7 +76,7 @@ class INotationConfiguration : MODULE_EXPORT_INTERFACE 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 @@ class INotationConfiguration : MODULE_EXPORT_INTERFACE 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 @@ class INotationConfiguration : MODULE_EXPORT_INTERFACE 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 98ae95d4655fb..15b3bda3c6957 100644 --- a/src/notation/inotationinteraction.h +++ b/src/notation/inotationinteraction.h @@ -231,7 +231,7 @@ class INotationInteraction 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 884fe9b788010..67bd7bd57f1bc 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 28889ba8f0c6b..5eb83e5a4342d 100644 --- a/src/notation/internal/masternotation.h +++ b/src/notation/internal/masternotation.h @@ -76,7 +76,7 @@ class MasterNotation : public IMasterNotation, public Notation, public std::enab 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 4d1af37ab7480..0d3b34d7f8aac 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 91222a0d31cd0..e10f6f96b6629 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 892f7b93c780a..3064aab93a0d2 100644 --- a/src/notation/internal/notationconfiguration.h +++ b/src/notation/internal/notationconfiguration.h @@ -82,7 +82,7 @@ class NotationConfiguration : public INotationConfiguration, public async::Async 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 @@ class NotationConfiguration : public INotationConfiguration, public async::Async 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 @@ class NotationConfiguration : public INotationConfiguration, public async::Async 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 5b41feefb4f34..2424844d89b41 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 b7defbe63463a..61ec01fda470e 100644 --- a/src/notation/internal/notationinteraction.h +++ b/src/notation/internal/notationinteraction.h @@ -229,7 +229,7 @@ class NotationInteraction : public INotationInteraction, public async::Asyncable 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 a874e572905d2..ed4d3bc3cfbf9 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 d1b9225e476ce..6789fcc56de02 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 a2ab0380066fd..b4683e506c563 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 76ae7522def06..93700c0198203 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 50fef118d5c05..204b2fd33a04e 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 e47c328457779..b21195e3a65e4 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 ec3697fd06449..5e4a47dba2a7a 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 9cc4afca97ace..99b06a9427bb8 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 9bae2ea24f32a..8db69bf98259d 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 d11a34989845b..aae2e513074c4 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 ec814602cdc5d..451669003ba16 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 @@ class Note : public EngravingItem 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 3acbc3dfbb450..2e039cba2619c 100644 --- a/src/plugins/api/qmlpluginapi.h +++ b/src/plugins/api/qmlpluginapi.h @@ -207,8 +207,8 @@ class PluginAPI : public Ms::QmlPlugin * - \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 0f2667eea49b8..8d46a86e48d0a 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 382de2dd2924f..f2135aa1e5644 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 47141183998a8..dbbacf572f36d 100644 --- a/src/plugins/internal/pluginsuiactions.h +++ b/src/plugins/internal/pluginsuiactions.h @@ -35,10 +35,10 @@ class PluginsUiActions : public ui::IUiActionsModule, public async::Asyncable 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 0a77675f6fb11..e30ccd3280821 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 e76b44e73f666..5b55eae0836a5 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 2bef2fc305ee7..cee0f77a63e1e 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 2e36777218a98..2a4ced6b20192 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 a843d02657e3c..7342c1dca154b 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 204dc9c1be602..bb75ad6d2bea4 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 3be2160b4ea19..81b50e620d003 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 9cbb0a7cec10e..85a3e83efcc3f 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 749365259a206..433fa56c85fdd 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 25acc1e7eb5ed..f9d64efb93298 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 06bdc9fe23bdb..1cec8853659ae 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