Remove UpdateNotifier and related code depending on UpdateEvent API

maliit · Jun 30, 2022 · e4dbf54 · e4dbf54
1 parent e9079ae
commit e4dbf54
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 205 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -157,8 +157,6 @@ set(MALIIT_KEYBOARD_COMMON_SOURCES
         src/plugin/feedback.h
         src/plugin/gettext.cpp
         src/plugin/gettext.h
-        src/plugin/updatenotifier.cpp
-        src/plugin/updatenotifier.h
         src/plugin/inputmethod.cpp
         src/plugin/inputmethod.h
         src/plugin/inputmethod_p.h

diff --git a/src/plugin/inputmethod.cpp b/src/plugin/inputmethod.cpp
@@ -42,14 +42,11 @@
 #include "view/setup.h"
 
 #include <maliit/plugins/subviewdescription.h>
-#include <maliit/plugins/updateevent.h>
 #include <maliit/namespace.h>
 
 #include <QGuiApplication>
 
 
-class MImUpdateEvent;
-
 using namespace MaliitKeyboard;
 
 namespace {

diff --git a/src/plugin/updatenotifier.cpp b/src/plugin/updatenotifier.cpp
diff --git a/src/plugin/updatenotifier.h b/src/plugin/updatenotifier.h
diff --git a/tests/unittests/ut_preedit-string/ut_preedit-string.cpp b/tests/unittests/ut_preedit-string/ut_preedit-string.cpp
@@ -45,12 +45,10 @@
 
 #include "view/setup.h"
 #include "plugin/editor.h"
-#include "plugin/updatenotifier.h"
 #include "inputmethodhostprobe.h"
 #include "wordengineprobe.h"
 
 #include <maliit/plugins/testsurfacefactory.h>
-#include <maliit/plugins/updateevent.h>
 
 #include <QtTest>
 #include <QtCore>
@@ -147,19 +145,6 @@ bool operator==(const Maliit::PreeditTextFormat &a, const Maliit::PreeditTextFor
     return ((a.start == b.start) and (a.length == b.length) and (a.preeditFace == b.preeditFace));
 }
 
-MImUpdateEvent *createUpdateEvent(const QString &surrounding_text,
-                                  int cursor_position)
-{
-    const char *const cur_pos("cursorPosition");
-    QStringList properties_changed(cur_pos);
-    QMap<QString, QVariant> update;
-
-    update.insert(cur_pos, cursor_position);
-    update.insert("surroundingText", surrounding_text);
-
-    return new MImUpdateEvent(update, properties_changed);
-}
-
 } // unnamed namespace
 
 struct BasicSetupTest
@@ -175,7 +160,6 @@ struct BasicSetupTest
 
     Editor editor;
     InputMethodHostProbe host;
-    UpdateNotifier notifier;
 };
 
 class SetupTest
@@ -477,10 +461,6 @@ class TestPreeditString
         QFETCH(bool, expected_preedit_string_sent);
 
         BasicSetupTest test_setup;
-        QScopedPointer<MImUpdateEvent> update_event(createUpdateEvent(surrounding_text,
-                                                                      cursor_position));
-
-        test_setup.notifier.notify(update_event.data());
 
         QCOMPARE(test_setup.host.preeditStringSent(), expected_preedit_string_sent);
         if (expected_preedit_string_sent) {
@@ -602,10 +582,6 @@ class TestPreeditString
         QFETCH(int, expected_cursor_position);
 
         SetupTest test_setup;
-        QScopedPointer<MImUpdateEvent> update_event(createUpdateEvent(surrounding_text,
-                                                                      cursor_position));
-
-        test_setup.notifier.notify(update_event.data());
 
         Q_FOREACH (const QString &k, keys) {
             test_setup.event_handler.onPressed(lookup(k));