fix #51201 Voltas dont respond to CTRL-R

SKefalidis · Mar 30, 2015 · 0918b46 · 0918b46
1 parent a249aea
commit 0918b46
Show file tree

Hide file tree

Showing 110 changed files with 131,889 additions and 129,564 deletions.
diff --git a/libmscore/hairpin.h b/libmscore/hairpin.h
@@ -53,7 +53,6 @@ class HairpinSegment : public LineSegment {
       virtual QVariant propertyDefault(P_ID id) const override;
       virtual PropertyStyle propertyStyle(P_ID id) const override;
       virtual void resetProperty(P_ID id) override;
-      virtual void reset() override { spanner()->reset(); }
       };
 
 //---------------------------------------------------------

diff --git a/libmscore/spanner.h b/libmscore/spanner.h
@@ -77,7 +77,7 @@ class SpannerSegment : public Element {
       virtual QVariant getProperty(P_ID id) const override;
       virtual bool setProperty(P_ID id, const QVariant& v) override;
       virtual QVariant propertyDefault(P_ID id) const override;
-      virtual void reset() override;
+      void reset() override;
       virtual void setSelected(bool f) override;
       virtual void setVisible(bool f) override;
       virtual void setColor(const QColor& col) override;

diff --git a/libmscore/staff.h b/libmscore/staff.h
@@ -29,15 +29,13 @@
 
 namespace Ms {
 
-class Instrument;
 class InstrumentTemplate;
 class Xml;
 class Part;
 class Score;
 class KeyList;
 class StaffType;
 class Staff;
-class StringData;
 struct ClefTypeList;
 class Segment;
 class Clef;

diff --git a/libmscore/volta.h b/libmscore/volta.h
@@ -44,7 +44,6 @@ class VoltaSegment : public TextLineSegment {
       virtual PropertyStyle propertyStyle(P_ID) const override;
       virtual void resetProperty(P_ID id) override;
       virtual void styleChanged() override;
-      virtual void reset() override { spanner()->reset(); }
       };
 
 //---------------------------------------------------------