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

Fix compilation errors for MSVC

Browse source 
Errors fixed:

- textbase.cpp: _cursor parameter hides member of TextBase class.

- abstractinspectormodel.cpp: Variables not instantiated for some cases in
  switch statement.

- events.cpp: Cursor function takes no arguments.
This commit is contained in:
Peter Jonas 2020-05-20 11:07:43 +01:00 committed by pereverzev_v
parent f2864cddfb
commit 862bd9708b
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
inspectors/models/abstractinspectormodel.cpp
View file

@ -85,7 +85,7 @@ QList<Ms::ElementType> AbstractInspectorModel::supportedElementTypesBySectionTyp
switch (sectionType) {
case SECTION_GENERAL:
return { Ms::ElementType::MAXTYPE };
case SECTION_NOTATION:
case SECTION_NOTATION: {
static QList<Ms::ElementType> notationTypes = { Ms::ElementType::NOTE,
Ms::ElementType::STEM,
Ms::ElementType::NOTEDOT,
@ -111,13 +111,13 @@ QList<Ms::ElementType> AbstractInspectorModel::supportedElementTypesBySectionTyp
Ms::ElementType::HAIRPIN_SEGMENT,
Ms::ElementType::STAFFTYPE_CHANGE };
return notationTypes;
case SECTION_TEXT:
}
case SECTION_TEXT: {
static QList<Ms::ElementType> textTypes = { Ms::ElementType::TEXT, Ms::ElementType::TEXTLINE,
Ms::ElementType::TEXTLINE_BASE, Ms::ElementType::TEXTLINE_SEGMENT,
Ms::ElementType::STAFF_TEXT, Ms::ElementType::SYSTEM_TEXT};
return textTypes;
}
default:
return QList<Ms::ElementType>();
}

14
libmscore/textbase.cpp
View file

@ -1859,16 +1859,16 @@ void TextBase::genText() const
// selectAll
//---------------------------------------------------------
void TextBase::selectAll(TextCursor* _cursor)
void TextBase::selectAll(TextCursor* cursor)
{
if (_layout.isEmpty()) {
return;
}
_cursor->setSelectLine(0);
_cursor->setSelectColumn(0);
_cursor->setRow(rows() - 1);
_cursor->setColumn(_cursor->curLine().columns());
cursor->setSelectLine(0);
cursor->setSelectColumn(0);
cursor->setRow(rows() - 1);
cursor->setColumn(cursor->curLine().columns());
}
//---------------------------------------------------------
@ -2058,8 +2058,8 @@ QRectF TextBase::pageRectangle() const
void TextBase::dragTo(EditData& ed)
{
TextEditData* ted = static_cast<TextEditData*>(ed.getData(this));
TextCursor* _cursor = ted->cursor();
_cursor->set(ed.pos, QTextCursor::KeepAnchor);
TextCursor* cursor = ted->cursor();
cursor->set(ed.pos, QTextCursor::KeepAnchor);
score()->setUpdateAll();
score()->update();
}

2
mscore/events.cpp
View file

@ -895,7 +895,7 @@ void ScoreView::keyPressEvent(QKeyEvent* ev)
#ifdef Q_OS_WIN // Japenese IME on Windows needs to know when Ctrl/Alt/Shift/CapsLock is pressed while in predit
if (textEdit) {
TextBase* text = toTextBase(editData.element);
if (text->cursor(editData)->format()->preedit()
if (text->cursorFromEditData(editData)->format()->preedit()
&& QGuiApplication::inputMethod()->locale().script() == QLocale::JapaneseScript
&& ((editData.key == Qt::Key_Control || (editData.modifiers & Qt::ControlModifier))
|| (editData.key == Qt::Key_Alt || (editData.modifiers & Qt::AltModifier))