LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

turn enum DecoratorType into enum class Decorator::Type

Browse source
This commit is contained in:
Joachim Schmitz 2014-07-02 14:36:58 +02:00
parent 301867d739
commit 7a9f0696a0
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mscore/ove.cpp
View file

@ -2044,16 +2044,16 @@ int Glissando::getLineThick() const {
///////////////////////////////////////////////////////////////////////////////
Decorator::Decorator() :
decoratorType_(Decorator_Articulation),
decoratorType_(Type::Articulation),
artType_(ArticulationType::Marcato) {
musicDataType_ = MusicDataType::Decorator;
}
void Decorator::setDecoratorType(DecoratorType type) {
void Decorator::setDecoratorType(Type type) {
decoratorType_ = type;
}
Decorator::DecoratorType Decorator::getDecoratorType() const {
Decorator::Type Decorator::getDecoratorType() const {
return decoratorType_;
}
@ -5986,17 +5986,17 @@ bool BarsParse::parseGlissando(MeasureData* measureData, int /*length*/) {
bool getDecoratorType(
unsigned int thisByte,
bool& measureRepeat,
Decorator::DecoratorType& decoratorType,
Decorator::Type& decoratorType,
bool& singleRepeat,
ArticulationType& artType) {
measureRepeat = false;
decoratorType = Decorator::Decorator_Articulation;
decoratorType = Decorator::Type::Articulation;
singleRepeat = true;
artType = ArticulationType::None;
switch (thisByte) {
case 0x00: {
decoratorType = Decorator::Decorator_Dotted_Barline;
decoratorType = Decorator::Type::Dotted_Barline;
break;
}
case 0x30: {
@ -6202,7 +6202,7 @@ bool BarsParse::parseDecorators(MeasureData* measureData, int length) {
if( !readBuffer(placeHolder, 1) ) { return false; }
unsigned int thisByte = placeHolder.toUnsignedInt();
Decorator::DecoratorType decoratorType;
Decorator::Type decoratorType;
bool isMeasureRepeat;
bool isSingleRepeat = true;
ArticulationType artType = ArticulationType::None;

12
mscore/ove.h
View file

@ -1477,18 +1477,18 @@ public:
virtual ~Decorator(){}
public:
enum DecoratorType {
Decorator_Dotted_Barline = 0,
Decorator_Articulation
enum class Type : char {
Dotted_Barline = 0,
Articulation
};
void setDecoratorType(DecoratorType type);
DecoratorType getDecoratorType() const;
void setDecoratorType(Type type);
Type getDecoratorType() const;
void setArticulationType(ArticulationType type);
ArticulationType getArticulationType() const;
private:
DecoratorType decoratorType_;
Type decoratorType_;
ArticulationType artType_;
};