summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/notation/NoteStyle.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/notation/NoteStyle.cpp')
-rw-r--r--src/gui/editors/notation/NoteStyle.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/gui/editors/notation/NoteStyle.cpp b/src/gui/editors/notation/NoteStyle.cpp
index 00ce956..1e316fd 100644
--- a/src/gui/editors/notation/NoteStyle.cpp
+++ b/src/gui/editors/notation/NoteStyle.cpp
@@ -70,12 +70,12 @@ NoteStyle::getShape(Note::Type type)
if (m_baseStyle)
return m_baseStyle->getShape(type);
std::cerr
- << "WARNING: NoteStyle::getShape: No tqshape defined for note type "
+ << "WARNING: NoteStyle::getShape: No shape defined for note type "
<< type << ", defaulting to AngledOval" << std::endl;
return AngledOval;
}
- return i->second.tqshape;
+ return i->second.shape;
}
bool
@@ -183,57 +183,57 @@ NoteStyle::getNoteHeadCharName(Note::Type type)
CharName name = NoteCharacterNames::UNKNOWN;
bool inverted = false;
- if (desc.tqshape == AngledOval) {
+ if (desc.shape == AngledOval) {
name = desc.filled ? NoteCharacterNames::NOTEHEAD_BLACK
: NoteCharacterNames::VOID_NOTEHEAD;
- } else if (desc.tqshape == LevelOval) {
+ } else if (desc.shape == LevelOval) {
if (desc.filled) {
std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled level oval head" << std::endl;
}
name = NoteCharacterNames::WHOLE_NOTE;
- } else if (desc.tqshape == Breve) {
+ } else if (desc.shape == Breve) {
if (desc.filled) {
std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled breve head" << std::endl;
}
name = NoteCharacterNames::BREVE;
- } else if (desc.tqshape == Cross) {
+ } else if (desc.shape == Cross) {
name = desc.filled ? NoteCharacterNames::X_NOTEHEAD
: NoteCharacterNames::CIRCLE_X_NOTEHEAD;
- } else if (desc.tqshape == TriangleUp) {
+ } else if (desc.shape == TriangleUp) {
name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK
: NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE;
- } else if (desc.tqshape == TriangleDown) {
+ } else if (desc.shape == TriangleDown) {
name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK
: NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE;
inverted = true;
- } else if (desc.tqshape == Diamond) {
+ } else if (desc.shape == Diamond) {
name = desc.filled ? NoteCharacterNames::SEMIBREVIS_BLACK
: NoteCharacterNames::SEMIBREVIS_WHITE;
- } else if (desc.tqshape == Rectangle) {
+ } else if (desc.shape == Rectangle) {
name = desc.filled ? NoteCharacterNames::STQUARE_NOTEHEAD_BLACK
: NoteCharacterNames::STQUARE_NOTEHEAD_WHITE;
- } else if (desc.tqshape == Number) {
+ } else if (desc.shape == Number) {
std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: Number not yet implemented" << std::endl;
name = NoteCharacterNames::UNKNOWN; //!!!
- } else if (desc.tqshape == CustomCharName) {
+ } else if (desc.shape == CustomCharName) {
name = desc.charName;
@@ -433,10 +433,10 @@ NoteStyle::checkDescription(Note::Type note)
}
void
-NoteStyle::setShape(Note::Type note, NoteHeadShape tqshape)
+NoteStyle::setShape(Note::Type note, NoteHeadShape shape)
{
checkDescription(note);
- m_notes[note].tqshape = tqshape;
+ m_notes[note].shape = shape;
}
void