diff --git a/libmscore/paste.cpp b/libmscore/paste.cpp index 2602e29cea3a4..46f2c0b456986 100644 --- a/libmscore/paste.cpp +++ b/libmscore/paste.cpp @@ -106,8 +106,8 @@ bool Score::pasteStaff(XmlReader& e, Segment* dst, int dstStaff, Fraction scale) break; } } - Fraction tickStart = Fraction::fromTicks(e.intAttribute("tick", 0)); - tickLen = Fraction::fromTicks(e.intAttribute("len", 0)); + Fraction tickStart = Fraction::fromString(e.attribute("tick", "0")); + tickLen = Fraction::fromString(e.attribute("len", "0")); Fraction oTickLen = tickLen; tickLen *= scale; int staffStart = e.intAttribute("staff", 0); diff --git a/libmscore/select.cpp b/libmscore/select.cpp index 5f0e67e317f0b..3b797bbbfd69f 100644 --- a/libmscore/select.cpp +++ b/libmscore/select.cpp @@ -813,10 +813,10 @@ QByteArray Selection::staffMimeData() const Fraction ticks = tickEnd() - tickStart(); int staves = staffEnd() - staffStart(); if (!MScore::testMode) { - xml.stag(QString("StaffList version=\"" MSC_VERSION "\" tick=\"%1\" len=\"%2\" staff=\"%3\" staves=\"%4\"").arg(tickStart().ticks()).arg(ticks.ticks()).arg(staffStart()).arg(staves)); + xml.stag(QString("StaffList version=\"" MSC_VERSION "\" tick=\"%1\" len=\"%2\" staff=\"%3\" staves=\"%4\"").arg(tickStart().toString()).arg(ticks.toString()).arg(staffStart()).arg(staves)); } else { - xml.stag(QString("StaffList version=\"2.00\" tick=\"%1\" len=\"%2\" staff=\"%3\" staves=\"%4\"").arg(tickStart().ticks()).arg(ticks.ticks()).arg(staffStart()).arg(staves)); + xml.stag(QString("StaffList version=\"2.00\" tick=\"%1\" len=\"%2\" staff=\"%3\" staves=\"%4\"").arg(tickStart().toString()).arg(ticks.toString()).arg(staffStart()).arg(staves)); } Segment* seg1 = _startSegment; Segment* seg2 = _endSegment; diff --git a/mtest/libmscore/selectionfilter/selectionfilter1-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter1-base-ref.xml index 22e0cd82c9e3c..706df774eca20 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter1-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter1-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter1-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter1-ref.xml index 9e4fd2d325954..bc83002d076aa 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter1-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter1-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter10-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter10-base-ref.xml index 7e0619cb7e1e4..36b56003f3cf7 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter10-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter10-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter10-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter10-ref.xml index 935ec8dcd4423..6a6938f354495 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter10-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter10-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter11-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter11-base-ref.xml index 4ca1f5f4485dc..efdc1069880e3 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter11-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter11-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter11-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter11-ref.xml index 67f963898bb31..dcd8e94f440b5 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter11-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter11-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter12-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter12-base-ref.xml index bb8bc82918898..cdfe93424ca18 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter12-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter12-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter12-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter12-ref.xml index 161f697301da7..75ebfbc44738f 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter12-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter12-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter13-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter13-base-ref.xml index 623181d7f9f77..7904c827bfb1e 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter13-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter13-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter13-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter13-ref.xml index 374e968a6141b..d94d6774d9e3b 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter13-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter13-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter14-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter14-base-ref.xml index f91b241d661fa..a6db5abb35aa5 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter14-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter14-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter14-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter14-ref.xml index 374e968a6141b..d94d6774d9e3b 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter14-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter14-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter15-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter15-base-ref.xml index d6f3581458cca..ad44d23d327d8 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter15-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter15-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter15-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter15-ref.xml index 37b79db2c7335..fc2e4cf441aa4 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter15-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter15-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter16-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter16-base-ref.xml index 93e2d911e2b48..93f2421c507b2 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter16-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter16-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter16-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter16-ref.xml index ceed8baa8b7f6..7c4425266d9ff 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter16-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter16-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter17-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter17-base-ref.xml index 2a43f6e7dc6f5..84408398aa67f 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter17-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter17-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter17-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter17-ref.xml index 53b9cdaa589e6..8041e4696d6b7 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter17-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter17-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter18-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter18-base-ref.xml index 2a43f6e7dc6f5..84408398aa67f 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter18-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter18-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter18-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter18-ref.xml index dc79111e7cca7..160b2a41255e6 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter18-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter18-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter19-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter19-base-ref.xml index f48275f6021d5..8d2376e41fccf 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter19-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter19-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter19-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter19-ref.xml index dc79111e7cca7..160b2a41255e6 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter19-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter19-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter2-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter2-base-ref.xml index 3aef5b0dfd3a6..bfd6683772b51 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter2-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter2-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter2-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter2-ref.xml index 2abab2453ef25..4d78421fa97f4 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter2-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter2-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter20-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter20-base-ref.xml index 4c21ac4288295..09cc9ad8087ba 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter20-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter20-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter20-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter20-ref.xml index dc79111e7cca7..160b2a41255e6 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter20-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter20-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter22-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter22-base-ref.xml index 22e0cd82c9e3c..706df774eca20 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter22-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter22-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter22-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter22-ref.xml index 6ce1566fe54da..91fe6f5d891a5 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter22-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter22-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter23-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter23-base-ref.xml index 3aef5b0dfd3a6..bfd6683772b51 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter23-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter23-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter23-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter23-ref.xml index 5ab5a1bae2bd0..5cc95ca39d7ce 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter23-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter23-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter3-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter3-base-ref.xml index 549700240b8bc..986a5a41e3609 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter3-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter3-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter3-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter3-ref.xml index 374e968a6141b..d94d6774d9e3b 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter3-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter3-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter4-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter4-base-ref.xml index 883e127ca7c5a..0b24551b20ff9 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter4-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter4-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter4-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter4-ref.xml index 374e968a6141b..d94d6774d9e3b 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter4-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter4-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter5-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter5-base-ref.xml index d453f5b03d59a..0fa9a3d8baf93 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter5-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter5-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter5-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter5-ref.xml index 374e968a6141b..d94d6774d9e3b 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter5-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter5-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter6-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter6-base-ref.xml index 702446a3cb0af..eb7fe376afd9c 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter6-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter6-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter6-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter6-ref.xml index 374e968a6141b..d94d6774d9e3b 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter6-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter6-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter7-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter7-base-ref.xml index 5a5dbfa5434b0..47a37cb361468 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter7-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter7-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter7-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter7-ref.xml index 374e968a6141b..d94d6774d9e3b 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter7-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter7-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter8-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter8-base-ref.xml index ab141161fe30a..d99ffc24f0f26 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter8-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter8-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter8-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter8-ref.xml index 374e968a6141b..d94d6774d9e3b 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter8-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter8-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter9-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter9-base-ref.xml index ddee3700983e9..d1caa6a408f25 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter9-base-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter9-base-ref.xml @@ -1,5 +1,5 @@ - + 0 diff --git a/mtest/libmscore/selectionfilter/selectionfilter9-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter9-ref.xml index 374e968a6141b..d94d6774d9e3b 100644 --- a/mtest/libmscore/selectionfilter/selectionfilter9-ref.xml +++ b/mtest/libmscore/selectionfilter/selectionfilter9-ref.xml @@ -1,5 +1,5 @@ - + 0