Remove manual call to HunspellInputMethod::reset()

The reset() function should not be called directly from the input
method because it is a virtual function and may cause side effects
in the derived class.

This change moves the reset() function to private class and uses
that function instead.

This change does not introduce any new behavior, nor it should break
any existing ones. It fixes a particular issue that presents
itself after introduction of the LipiInputMethod, which uses
HunspellInputMethod as its base class.

Change-Id: I38b56150a677f6c8fcf10a9b7b556acc3f7f4a92
Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/src/virtualkeyboard/hunspellinputmethod.cpp b/src/virtualkeyboard/hunspellinputmethod.cpp
index 8080afd7..cc701df6 100644
--- a/src/virtualkeyboard/hunspellinputmethod.cpp
+++ b/src/virtualkeyboard/hunspellinputmethod.cpp
@@ -193,12 +193,7 @@ void HunspellInputMethod::selectionListItemSelected(DeclarativeSelectionListMode
 void HunspellInputMethod::reset()
 {
     Q_D(HunspellInputMethod);
-    if (d->clearSuggestions()) {
-        emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList);
-        emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->activeWordIndex);
-    }
-    d->word.clear();
-    d->autoSpaceAllowed = false;
+    d->reset();
 }
 
 void HunspellInputMethod::update()
@@ -208,7 +203,7 @@ void HunspellInputMethod::update()
         return;
     if (!d->word.isEmpty()) {
         QString finalWord = d->hasSuggestions() ? d->wordCandidates.at(d->activeWordIndex) : d->word;
-        reset();
+        d->reset();
         inputContext()->commit(finalWord);
     }
     d->autoSpaceAllowed = false;