Merge pull request #5877 from igorkorsukov/pvs_fixes_step6
Fixed some issues from PVS-Studio report (step6)
This commit is contained in:
anatoly-os
GitHub
commit
13a302f1af
26 changed files with 318 additions and 260 deletions
|
|
@ -152,12 +152,12 @@ class FiguredBassItem final : public Element {
|
|||
FiguredBassItem::Modifier MusicXML2Modifier(const QString prefix) const;
|
||||
|
||||
// standard re-implemented virtual functions
|
||||
virtual FiguredBassItem* clone() const override { return new FiguredBassItem(*this); }
|
||||
virtual ElementType type() const override { return ElementType::INVALID; }
|
||||
virtual void draw(QPainter* painter) const override;
|
||||
virtual void layout() override;
|
||||
virtual void read(XmlReader&) override;
|
||||
virtual void write(XmlWriter& xml) const override;
|
||||
FiguredBassItem* clone() const override { return new FiguredBassItem(*this); }
|
||||
ElementType type() const override { return ElementType::INVALID; }
|
||||
void draw(QPainter* painter) const override;
|
||||
void layout() override;
|
||||
void read(XmlReader&) override;
|
||||
void write(XmlWriter& xml) const override;
|
||||
|
||||
// read / write MusicXML
|
||||
void writeMusicXML(XmlWriter& xml, bool isOriginalFigure, int crEndTick, int fbEndTick) const;
|
||||
|
|
@ -200,9 +200,9 @@ class FiguredBassItem final : public Element {
|
|||
QString normalizedText() const;
|
||||
QString displayText() const { return _displayText; }
|
||||
|
||||
virtual QVariant getProperty(Pid propertyId) const override;
|
||||
virtual bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
QVariant getProperty(Pid propertyId) const override;
|
||||
bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
};
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -239,7 +239,7 @@ class FiguredBass final : public TextBase {
|
|||
void layoutLines();
|
||||
bool hasParentheses() const; // read / write MusicXML support
|
||||
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
public:
|
||||
FiguredBass(Score* s = 0);
|
||||
|
|
@ -256,16 +256,16 @@ class FiguredBass final : public TextBase {
|
|||
qreal * pSize, qreal * pLineHeight);
|
||||
|
||||
// standard re-implemented virtual functions
|
||||
virtual FiguredBass* clone() const override { return new FiguredBass(*this); }
|
||||
virtual ElementType type() const override { return ElementType::FIGURED_BASS; }
|
||||
virtual void draw(QPainter* painter) const override;
|
||||
virtual void endEdit(EditData&) override;
|
||||
virtual void layout() override;
|
||||
virtual void read(XmlReader&) override;
|
||||
virtual void setSelected(bool f) override;
|
||||
virtual void setVisible(bool f) override;
|
||||
virtual void startEdit(EditData&) override;
|
||||
virtual void write(XmlWriter& xml) const override;
|
||||
FiguredBass* clone() const override { return new FiguredBass(*this); }
|
||||
ElementType type() const override { return ElementType::FIGURED_BASS; }
|
||||
void draw(QPainter* painter) const override;
|
||||
void endEdit(EditData&) override;
|
||||
void layout() override;
|
||||
void read(XmlReader&) override;
|
||||
void setSelected(bool f) override;
|
||||
void setVisible(bool f) override;
|
||||
void startEdit(EditData&) override;
|
||||
void write(XmlWriter& xml) const override;
|
||||
|
||||
// read / write MusicXML
|
||||
void writeMusicXML(XmlWriter& xml, bool isOriginalFigure, int crEndTick, int fbEndTick, bool writeDuration, int divisions) const;
|
||||
|
|
@ -298,9 +298,9 @@ class FiguredBass final : public TextBase {
|
|||
qreal additionalContLineX(qreal pagePosY) const;// returns the X coord (in page coord) of cont. line at pagePosY, if any
|
||||
FiguredBass * nextFiguredBass() const; // returns next *adjacent* f.b. item, if any
|
||||
|
||||
virtual QVariant getProperty(Pid propertyId) const override;
|
||||
virtual bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
QVariant getProperty(Pid propertyId) const override;
|
||||
bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
|
||||
void appendItem(FiguredBassItem* item) { items.push_back(item); }
|
||||
};
|
||||
|
|
|
|||
|
|
@ -31,8 +31,9 @@ class InstrumentName final : public TextBase {
|
|||
|
||||
public:
|
||||
InstrumentName(Score*);
|
||||
virtual InstrumentName* clone() const override { return new InstrumentName(*this); }
|
||||
virtual ElementType type() const override { return ElementType::INSTRUMENT_NAME; }
|
||||
|
||||
InstrumentName* clone() const override { return new InstrumentName(*this); }
|
||||
ElementType type() const override { return ElementType::INSTRUMENT_NAME; }
|
||||
|
||||
int layoutPos() const { return _layoutPos; }
|
||||
void setLayoutPos(int val) { _layoutPos = val; }
|
||||
|
|
@ -42,10 +43,10 @@ class InstrumentName final : public TextBase {
|
|||
void setInstrumentNameType(InstrumentNameType v);
|
||||
void setInstrumentNameType(const QString& s);
|
||||
|
||||
virtual bool isEditable() const override { return false; }
|
||||
virtual QVariant getProperty(Pid propertyId) const override;
|
||||
virtual bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
bool isEditable() const override { return false; }
|
||||
QVariant getProperty(Pid propertyId) const override;
|
||||
bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -34,11 +34,13 @@ class InstrumentChange final : public TextBase {
|
|||
InstrumentChange(const InstrumentChange&);
|
||||
~InstrumentChange();
|
||||
|
||||
virtual InstrumentChange* clone() const override { return new InstrumentChange(*this); }
|
||||
virtual ElementType type() const override { return ElementType::INSTRUMENT_CHANGE; }
|
||||
virtual void write(XmlWriter& xml) const override;
|
||||
virtual void read(XmlReader&) override;
|
||||
virtual void layout() override;
|
||||
InstrumentChange* clone() const override { return new InstrumentChange(*this); }
|
||||
ElementType type() const override { return ElementType::INSTRUMENT_CHANGE; }
|
||||
|
||||
void write(XmlWriter& xml) const override;
|
||||
void read(XmlReader&) override;
|
||||
|
||||
void layout() override;
|
||||
|
||||
Instrument* instrument() const { return _instrument; }
|
||||
void setInstrument(Instrument* i) { _instrument = i; }
|
||||
|
|
@ -54,9 +56,9 @@ class InstrumentChange final : public TextBase {
|
|||
|
||||
Segment* segment() const { return toSegment(parent()); }
|
||||
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
|
||||
virtual bool placeMultiple() const override { return false; }
|
||||
bool placeMultiple() const override { return false; }
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -51,16 +51,16 @@ class Jump final : public TextBase {
|
|||
Type jumpType() const;
|
||||
QString jumpTypeUserName() const;
|
||||
|
||||
virtual Jump* clone() const override { return new Jump(*this); }
|
||||
virtual ElementType type() const override { return ElementType::JUMP; }
|
||||
virtual int subtype() const override { return int(jumpType()); }
|
||||
Jump* clone() const override { return new Jump(*this); }
|
||||
ElementType type() const override { return ElementType::JUMP; }
|
||||
int subtype() const override { return int(jumpType()); }
|
||||
|
||||
Measure* measure() const { return toMeasure(parent()); }
|
||||
|
||||
virtual void read(XmlReader&) override;
|
||||
virtual void write(XmlWriter& xml) const override;
|
||||
void read(XmlReader&) override;
|
||||
void write(XmlWriter& xml) const override;
|
||||
|
||||
virtual void layout() override;
|
||||
void layout() override;
|
||||
|
||||
QString jumpTo() const { return _jumpTo; }
|
||||
QString playUntil() const { return _playUntil; }
|
||||
|
|
@ -74,13 +74,13 @@ class Jump final : public TextBase {
|
|||
bool playRepeats() const { return _playRepeats; }
|
||||
void setPlayRepeats(bool val) { _playRepeats = val; }
|
||||
|
||||
virtual QVariant getProperty(Pid propertyId) const override;
|
||||
virtual bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
QVariant getProperty(Pid propertyId) const override;
|
||||
bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
|
||||
Element* nextSegmentElement() override;
|
||||
Element* prevSegmentElement() override;
|
||||
virtual QString accessibleInfo() const override;
|
||||
QString accessibleInfo() const override;
|
||||
};
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -26,10 +26,13 @@ class LetRing;
|
|||
class LetRingSegment final : public TextLineBaseSegment {
|
||||
public:
|
||||
LetRingSegment(Spanner* sp, Score* s) : TextLineBaseSegment(sp, s, ElementFlag::MOVABLE | ElementFlag::ON_STAFF) { }
|
||||
virtual ElementType type() const override { return ElementType::LET_RING_SEGMENT; }
|
||||
virtual LetRingSegment* clone() const override { return new LetRingSegment(*this); }
|
||||
LetRing* letRing() const { return (LetRing*)spanner(); }
|
||||
virtual void layout() override;
|
||||
|
||||
ElementType type() const override { return ElementType::LET_RING_SEGMENT; }
|
||||
LetRingSegment* clone() const override { return new LetRingSegment(*this); }
|
||||
|
||||
LetRing* letRing() const { return (LetRing*)spanner(); }
|
||||
|
||||
void layout() override;
|
||||
|
||||
friend class LetRing;
|
||||
};
|
||||
|
|
@ -44,13 +47,16 @@ class LetRing final : public TextLineBase {
|
|||
|
||||
public:
|
||||
LetRing(Score* s);
|
||||
virtual LetRing* clone() const override { return new LetRing(*this); }
|
||||
virtual ElementType type() const override { return ElementType::LET_RING; }
|
||||
virtual void read(XmlReader&) override;
|
||||
|
||||
LetRing* clone() const override { return new LetRing(*this); }
|
||||
ElementType type() const override { return ElementType::LET_RING; }
|
||||
|
||||
void read(XmlReader&) override;
|
||||
// virtual void write(XmlWriter& xml) const override;
|
||||
LineSegment* createLineSegment();
|
||||
virtual QVariant propertyDefault(Pid propertyId) const override;
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
LineSegment* createLineSegment() override;
|
||||
|
||||
QVariant propertyDefault(Pid propertyId) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
};
|
||||
|
||||
} // namespace Ms
|
||||
|
|
|
|||
|
|
@ -26,11 +26,12 @@ class MeasureNumber final : public TextBase {
|
|||
public:
|
||||
MeasureNumber(Score* s = 0);
|
||||
|
||||
virtual ElementType type() const override { return ElementType::MEASURE_NUMBER; }
|
||||
virtual MeasureNumber* clone() const override { return new MeasureNumber(*this); }
|
||||
virtual QVariant propertyDefault(Pid id) const override;
|
||||
ElementType type() const override { return ElementType::MEASURE_NUMBER; }
|
||||
MeasureNumber* clone() const override { return new MeasureNumber(*this); }
|
||||
|
||||
virtual void layout() override;
|
||||
QVariant propertyDefault(Pid id) const override;
|
||||
|
||||
void layout() override;
|
||||
Measure* measure() const { return toMeasure(parent()); }
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -32,14 +32,14 @@ class NoteLine final : public TextLineBase {
|
|||
NoteLine(const NoteLine&);
|
||||
~NoteLine() {}
|
||||
|
||||
virtual NoteLine* clone() const { return new NoteLine(*this); }
|
||||
virtual ElementType type() const { return ElementType::NOTELINE; }
|
||||
NoteLine* clone() const override { return new NoteLine(*this); }
|
||||
ElementType type() const override { return ElementType::NOTELINE; }
|
||||
|
||||
void setStartNote(Note* n) { _startNote = n; }
|
||||
Note* startNote() const { return _startNote; }
|
||||
void setEndNote(Note* n) { _endNote = n; }
|
||||
Note* endNote() const { return _endNote; }
|
||||
virtual LineSegment* createLineSegment() override;
|
||||
LineSegment* createLineSegment() override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,9 @@ class Ossia final : public Element {
|
|||
public:
|
||||
Ossia(Score*);
|
||||
Ossia(const Ossia&);
|
||||
virtual Ossia* clone() const override { return new Ossia(*this); }
|
||||
virtual ElementType type() const override { return ElementType::OSSIA; }
|
||||
|
||||
Ossia* clone() const override { return new Ossia(*this); }
|
||||
ElementType type() const override { return ElementType::OSSIA; }
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -69,16 +69,17 @@ class Ottava;
|
|||
//---------------------------------------------------------
|
||||
|
||||
class OttavaSegment final : public TextLineBaseSegment {
|
||||
virtual void undoChangeProperty(Pid id, const QVariant&, PropertyFlags ps) override;
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
void undoChangeProperty(Pid id, const QVariant&, PropertyFlags ps) override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
public:
|
||||
OttavaSegment(Spanner* sp, Score* s) : TextLineBaseSegment(sp, s, ElementFlag::MOVABLE | ElementFlag::ON_STAFF) { }
|
||||
virtual ElementType type() const override { return ElementType::OTTAVA_SEGMENT; }
|
||||
virtual OttavaSegment* clone() const override { return new OttavaSegment(*this); }
|
||||
Ottava* ottava() const { return (Ottava*)spanner(); }
|
||||
virtual void layout() override;
|
||||
virtual Element* propertyDelegate(Pid) override;
|
||||
|
||||
ElementType type() const override { return ElementType::OTTAVA_SEGMENT; }
|
||||
OttavaSegment* clone() const override { return new OttavaSegment(*this); }
|
||||
Ottava* ottava() const { return (Ottava*)spanner(); }
|
||||
void layout() override;
|
||||
Element* propertyDelegate(Pid) override;
|
||||
};
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -91,8 +92,8 @@ class Ottava final : public TextLineBase {
|
|||
bool _numbersOnly;
|
||||
|
||||
void updateStyledProperties();
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
virtual void undoChangeProperty(Pid id, const QVariant&, PropertyFlags ps) override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
void undoChangeProperty(Pid id, const QVariant&, PropertyFlags ps) override;
|
||||
|
||||
protected:
|
||||
friend class OttavaSegment;
|
||||
|
|
@ -100,8 +101,9 @@ class Ottava final : public TextLineBase {
|
|||
public:
|
||||
Ottava(Score* s);
|
||||
Ottava(const Ottava&);
|
||||
virtual Ottava* clone() const override { return new Ottava(*this); }
|
||||
virtual ElementType type() const override { return ElementType::OTTAVA; }
|
||||
|
||||
Ottava* clone() const override { return new Ottava(*this); }
|
||||
ElementType type() const override { return ElementType::OTTAVA; }
|
||||
|
||||
void setOttavaType(OttavaType val);
|
||||
OttavaType ottavaType() const { return _ottavaType; }
|
||||
|
|
@ -111,19 +113,19 @@ class Ottava final : public TextLineBase {
|
|||
|
||||
void setPlacement(Placement);
|
||||
|
||||
virtual LineSegment* createLineSegment() override;
|
||||
LineSegment* createLineSegment() override;
|
||||
int pitchShift() const;
|
||||
|
||||
virtual void write(XmlWriter& xml) const override;
|
||||
virtual void read(XmlReader& de) override;
|
||||
bool readProperties(XmlReader& e);
|
||||
void write(XmlWriter& xml) const override;
|
||||
void read(XmlReader& de) override;
|
||||
bool readProperties(XmlReader& e) override;
|
||||
|
||||
virtual QVariant getProperty(Pid propertyId) const override;
|
||||
virtual bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
virtual Pid propertyId(const QStringRef& xmlName) const override;
|
||||
QVariant getProperty(Pid propertyId) const override;
|
||||
bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
Pid propertyId(const QStringRef& xmlName) const override;
|
||||
|
||||
virtual QString accessibleInfo() const override;
|
||||
QString accessibleInfo() const override;
|
||||
static const char* ottavaTypeName(OttavaType type);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -25,14 +25,17 @@ class PalmMute;
|
|||
|
||||
class PalmMuteSegment final : public TextLineBaseSegment {
|
||||
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
public:
|
||||
PalmMuteSegment(Spanner* sp, Score* s) : TextLineBaseSegment(sp, s, ElementFlag::MOVABLE | ElementFlag::ON_STAFF) { }
|
||||
virtual ElementType type() const override { return ElementType::PALM_MUTE_SEGMENT; }
|
||||
virtual PalmMuteSegment* clone() const override { return new PalmMuteSegment(*this); }
|
||||
PalmMute* palmMute() const { return (PalmMute*)spanner(); }
|
||||
virtual void layout() override;
|
||||
|
||||
ElementType type() const override { return ElementType::PALM_MUTE_SEGMENT; }
|
||||
PalmMuteSegment* clone() const override { return new PalmMuteSegment(*this); }
|
||||
|
||||
PalmMute* palmMute() const { return (PalmMute*)spanner(); }
|
||||
|
||||
void layout() override;
|
||||
|
||||
friend class PalmMute;
|
||||
};
|
||||
|
|
@ -43,19 +46,22 @@ class PalmMuteSegment final : public TextLineBaseSegment {
|
|||
|
||||
class PalmMute final : public TextLineBase {
|
||||
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
protected:
|
||||
QPointF linePos(Grip, System**) const override;
|
||||
|
||||
public:
|
||||
PalmMute(Score* s);
|
||||
virtual PalmMute* clone() const override { return new PalmMute(*this); }
|
||||
virtual ElementType type() const override { return ElementType::PALM_MUTE; }
|
||||
virtual void read(XmlReader&) override;
|
||||
|
||||
PalmMute* clone() const override { return new PalmMute(*this); }
|
||||
ElementType type() const override { return ElementType::PALM_MUTE; }
|
||||
|
||||
void read(XmlReader&) override;
|
||||
// virtual void write(XmlWriter& xml) const override;
|
||||
LineSegment* createLineSegment();
|
||||
virtual QVariant propertyDefault(Pid propertyId) const override;
|
||||
|
||||
LineSegment* createLineSegment() override;
|
||||
QVariant propertyDefault(Pid propertyId) const override;
|
||||
|
||||
friend class PalmMuteLine;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -67,7 +67,8 @@ class Part final : public ScoreElement {
|
|||
public:
|
||||
Part(Score* = 0);
|
||||
void initFromInstrTemplate(const InstrumentTemplate*);
|
||||
virtual ElementType type() const override { return ElementType::PART; }
|
||||
|
||||
ElementType type() const override { return ElementType::PART; }
|
||||
|
||||
void read(XmlReader&);
|
||||
bool readProperties(XmlReader&);
|
||||
|
|
|
|||
|
|
@ -25,14 +25,15 @@ class Pedal;
|
|||
|
||||
class PedalSegment final : public TextLineBaseSegment {
|
||||
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
public:
|
||||
PedalSegment(Spanner* sp, Score* s) : TextLineBaseSegment(sp, s, ElementFlag::MOVABLE | ElementFlag::ON_STAFF) {}
|
||||
virtual ElementType type() const override { return ElementType::PEDAL_SEGMENT; }
|
||||
virtual PedalSegment* clone() const override { return new PedalSegment(*this); }
|
||||
Pedal* pedal() const { return toPedal(spanner()); }
|
||||
virtual void layout() override;
|
||||
|
||||
ElementType type() const override { return ElementType::PEDAL_SEGMENT; }
|
||||
PedalSegment* clone() const override { return new PedalSegment(*this); }
|
||||
Pedal* pedal() const { return toPedal(spanner()); }
|
||||
void layout() override;
|
||||
|
||||
friend class Pedal;
|
||||
};
|
||||
|
|
@ -43,19 +44,22 @@ class PedalSegment final : public TextLineBaseSegment {
|
|||
|
||||
class Pedal final : public TextLineBase {
|
||||
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
protected:
|
||||
QPointF linePos(Grip, System**) const override;
|
||||
|
||||
public:
|
||||
Pedal(Score* s);
|
||||
virtual Pedal* clone() const override { return new Pedal(*this); }
|
||||
virtual ElementType type() const override { return ElementType::PEDAL; }
|
||||
virtual void read(XmlReader&) override;
|
||||
virtual void write(XmlWriter& xml) const override;
|
||||
LineSegment* createLineSegment();
|
||||
virtual QVariant propertyDefault(Pid propertyId) const override;
|
||||
|
||||
Pedal* clone() const override { return new Pedal(*this); }
|
||||
ElementType type() const override { return ElementType::PEDAL; }
|
||||
|
||||
void read(XmlReader&) override;
|
||||
void write(XmlWriter& xml) const override;
|
||||
|
||||
LineSegment* createLineSegment() override;
|
||||
QVariant propertyDefault(Pid propertyId) const override;
|
||||
|
||||
friend class PedalLine;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -22,15 +22,16 @@ namespace Ms {
|
|||
//---------------------------------------------------------
|
||||
|
||||
class RehearsalMark final : public TextBase {
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
public:
|
||||
RehearsalMark(Score* score);
|
||||
virtual RehearsalMark* clone() const override { return new RehearsalMark(*this); }
|
||||
virtual ElementType type() const override { return ElementType::REHEARSAL_MARK; }
|
||||
Segment* segment() const { return (Segment*)parent(); }
|
||||
virtual void layout() override;
|
||||
virtual QVariant propertyDefault(Pid id) const override;
|
||||
|
||||
RehearsalMark* clone() const override { return new RehearsalMark(*this); }
|
||||
ElementType type() const override { return ElementType::REHEARSAL_MARK; }
|
||||
Segment* segment() const { return (Segment*)parent(); }
|
||||
void layout() override;
|
||||
QVariant propertyDefault(Pid id) const override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -36,12 +36,15 @@ class ShadowNote final : public Element {
|
|||
|
||||
public:
|
||||
ShadowNote(Score*);
|
||||
virtual ShadowNote* clone() const { return new ShadowNote(*this); }
|
||||
virtual ElementType type() const { return ElementType::SHADOW_NOTE; }
|
||||
virtual void layout();
|
||||
|
||||
ShadowNote* clone() const override { return new ShadowNote(*this); }
|
||||
ElementType type() const override { return ElementType::SHADOW_NOTE; }
|
||||
|
||||
void layout() override;
|
||||
int line() const { return _line; }
|
||||
void setLine(int n) { _line = n; }
|
||||
virtual void draw(QPainter*) const;
|
||||
|
||||
void draw(QPainter*) const override;
|
||||
|
||||
void setState(SymId noteSymbol, int voice, TDuration duration, bool rest = false);
|
||||
|
||||
|
|
|
|||
|
|
@ -41,18 +41,23 @@ class Spacer final : public Element {
|
|||
public:
|
||||
Spacer(Score*);
|
||||
Spacer(const Spacer&);
|
||||
virtual Spacer* clone() const { return new Spacer(*this); }
|
||||
virtual ElementType type() const { return ElementType::SPACER; }
|
||||
|
||||
Spacer* clone() const override { return new Spacer(*this); }
|
||||
ElementType type() const override { return ElementType::SPACER; }
|
||||
|
||||
SpacerType spacerType() const { return _spacerType; }
|
||||
void setSpacerType(SpacerType t) { _spacerType = t; }
|
||||
|
||||
virtual void write(XmlWriter&) const;
|
||||
virtual void read(XmlReader&);
|
||||
virtual void draw(QPainter*) const;
|
||||
virtual bool isEditable() const { return true; }
|
||||
virtual void startEditDrag(EditData&) override;
|
||||
virtual void editDrag(EditData&) override;
|
||||
virtual void spatiumChanged(qreal, qreal);
|
||||
void write(XmlWriter&) const override;
|
||||
void read(XmlReader&) override;
|
||||
|
||||
void draw(QPainter*) const override;
|
||||
|
||||
bool isEditable() const override { return true; }
|
||||
void startEditDrag(EditData&) override;
|
||||
void editDrag(EditData&) override;
|
||||
void spatiumChanged(qreal, qreal) override;
|
||||
|
||||
void setGap(qreal sp);
|
||||
qreal gap() const { return _gap; }
|
||||
|
||||
|
|
@ -62,9 +67,9 @@ class Spacer final : public Element {
|
|||
Grip defaultGrip() const override { return Grip::START; }
|
||||
std::vector<QPointF> gripsPositions(const EditData&) const override;
|
||||
|
||||
QVariant getProperty(Pid propertyId) const;
|
||||
bool setProperty(Pid propertyId, const QVariant&);
|
||||
QVariant propertyDefault(Pid id) const;
|
||||
QVariant getProperty(Pid propertyId) const override;
|
||||
bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid id) const override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ class Staff final : public ScoreElement {
|
|||
void initFromStaffType(const StaffType* staffType);
|
||||
void init(const Staff*);
|
||||
|
||||
virtual ElementType type() const override { return ElementType::STAFF; }
|
||||
ElementType type() const override { return ElementType::STAFF; }
|
||||
|
||||
bool isTop() const;
|
||||
QString partName() const;
|
||||
|
|
@ -245,9 +245,9 @@ class Staff final : public ScoreElement {
|
|||
void undoSetColor(const QColor& val);
|
||||
void insertTime(const Fraction&, const Fraction& len);
|
||||
|
||||
virtual QVariant getProperty(Pid) const override;
|
||||
virtual bool setProperty(Pid, const QVariant&) override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
QVariant getProperty(Pid) const override;
|
||||
bool setProperty(Pid, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
|
||||
BracketType innerBracket() const;
|
||||
|
||||
|
|
|
|||
|
|
@ -36,26 +36,28 @@ class StaffState final : public Element {
|
|||
|
||||
Instrument* _instrument { nullptr };
|
||||
|
||||
virtual void draw(QPainter*) const;
|
||||
virtual void layout();
|
||||
void draw(QPainter*) const override;
|
||||
void layout() override;
|
||||
|
||||
public:
|
||||
StaffState(Score*);
|
||||
StaffState(const StaffState&);
|
||||
~StaffState();
|
||||
|
||||
virtual StaffState* clone() const { return new StaffState(*this); }
|
||||
virtual ElementType type() const { return ElementType::STAFF_STATE; }
|
||||
StaffState* clone() const override { return new StaffState(*this); }
|
||||
ElementType type() const override { return ElementType::STAFF_STATE; }
|
||||
|
||||
void setStaffStateType(const QString&);
|
||||
void setStaffStateType(StaffStateType st) { _staffStateType = st; }
|
||||
StaffStateType staffStateType() const { return _staffStateType; }
|
||||
QString staffStateTypeName() const;
|
||||
|
||||
virtual bool acceptDrop(EditData&) const override;
|
||||
virtual Element* drop(EditData&);
|
||||
virtual void write(XmlWriter&) const;
|
||||
virtual void read(XmlReader&);
|
||||
bool acceptDrop(EditData&) const override;
|
||||
Element* drop(EditData&) override;
|
||||
|
||||
void write(XmlWriter&) const override;
|
||||
void read(XmlReader&) override;
|
||||
|
||||
Instrument* instrument() const { return _instrument; }
|
||||
void setInstrument(const Instrument* i) { *_instrument = *i; }
|
||||
void setInstrument(const Instrument&& i) { *_instrument = i; }
|
||||
|
|
|
|||
|
|
@ -27,28 +27,28 @@ class StaffTypeChange final : public Element {
|
|||
StaffType* _staffType { 0 };
|
||||
qreal lw;
|
||||
|
||||
virtual void layout() override;
|
||||
virtual void spatiumChanged(qreal oldValue, qreal newValue) override;
|
||||
virtual void draw(QPainter*) const override;
|
||||
void layout() override;
|
||||
void spatiumChanged(qreal oldValue, qreal newValue) override;
|
||||
void draw(QPainter*) const override;
|
||||
|
||||
public:
|
||||
StaffTypeChange(Score* = 0);
|
||||
StaffTypeChange(const StaffTypeChange&);
|
||||
virtual StaffTypeChange* clone() const override { return new StaffTypeChange(*this); }
|
||||
|
||||
virtual ElementType type() const override { return ElementType::STAFFTYPE_CHANGE; }
|
||||
StaffTypeChange* clone() const override { return new StaffTypeChange(*this); }
|
||||
ElementType type() const override { return ElementType::STAFFTYPE_CHANGE; }
|
||||
|
||||
virtual void write(XmlWriter&) const override;
|
||||
virtual void read(XmlReader&) override;
|
||||
void write(XmlWriter&) const override;
|
||||
void read(XmlReader&) override;
|
||||
|
||||
const StaffType* staffType() const { return _staffType; }
|
||||
void setStaffType(StaffType* st) { _staffType = st; }
|
||||
|
||||
Measure* measure() const { return toMeasure(parent()); }
|
||||
Measure* measure() const { return toMeasure(parent()); }
|
||||
|
||||
virtual QVariant getProperty(Pid propertyId) const override;
|
||||
virtual bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
QVariant getProperty(Pid propertyId) const override;
|
||||
bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -30,19 +30,21 @@ namespace Ms {
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
class Sticking final : public TextBase {
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
virtual QVariant propertyDefault(Pid id) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
QVariant propertyDefault(Pid id) const override;
|
||||
|
||||
public:
|
||||
Sticking(Score*);
|
||||
virtual Sticking* clone() const override { return new Sticking(*this); }
|
||||
virtual ElementType type() const override { return ElementType::STICKING; }
|
||||
Segment* segment() const { return (Segment*)parent(); }
|
||||
Measure* measure() const { return (Measure*)parent()->parent(); }
|
||||
|
||||
virtual void layout() override;
|
||||
virtual void write(XmlWriter& xml) const override;
|
||||
virtual void read(XmlReader&) override;
|
||||
Sticking* clone() const override { return new Sticking(*this); }
|
||||
ElementType type() const override { return ElementType::STICKING; }
|
||||
|
||||
Segment* segment() const { return (Segment*)parent(); }
|
||||
Measure* measure() const { return (Measure*)parent()->parent(); }
|
||||
|
||||
void layout() override;
|
||||
void write(XmlWriter& xml) const override;
|
||||
void read(XmlReader&) override;
|
||||
};
|
||||
|
||||
} // namespace Ms
|
||||
|
|
|
|||
|
|
@ -33,19 +33,21 @@ class SystemDivider final : public Symbol {
|
|||
SystemDivider(Score* s = 0);
|
||||
SystemDivider(const SystemDivider&);
|
||||
|
||||
virtual SystemDivider* clone() const override { return new SystemDivider(*this); }
|
||||
virtual ElementType type() const override { return ElementType::SYSTEM_DIVIDER; }
|
||||
SystemDivider* clone() const override { return new SystemDivider(*this); }
|
||||
ElementType type() const override { return ElementType::SYSTEM_DIVIDER; }
|
||||
|
||||
Type dividerType() const { return _dividerType; }
|
||||
Type dividerType() const { return _dividerType; }
|
||||
void setDividerType(Type v);
|
||||
|
||||
virtual QRectF drag(EditData&) override;
|
||||
virtual void write(XmlWriter&) const override;
|
||||
virtual void read(XmlReader&) override;
|
||||
virtual void layout() override;
|
||||
QRectF drag(EditData&) override;
|
||||
|
||||
virtual Segment* segment() const override { return 0; }
|
||||
System* system() const { return (System*)parent(); }
|
||||
void write(XmlWriter&) const override;
|
||||
void read(XmlReader&) override;
|
||||
|
||||
void layout() override;
|
||||
|
||||
Segment* segment() const override { return nullptr; }
|
||||
System* system() const { return (System*)parent(); }
|
||||
};
|
||||
|
||||
} // namespace Ms
|
||||
|
|
|
|||
|
|
@ -22,16 +22,16 @@ namespace Ms {
|
|||
//---------------------------------------------------------
|
||||
|
||||
class SystemText final : public StaffTextBase {
|
||||
virtual void layout() override;
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
virtual QVariant propertyDefault(Pid id) const override;
|
||||
void layout() override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
QVariant propertyDefault(Pid id) const override;
|
||||
|
||||
public:
|
||||
SystemText(Score* = 0, Tid = Tid::SYSTEM);
|
||||
|
||||
virtual SystemText* clone() const override { return new SystemText(*this); }
|
||||
virtual ElementType type() const override { return ElementType::SYSTEM_TEXT; }
|
||||
Segment* segment() const { return (Segment*)parent(); }
|
||||
SystemText* clone() const override { return new SystemText(*this); }
|
||||
ElementType type() const override { return ElementType::SYSTEM_TEXT; }
|
||||
Segment* segment() const { return (Segment*)parent(); }
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -25,14 +25,16 @@ class Note;
|
|||
|
||||
class TextLineSegment final : public TextLineBaseSegment {
|
||||
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
public:
|
||||
TextLineSegment(Spanner* sp, Score* s);
|
||||
virtual ElementType type() const override { return ElementType::TEXTLINE_SEGMENT; }
|
||||
virtual TextLineSegment* clone() const override { return new TextLineSegment(*this); }
|
||||
TextLine* textLine() const { return toTextLine(spanner()); }
|
||||
virtual void layout() override;
|
||||
|
||||
ElementType type() const override { return ElementType::TEXTLINE_SEGMENT; }
|
||||
TextLineSegment* clone() const override { return new TextLineSegment(*this); }
|
||||
|
||||
TextLine* textLine() const { return toTextLine(spanner()); }
|
||||
void layout() override;
|
||||
};
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -41,18 +43,20 @@ class TextLineSegment final : public TextLineBaseSegment {
|
|||
|
||||
class TextLine final : public TextLineBase {
|
||||
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
public:
|
||||
TextLine(Score* s);
|
||||
TextLine(const TextLine&);
|
||||
~TextLine() {}
|
||||
|
||||
virtual TextLine* clone() const { return new TextLine(*this); }
|
||||
virtual ElementType type() const { return ElementType::TEXTLINE; }
|
||||
virtual void write(XmlWriter&) const override;
|
||||
virtual LineSegment* createLineSegment() override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
TextLine* clone() const override { return new TextLine(*this); }
|
||||
ElementType type() const override { return ElementType::TEXTLINE; }
|
||||
|
||||
void write(XmlWriter&) const override;
|
||||
|
||||
LineSegment* createLineSegment() override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -37,20 +37,23 @@ class TremoloBar final : public Element {
|
|||
|
||||
public:
|
||||
TremoloBar(Score* s);
|
||||
virtual TremoloBar* clone() const override { return new TremoloBar(*this); }
|
||||
virtual ElementType type() const override { return ElementType::TREMOLOBAR; }
|
||||
virtual void layout() override;
|
||||
virtual void draw(QPainter*) const override;
|
||||
virtual void write(XmlWriter&) const override;
|
||||
virtual void read(XmlReader& e) override;
|
||||
|
||||
TremoloBar* clone() const override { return new TremoloBar(*this); }
|
||||
ElementType type() const override { return ElementType::TREMOLOBAR; }
|
||||
|
||||
void layout() override;
|
||||
void draw(QPainter*) const override;
|
||||
|
||||
void write(XmlWriter&) const override;
|
||||
void read(XmlReader& e) override;
|
||||
|
||||
QList<PitchValue>& points() { return _points; }
|
||||
const QList<PitchValue>& points() const { return _points; }
|
||||
void setPoints(const QList<PitchValue>& p) { _points = p; }
|
||||
|
||||
virtual QVariant getProperty(Pid propertyId) const override;
|
||||
virtual bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
QVariant getProperty(Pid propertyId) const override;
|
||||
bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
|
||||
qreal userMag() const { return _userMag; }
|
||||
void setUserMag(qreal m) { _userMag = m; }
|
||||
|
|
|
|||
|
|
@ -29,25 +29,26 @@ class TrillSegment final : public LineSegment {
|
|||
|
||||
void symbolLine(SymId start, SymId fill);
|
||||
void symbolLine(SymId start, SymId fill, SymId end);
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
protected:
|
||||
public:
|
||||
TrillSegment(Spanner* sp, Score* s) : LineSegment(sp, s, ElementFlag::MOVABLE | ElementFlag::ON_STAFF) {}
|
||||
TrillSegment(Score* s) : LineSegment(s, ElementFlag::MOVABLE | ElementFlag::ON_STAFF) {}
|
||||
Trill* trill() const { return (Trill*)spanner(); }
|
||||
virtual ElementType type() const override { return ElementType::TRILL_SEGMENT; }
|
||||
virtual TrillSegment* clone() const override { return new TrillSegment(*this); }
|
||||
virtual void draw(QPainter*) const override;
|
||||
virtual bool acceptDrop(EditData&) const override;
|
||||
virtual Element* drop(EditData&) override;
|
||||
virtual void layout() override;
|
||||
|
||||
virtual Element* propertyDelegate(Pid) override;
|
||||
Trill* trill() const { return (Trill*)spanner(); }
|
||||
ElementType type() const override { return ElementType::TRILL_SEGMENT; }
|
||||
TrillSegment* clone() const override { return new TrillSegment(*this); }
|
||||
void draw(QPainter*) const override;
|
||||
bool acceptDrop(EditData&) const override;
|
||||
Element* drop(EditData&) override;
|
||||
void layout() override;
|
||||
|
||||
virtual void add(Element*) override;
|
||||
virtual void remove(Element*) override;
|
||||
virtual void scanElements(void* data, void (*func)(void*, Element*), bool all) override;
|
||||
Element* propertyDelegate(Pid) override;
|
||||
|
||||
void add(Element*) override;
|
||||
void remove(Element*) override;
|
||||
void scanElements(void* data, void (*func)(void*, Element*), bool all) override;
|
||||
Shape shape() const override;
|
||||
|
||||
std::vector<SymId> symbols() const { return _symbols; }
|
||||
|
|
@ -60,7 +61,7 @@ class TrillSegment final : public LineSegment {
|
|||
//---------------------------------------------------------
|
||||
|
||||
class Trill final : public SLine {
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
public:
|
||||
enum class Type : char {
|
||||
|
|
@ -75,16 +76,17 @@ class Trill final : public SLine {
|
|||
|
||||
public:
|
||||
Trill(Score* s);
|
||||
virtual ~Trill();
|
||||
virtual Trill* clone() const override { return new Trill(*this); }
|
||||
virtual ElementType type() const override { return ElementType::TRILL; }
|
||||
~Trill();
|
||||
|
||||
virtual void layout() override;
|
||||
virtual LineSegment* createLineSegment() override;
|
||||
virtual void add(Element*) override;
|
||||
virtual void remove(Element*) override;
|
||||
virtual void write(XmlWriter&) const override;
|
||||
virtual void read(XmlReader&) override;
|
||||
Trill* clone() const override { return new Trill(*this); }
|
||||
ElementType type() const override { return ElementType::TRILL; }
|
||||
|
||||
void layout() override;
|
||||
LineSegment* createLineSegment() override;
|
||||
void add(Element*) override;
|
||||
void remove(Element*) override;
|
||||
void write(XmlWriter&) const override;
|
||||
void read(XmlReader&) override;
|
||||
|
||||
void setTrillType(const QString& s);
|
||||
void setTrillType(Type tt) { _trillType = tt; }
|
||||
|
|
@ -100,14 +102,14 @@ class Trill final : public SLine {
|
|||
void setAccidental(Accidental* a) { _accidental = a; }
|
||||
|
||||
Segment* segment() const { return (Segment*)parent(); }
|
||||
virtual void scanElements(void* data, void (*func)(void*, Element*), bool all=true) override;
|
||||
void scanElements(void* data, void (*func)(void*, Element*), bool all=true) override;
|
||||
|
||||
virtual QVariant getProperty(Pid propertyId) const override;
|
||||
virtual bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
virtual Pid propertyId(const QStringRef& xmlName) const override;
|
||||
QVariant getProperty(Pid propertyId) const override;
|
||||
bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
Pid propertyId(const QStringRef& xmlName) const override;
|
||||
|
||||
virtual QString accessibleInfo() const override;
|
||||
QString accessibleInfo() const override;
|
||||
};
|
||||
|
||||
struct TrillTableItem {
|
||||
|
|
|
|||
|
|
@ -34,13 +34,16 @@ class VibratoSegment final : public LineSegment {
|
|||
protected:
|
||||
public:
|
||||
VibratoSegment(Spanner* sp, Score* s) : LineSegment(sp, s, ElementFlag::MOVABLE | ElementFlag::ON_STAFF) {}
|
||||
Vibrato* vibrato() const { return toVibrato(spanner()); }
|
||||
virtual ElementType type() const override { return ElementType::VIBRATO_SEGMENT; }
|
||||
virtual VibratoSegment* clone() const override { return new VibratoSegment(*this); }
|
||||
virtual void draw(QPainter*) const override;
|
||||
virtual void layout() override;
|
||||
|
||||
virtual Element* propertyDelegate(Pid) override;
|
||||
ElementType type() const override { return ElementType::VIBRATO_SEGMENT; }
|
||||
VibratoSegment* clone() const override { return new VibratoSegment(*this); }
|
||||
|
||||
Vibrato* vibrato() const { return toVibrato(spanner()); }
|
||||
|
||||
void draw(QPainter*) const override;
|
||||
void layout() override;
|
||||
|
||||
Element* propertyDelegate(Pid) override;
|
||||
|
||||
Shape shape() const override;
|
||||
std::vector<SymId> symbols() const { return _symbols; }
|
||||
|
|
@ -53,7 +56,7 @@ class VibratoSegment final : public LineSegment {
|
|||
|
||||
class Vibrato final : public SLine {
|
||||
|
||||
virtual Sid getPropertyStyle(Pid) const override;
|
||||
Sid getPropertyStyle(Pid) const override;
|
||||
|
||||
public:
|
||||
enum class Type : char {
|
||||
|
|
@ -65,14 +68,16 @@ class Vibrato final : public SLine {
|
|||
|
||||
public:
|
||||
Vibrato(Score* s);
|
||||
virtual ~Vibrato();
|
||||
virtual Vibrato* clone() const override { return new Vibrato(*this); }
|
||||
virtual ElementType type() const override { return ElementType::VIBRATO; }
|
||||
~Vibrato();
|
||||
|
||||
virtual void layout() override;
|
||||
virtual LineSegment* createLineSegment() override;
|
||||
virtual void write(XmlWriter&) const override;
|
||||
virtual void read(XmlReader&) override;
|
||||
Vibrato* clone() const override { return new Vibrato(*this); }
|
||||
ElementType type() const override { return ElementType::VIBRATO; }
|
||||
|
||||
void layout() override;
|
||||
LineSegment* createLineSegment() override;
|
||||
|
||||
void write(XmlWriter&) const override;
|
||||
void read(XmlReader&) override;
|
||||
|
||||
void setVibratoType(const QString& s);
|
||||
void undoSetVibratoType(Type val);
|
||||
|
|
@ -86,11 +91,11 @@ class Vibrato final : public SLine {
|
|||
|
||||
Segment* segment() const { return (Segment*)parent(); }
|
||||
|
||||
virtual QVariant getProperty(Pid propertyId) const override;
|
||||
virtual bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
virtual Pid propertyId(const QStringRef& xmlName) const override;
|
||||
virtual QString accessibleInfo() const override;
|
||||
QVariant getProperty(Pid propertyId) const override;
|
||||
bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
Pid propertyId(const QStringRef& xmlName) const override;
|
||||
QString accessibleInfo() const override;
|
||||
};
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -32,12 +32,14 @@ extern LineSegment* voltaDebug;
|
|||
class VoltaSegment final : public TextLineBaseSegment {
|
||||
public:
|
||||
VoltaSegment(Spanner*, Score*);
|
||||
virtual ElementType type() const override { return ElementType::VOLTA_SEGMENT; }
|
||||
virtual VoltaSegment* clone() const override { return new VoltaSegment(*this); }
|
||||
Volta* volta() const { return (Volta*)spanner(); }
|
||||
virtual void layout() override;
|
||||
|
||||
virtual Element* propertyDelegate(Pid) override;
|
||||
ElementType type() const override { return ElementType::VOLTA_SEGMENT; }
|
||||
VoltaSegment* clone() const override { return new VoltaSegment(*this); }
|
||||
|
||||
Volta* volta() const { return (Volta*)spanner(); }
|
||||
void layout() override;
|
||||
|
||||
Element* propertyDelegate(Pid) override;
|
||||
};
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
@ -55,14 +57,17 @@ class Volta final : public TextLineBase {
|
|||
};
|
||||
|
||||
Volta(Score* s);
|
||||
virtual Volta* clone() const override { return new Volta(*this); }
|
||||
virtual ElementType type() const override { return ElementType::VOLTA; }
|
||||
virtual LineSegment* createLineSegment() override;
|
||||
|
||||
virtual void write(XmlWriter&) const override;
|
||||
virtual void read(XmlReader& e) override;
|
||||
Volta* clone() const override { return new Volta(*this); }
|
||||
ElementType type() const override { return ElementType::VOLTA; }
|
||||
|
||||
LineSegment* createLineSegment() override;
|
||||
|
||||
void write(XmlWriter&) const override;
|
||||
void read(XmlReader& e) override;
|
||||
|
||||
bool readProperties(XmlReader&) override;
|
||||
virtual SpannerSegment* layoutSystem(System* system) override;
|
||||
SpannerSegment* layoutSystem(System* system) override;
|
||||
|
||||
void setVelocity() const;
|
||||
void setChannel() const;
|
||||
|
|
@ -79,11 +84,11 @@ class Volta final : public TextLineBase {
|
|||
void setVoltaType(Volta::Type); // deprecated
|
||||
Type voltaType() const; // deprecated
|
||||
|
||||
virtual QVariant getProperty(Pid propertyId) const override;
|
||||
virtual bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
virtual QVariant propertyDefault(Pid) const override;
|
||||
QVariant getProperty(Pid propertyId) const override;
|
||||
bool setProperty(Pid propertyId, const QVariant&) override;
|
||||
QVariant propertyDefault(Pid) const override;
|
||||
|
||||
virtual QString accessibleInfo() const override;
|
||||
QString accessibleInfo() const override;
|
||||
};
|
||||
|
||||
} // namespace Ms
|
||||
|
|
|
|||
Loading…
Reference in a new issue