From 9c7cd56101f80a235f7e72edc31f35da780627f2 Mon Sep 17 00:00:00 2001 From: liulinsong Date: Thu, 30 Mar 2023 10:20:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/virtualkeyboard/virtualkeyboardmanager.cpp | 10 +++++----- src/virtualkeyboard/virtualkeyboardmanager.h | 2 +- src/virtualkeyboard/virtualkeyboardview.cpp | 2 +- src/virtualkeyboard/virtualkeyboardview.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/virtualkeyboard/virtualkeyboardmanager.cpp b/src/virtualkeyboard/virtualkeyboardmanager.cpp index f186142..a48a882 100644 --- a/src/virtualkeyboard/virtualkeyboardmanager.cpp +++ b/src/virtualkeyboard/virtualkeyboardmanager.cpp @@ -70,7 +70,7 @@ void VirtualKeyboardManager::UpdateCandidateArea( } void VirtualKeyboardManager::NotifyIMActivated(const QString &uniqueName) { - emit changeIM(uniqueName); + emit inputMethodNameArrived(uniqueName); } void VirtualKeyboardManager::NotifyIMDeactivated( @@ -87,8 +87,8 @@ void VirtualKeyboardManager::syncInputMethodName() { [this](QDBusPendingCallWatcher *watcher) { QDBusPendingReply reply = *watcher; if (!reply.isError()) { - const QString &imName = reply.value(); - emit changeIM(imName); + const QString &inputMethodName = reply.value(); + emit inputMethodNameArrived(inputMethodName); } watcher->deleteLater(); }); @@ -234,8 +234,8 @@ void VirtualKeyboardManager::connectVirtualKeyboardManagerSignals() { SIGNAL(updateCandidateArea(const QVariant &, bool, bool, int)), view_.get(), SIGNAL(updateCandidateArea(const QVariant &, bool, bool, int))); - connect(this, SIGNAL(changeIM(const QString &)), view_.get(), - SIGNAL(changeIM(const QString &))); + connect(this, SIGNAL(inputMethodNameArrived(const QString &)), view_.get(), + SIGNAL(inputMethodNameArrived(const QString &))); connect(this, SIGNAL(reset()), view_.get(), SIGNAL(reset())); connect(this, SIGNAL(updateCurrentIMList(const QVariant &)), view_.get(), SIGNAL(updateCurrentIMList(const QVariant &))); diff --git a/src/virtualkeyboard/virtualkeyboardmanager.h b/src/virtualkeyboard/virtualkeyboardmanager.h index f732d68..bab63f5 100644 --- a/src/virtualkeyboard/virtualkeyboardmanager.h +++ b/src/virtualkeyboard/virtualkeyboardmanager.h @@ -64,7 +64,7 @@ signals: // TODO(linyuxuan): 使用更准确的类型替换QVariant void updateCandidateArea(const QVariant &candidateTextList, bool hasPrev, bool hasNext, int pageIndex); - void changeIM(const QString &uniqueName); + void inputMethodNameArrived(const QString &uniqueName); void reset(); // TODO(linyuxuan): 使用更准确的类型替换QVariant void updateCurrentIMList(const QVariant ¤tIMList); diff --git a/src/virtualkeyboard/virtualkeyboardview.cpp b/src/virtualkeyboard/virtualkeyboardview.cpp index 8ac791a..20b1e8c 100644 --- a/src/virtualkeyboard/virtualkeyboardview.cpp +++ b/src/virtualkeyboard/virtualkeyboardview.cpp @@ -63,7 +63,7 @@ void VirtualKeyboardView::connectSignals() { connect(this, SIGNAL(updateCandidateArea(const QVariant &, bool, bool, int)), rootObject(), SIGNAL(qmlUpdateCandidateList(QVariant))); - connect(this, SIGNAL(changeIM(const QString &)), rootObject(), + connect(this, SIGNAL(inputMethodNameArrived(const QString &)), rootObject(), SIGNAL(qmlChangeIM(QString))); connect(this, SIGNAL(reset()), rootObject(), SIGNAL(qmlReset())); connect(this, SIGNAL(updateCurrentIMList(const QVariant &)), rootObject(), diff --git a/src/virtualkeyboard/virtualkeyboardview.h b/src/virtualkeyboard/virtualkeyboardview.h index 6965c71..77719fc 100644 --- a/src/virtualkeyboard/virtualkeyboardview.h +++ b/src/virtualkeyboard/virtualkeyboardview.h @@ -26,7 +26,7 @@ signals: void updatePreeditArea(const QString &preeditText); void updateCandidateArea(const QVariant &candidateTextList, bool hasPrev, bool hasNext, int pageIndex); - void changeIM(const QString &uniqueName); + void inputMethodNameArrived(const QString &uniqueName); void reset(); void updateCurrentIMList(const QVariant ¤tIMList);