diff --git a/src/engraving/api/v1/apitypes.h b/src/engraving/api/v1/apitypes.h index 67647ef96213e..9b9e692543a1b 100644 --- a/src/engraving/api/v1/apitypes.h +++ b/src/engraving/api/v1/apitypes.h @@ -313,7 +313,6 @@ enum class ElementType { HARMONIC_MARK = int(mu::engraving::ElementType::HARMONIC_MARK), TEXTLINE = int(mu::engraving::ElementType::TEXTLINE), TEXTLINE_BASE = int(mu::engraving::ElementType::TEXTLINE_BASE), - NOTELINE = int(mu::engraving::ElementType::NOTELINE), LYRICSLINE = int(mu::engraving::ElementType::LYRICSLINE), GLISSANDO = int(mu::engraving::ElementType::GLISSANDO), BRACKET = int(mu::engraving::ElementType::BRACKET), diff --git a/src/engraving/dom/dom.cmake b/src/engraving/dom/dom.cmake index 7f68260490d3b..1e94cfee6dc73 100644 --- a/src/engraving/dom/dom.cmake +++ b/src/engraving/dom/dom.cmake @@ -211,8 +211,6 @@ set(DOM_SRC ${CMAKE_CURRENT_LIST_DIR}/noteentry.cpp ${CMAKE_CURRENT_LIST_DIR}/noteevent.cpp ${CMAKE_CURRENT_LIST_DIR}/noteevent.h - ${CMAKE_CURRENT_LIST_DIR}/noteline.cpp - ${CMAKE_CURRENT_LIST_DIR}/noteline.h ${CMAKE_CURRENT_LIST_DIR}/notifier.h ${CMAKE_CURRENT_LIST_DIR}/ornament.cpp ${CMAKE_CURRENT_LIST_DIR}/ornament.h diff --git a/src/engraving/dom/engravingobject.h b/src/engraving/dom/engravingobject.h index a1d1db01923d0..aa884c11ce49d 100644 --- a/src/engraving/dom/engravingobject.h +++ b/src/engraving/dom/engravingobject.h @@ -116,7 +116,6 @@ class MStyle; class Note; class NoteDot; class NoteHead; -class NoteLine; class Ornament; class Ottava; class OttavaSegment; @@ -389,7 +388,6 @@ class EngravingObject CONVERT(LedgerLine, LEDGER_LINE) CONVERT(ActionIcon, ACTION_ICON) CONVERT(VoltaSegment, VOLTA_SEGMENT) - CONVERT(NoteLine, NOTELINE) CONVERT(Trill, TRILL) CONVERT(TrillSegment, TRILL_SEGMENT) CONVERT(LetRing, LET_RING) @@ -494,7 +492,6 @@ class EngravingObject return isHairpin() || isLetRing() || isGradualTempoChange() - || isNoteLine() || isOttava() || isPalmMute() || isWhammyBar() @@ -768,7 +765,6 @@ CONVERT(OttavaSegment) CONVERT(LedgerLine) CONVERT(ActionIcon) CONVERT(VoltaSegment) -CONVERT(NoteLine) CONVERT(Trill) CONVERT(TrillSegment) CONVERT(LetRing) diff --git a/src/engraving/dom/factory.cpp b/src/engraving/dom/factory.cpp index 3d66f32241ff4..949587701143b 100644 --- a/src/engraving/dom/factory.cpp +++ b/src/engraving/dom/factory.cpp @@ -69,7 +69,6 @@ #include "mmrest.h" #include "mmrestrange.h" #include "note.h" -#include "noteline.h" #include "ornament.h" #include "ottava.h" #include "page.h" @@ -138,7 +137,6 @@ EngravingItem* Factory::doCreateItem(ElementType type, EngravingItem* parent) case ElementType::VOLTA: return new Volta(parent); case ElementType::OTTAVA: return new Ottava(parent); case ElementType::TEXTLINE: return new TextLine(parent); - case ElementType::NOTELINE: return new NoteLine(parent); case ElementType::TRILL: return new Trill(parent); case ElementType::LET_RING: return new LetRing(parent); case ElementType::GRADUAL_TEMPO_CHANGE: return new GradualTempoChange(parent); diff --git a/src/engraving/dom/noteline.cpp b/src/engraving/dom/noteline.cpp deleted file mode 100644 index 553dbd6e3b7af..0000000000000 --- a/src/engraving/dom/noteline.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* - * SPDX-License-Identifier: GPL-3.0-only - * MuseScore-Studio-CLA-applies - * - * MuseScore Studio - * Music Composition & Notation - * - * Copyright (C) 2021 MuseScore Limited - * - * 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. - * - * 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 . - */ - -#include "noteline.h" -#include "textline.h" - -namespace mu::engraving { -NoteLine::NoteLine(EngravingItem* parent) - : TextLineBase(ElementType::NOTELINE, parent) -{ -//TODO-ws init(); -} - -NoteLine::NoteLine(const NoteLine& nl) - : TextLineBase(nl) -{ -} - -//--------------------------------------------------------- -// createLineSegment -//--------------------------------------------------------- - -LineSegment* NoteLine::createLineSegment(System* parent) -{ - TextLineSegment* seg = new TextLineSegment(this, parent); - seg->setTrack(track()); - return seg; -} -} // namespace mu::engraving diff --git a/src/engraving/dom/noteline.h b/src/engraving/dom/noteline.h deleted file mode 100644 index 3aaa1d503d4d7..0000000000000 --- a/src/engraving/dom/noteline.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * SPDX-License-Identifier: GPL-3.0-only - * MuseScore-Studio-CLA-applies - * - * MuseScore Studio - * Music Composition & Notation - * - * Copyright (C) 2021 MuseScore Limited - * - * 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. - * - * 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 . - */ - -#ifndef MU_ENGRAVING_NOTELINE_H -#define MU_ENGRAVING_NOTELINE_H - -#include "textlinebase.h" - -namespace mu::engraving { -class Note; - -//--------------------------------------------------------- -// @@ NoteLine -//--------------------------------------------------------- - -class NoteLine final : public TextLineBase -{ - OBJECT_ALLOCATOR(engraving, NoteLine) - DECLARE_CLASSOF(ElementType::NOTELINE) - -public: - NoteLine(EngravingItem* parent); - NoteLine(const NoteLine&); - ~NoteLine() {} - - NoteLine* clone() const override { return new NoteLine(*this); } - - void setStartNote(Note* n) { m_startNote = n; } - Note* startNote() const { return m_startNote; } - void setEndNote(Note* n) { m_endNote = n; } - Note* endNote() const { return m_endNote; } - LineSegment* createLineSegment(System* parent) override; - -private: - - Note* m_startNote = nullptr; - Note* m_endNote = nullptr; -}; -} // namespace mu::engraving -#endif diff --git a/src/engraving/dom/select.cpp b/src/engraving/dom/select.cpp index 8a6cb56b1dddd..130dcaf47f562 100644 --- a/src/engraving/dom/select.cpp +++ b/src/engraving/dom/select.cpp @@ -162,7 +162,7 @@ bool SelectionFilter::canSelect(const EngravingItem* e) const if (e->isTextBase()) { // only TEXT, INSTRCHANGE and STAFFTEXT are caught here, rest are system thus not in selection return isFiltered(SelectionFilterType::OTHER_TEXT); } - if (e->isSLine()) { // NoteLine, Volta + if (e->isSLine()) { // Volta return isFiltered(SelectionFilterType::OTHER_LINE); } if (e->type() == ElementType::TREMOLO_TWOCHORD) { @@ -1062,7 +1062,6 @@ muse::ByteArray Selection::symbolListMimeData() const case ElementType::PEDAL: case ElementType::TRILL: case ElementType::TEXTLINE: - case ElementType::NOTELINE: case ElementType::SEGMENT: case ElementType::SYSTEM: case ElementType::COMPOUND: diff --git a/src/engraving/rw/read400/tread.cpp b/src/engraving/rw/read400/tread.cpp index 7a9e488318677..f6622e192fb58 100644 --- a/src/engraving/rw/read400/tread.cpp +++ b/src/engraving/rw/read400/tread.cpp @@ -86,7 +86,6 @@ #include "../../dom/bracket.h" #include "../../dom/breath.h" #include "../../dom/note.h" -#include "../../dom/noteline.h" #include "../../dom/spanner.h" #include "../../dom/fingering.h" #include "../../dom/notedot.h" @@ -157,7 +156,7 @@ using ReadTypes = rtti::TypeList(item), xml, ctx); break; - case ElementType::NOTELINE: read(item_cast(item), xml, ctx); - break; case ElementType::PAGE: read(item_cast(item), xml, ctx); break; case ElementType::PALM_MUTE: read(item_cast(item), xml, ctx); diff --git a/src/engraving/rw/write/twrite.cpp b/src/engraving/rw/write/twrite.cpp index 9a3483751b55c..175afd110cea9 100644 --- a/src/engraving/rw/write/twrite.cpp +++ b/src/engraving/rw/write/twrite.cpp @@ -103,7 +103,6 @@ #include "dom/note.h" #include "dom/notedot.h" -#include "dom/noteline.h" #include "dom/ornament.h" #include "dom/ottava.h" @@ -269,8 +268,6 @@ void TWrite::writeItem(const EngravingItem* item, XmlWriter& xml, WriteContext& break; case ElementType::NOTEHEAD: write(item_cast(item), xml, ctx); break; - case ElementType::NOTELINE: write(item_cast(item), xml, ctx); - break; case ElementType::ORNAMENT: write(item_cast(item), xml, ctx); break; case ElementType::OTTAVA: write(item_cast(item), xml, ctx); @@ -2278,16 +2275,6 @@ void TWrite::write(const NoteHead* item, XmlWriter& xml, WriteContext& ctx) write(static_cast(item), xml, ctx); } -void TWrite::write(const NoteLine* item, XmlWriter& xml, WriteContext& ctx) -{ - if (!ctx.canWrite(item)) { - return; - } - xml.startElement(item); - writeProperties(static_cast(item), xml, ctx); - xml.endElement(); -} - void TWrite::write(const Ottava* item, XmlWriter& xml, WriteContext& ctx) { if (!ctx.canWrite(item)) { diff --git a/src/engraving/rw/write/twrite.h b/src/engraving/rw/write/twrite.h index f768dcd7fe5b4..315098390ea4f 100644 --- a/src/engraving/rw/write/twrite.h +++ b/src/engraving/rw/write/twrite.h @@ -108,7 +108,6 @@ class Note; class NoteEvent; class NoteDot; class NoteHead; -class NoteLine; class Ornament; class Ottava; @@ -250,7 +249,6 @@ class TWrite static void write(const NoteEvent* item, XmlWriter& xml, WriteContext& ctx); static void write(const NoteDot* item, XmlWriter& xml, WriteContext& ctx); static void write(const NoteHead* item, XmlWriter& xml, WriteContext& ctx); - static void write(const NoteLine* item, XmlWriter& xml, WriteContext& ctx); static void write(const Ornament* item, XmlWriter& xml, WriteContext& ctx); static void write(const Ottava* item, XmlWriter& xml, WriteContext& ctx); diff --git a/src/engraving/types/types.h b/src/engraving/types/types.h index 55695d42f7ab5..edce79a925cd1 100644 --- a/src/engraving/types/types.h +++ b/src/engraving/types/types.h @@ -174,7 +174,6 @@ enum class ElementType { PICK_SCRAPE, TEXTLINE, TEXTLINE_BASE, - NOTELINE, LYRICSLINE, GLISSANDO, BRACKET, diff --git a/src/engraving/types/typesconv.cpp b/src/engraving/types/typesconv.cpp index 98e61b5b87c56..9e48495ee6397 100644 --- a/src/engraving/types/typesconv.cpp +++ b/src/engraving/types/typesconv.cpp @@ -272,7 +272,6 @@ static const std::vector > ELEMENT_TYPES = { { ElementType::PICK_SCRAPE, "PickScrape", muse::TranslatableString("engraving", "Pick scrape out") }, { ElementType::TEXTLINE, "TextLine", muse::TranslatableString("engraving", "Text line") }, { ElementType::TEXTLINE_BASE, "TextLineBase", muse::TranslatableString("engraving", "Text line base") }, // remove - { ElementType::NOTELINE, "NoteLine", muse::TranslatableString("engraving", "Note line") }, { ElementType::LYRICSLINE, "LyricsLine", muse::TranslatableString("engraving", "Extension line") }, { ElementType::GLISSANDO, "Glissando", muse::TranslatableString("engraving", "Glissando") }, { ElementType::BRACKET, "Bracket", muse::TranslatableString("engraving", "Bracket") }, diff --git a/src/inspector/models/abstractinspectormodel.cpp b/src/inspector/models/abstractinspectormodel.cpp index 4eba5306a59da..467c07f05750b 100644 --- a/src/inspector/models/abstractinspectormodel.cpp +++ b/src/inspector/models/abstractinspectormodel.cpp @@ -37,7 +37,6 @@ static const QMap NOTATION_ELEME { mu::engraving::ElementType::STEM, InspectorModelType::TYPE_NOTE }, { mu::engraving::ElementType::NOTEDOT, InspectorModelType::TYPE_NOTE }, { mu::engraving::ElementType::NOTEHEAD, InspectorModelType::TYPE_NOTE }, - { mu::engraving::ElementType::NOTELINE, InspectorModelType::TYPE_NOTE }, { mu::engraving::ElementType::SHADOW_NOTE, InspectorModelType::TYPE_NOTE }, { mu::engraving::ElementType::HOOK, InspectorModelType::TYPE_NOTE }, { mu::engraving::ElementType::BEAM, InspectorModelType::TYPE_NOTE },