From 70e41448a9f693a5f87e96630433759863a50442 Mon Sep 17 00:00:00 2001 From: Howard-C Date: Tue, 14 Apr 2020 16:49:23 +0800 Subject: [PATCH] Address review --- libmscore/tremolo.cpp | 7 ++----- libmscore/tremolo.h | 10 +++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libmscore/tremolo.cpp b/libmscore/tremolo.cpp index 670c2ffde0..ba503b09e2 100644 --- a/libmscore/tremolo.cpp +++ b/libmscore/tremolo.cpp @@ -53,17 +53,14 @@ Tremolo::Tremolo(Score* score) : Element(score, ElementFlag::MOVABLE) { initElementStyle(&tremoloStyle); - setTremoloType(TremoloType::R8); - _chord1 = 0; - _chord2 = 0; } Tremolo::Tremolo(const Tremolo& t) : Element(t) { setTremoloType(t.tremoloType()); - _chord1 = t.chord1(); - _chord2 = t.chord2(); + _chord1 = t.chord1(); + _chord2 = t.chord2(); _durationType = t._durationType; } diff --git a/libmscore/tremolo.h b/libmscore/tremolo.h index 527b03fce1..f516ebe3b5 100644 --- a/libmscore/tremolo.h +++ b/libmscore/tremolo.h @@ -41,15 +41,15 @@ enum class TremoloBeamStyle : signed char { //--------------------------------------------------------- class Tremolo final : public Element { - TremoloType _tremoloType; - Chord* _chord1; - Chord* _chord2; + TremoloType _tremoloType { TremoloType::R8 }; + Chord* _chord1 { nullptr }; + Chord* _chord2 { nullptr }; TDuration _durationType; QPainterPath path; int _lines; // derived from _subtype - TremoloPlacement _tremoloPlacement; - TremoloBeamStyle _beamStyle; + TremoloPlacement _tremoloPlacement { TremoloPlacement::DEFAULT }; + TremoloBeamStyle _beamStyle { TremoloBeamStyle::DEFAULT }; QPainterPath basePath() const; void computeShape();