Merge pull request #3134 from Jojo-Schmitz/fix-windows-build

fix Windows build after 51372d8
musescore · Apr 11, 2017 · 4d0b87c · 4d0b87c
2 parents 485dc4a + dc6c583
commit 4d0b87c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/libmscore/text.cpp b/libmscore/text.cpp
@@ -1524,7 +1524,7 @@ void Text::startEdit(EditData& ed)
 //   endEdit
 //---------------------------------------------------------
 
-void Text::endEdit(EditData& ed)
+void Text::endEdit(EditData&)
       {
       static const qreal w = 2.0;
       score()->addRefresh(canvasBoundingRect().adjusted(-w, -w, w, w));
@@ -2259,7 +2259,6 @@ QLineF Text::dragAnchor() const
 
 void Text::paste(EditData& ed)
       {
-      MuseScoreView* view = ed.view;
       TextEditData* ted = static_cast<TextEditData*>(ed.getData(this));
       TextCursor* _cursor = ted->cursor;
 
@@ -2405,8 +2404,8 @@ bool Text::acceptDrop(EditData& data) const
 
 Element* Text::drop(EditData& data)
       {
-      Element* e = data.element;
 #if 0
+      Element* e = data.element;
       switch(e->type()) {
             case ElementType::SYMBOL:
                   {

diff --git a/mscore/keyb.cpp b/mscore/keyb.cpp
@@ -218,7 +218,7 @@ void ScoreView::editKey(QKeyEvent* ev)
 #ifdef Q_OS_WIN // Japenese IME on Windows needs to know when Contrl/Alt/Shift/CapsLock is pressed while in predit
       if (editElement->isText()) {
             Text* text = toText(editElement);
-            if (text->cursor()->format()->preedit() && QGuiApplication::inputMethod()->locale().script() == QLocale::JapaneseScript &&
+            if (text->cursor(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)) ||
                  (editData.key == Qt::Key_Shift   || (editData.modifiers & Qt::ShiftModifier)) ||