Merge lp:~schwann/ubuntu-keyboard/keyboard-html-enter into lp:ubuntu-keyboard

[Günter Schwann]

Send return ("\r") as text in return key event fixes LP: #1230035

Send return ("\r") as text in return key event fixes LP: #1230035
Fix is in src/view/abstracttexteditor.cpp

Plus some potential compile and crash fixes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:60
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/131/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/ubuntu-keyboard-saucy-amd64-ci/132
    SUCCESS: http://10.97.0.26:8080/job/ubuntu-keyboard-saucy-armhf-ci/131
        deb: http://10.97.0.26:8080/job/ubuntu-keyboard-saucy-armhf-ci/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/ubuntu-keyboard-saucy-i386-ci/131

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/131/rebuild

review: Approve (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

looks good

review: Approve

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'src/lib/logic/wordengine.cpp'
--- src/lib/logic/wordengine.cpp	2013-09-16 14:28:33 +0000
+++ src/lib/logic/wordengine.cpp	2013-10-07 14:51:32 +0000
@@ -183,11 +183,12 @@
 
 void WordEngine::onWordCandidateSelected(QString word)
 {
+#ifdef HAVE_PINYIN
     Q_D(WordEngine);
-
-#ifdef HAVE_PINYIN
     if (d->predictiveBackend == WordEnginePrivate::PinyinBackend)
         d->pinyinAdapter->wordCandidateSelected(word);
+#else
+    Q_UNUSED(word);
 #endif
 }
 

=== modified file 'src/plugin/editor.cpp'
--- src/plugin/editor.cpp	2013-07-19 12:05:07 +0000
+++ src/plugin/editor.cpp	2013-10-07 14:51:32 +0000
@@ -64,6 +64,7 @@
     if (not m_host) {
         qWarning() << __PRETTY_FUNCTION__
                    << "Host not set, ignoring.";
+        return;
     }
 
     QList<Maliit::PreeditTextFormat> format_list;
@@ -83,6 +84,7 @@
     if (not m_host) {
         qWarning() << __PRETTY_FUNCTION__
                    << "Host not set, ignoring.";
+        return;
     }
 
     m_host->sendCommitString(commit);
@@ -93,6 +95,7 @@
     if (not m_host) {
         qWarning() << __PRETTY_FUNCTION__
                      << "Host not set, ignoring.";
+        return;
     }
 
     m_host->sendKeyEvent(ev);
@@ -103,6 +106,7 @@
     if (not m_host) {
         qWarning() << __PRETTY_FUNCTION__
                      << "Host not set, ignoring.";
+        return;
     }
 
     m_host->invokeAction(action, sequence);

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2013-07-19 12:05:07 +0000
+++ src/view/abstracttexteditor.cpp	2013-10-07 14:51:32 +0000
@@ -409,6 +409,7 @@
     }
 
     const QString &text(key.label().text());
+    QString keyText = QString("");
     Qt::Key event_key = Qt::Key_unknown;
 
     switch(key.action()) {
@@ -458,9 +459,10 @@
         }
     } break;
 
-    case Key::ActionReturn:
+    case Key::ActionReturn: {
         event_key = Qt::Key_Return;
-        break;
+        keyText = QString("\r");
+    } break;
 
     case Key::ActionClose:
         Q_EMIT keyboardClosed();
@@ -499,7 +501,7 @@
 
     if (event_key != Qt::Key_unknown) {
         commitPreedit();
-        QKeyEvent ev(QEvent::KeyPress, event_key, Qt::NoModifier);
+        QKeyEvent ev(QEvent::KeyPress, event_key, Qt::NoModifier, keyText);
         sendKeyEvent(ev);
     }
 }