update changelog

This commit is contained in:
hanteng 2023-05-10 16:22:51 +08:00 committed by cckylin-cibot
parent cb0b0b97db
commit 77bdaa4d9a
3 changed files with 62 additions and 0 deletions

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
kylin-virtual-keyboard (2.0.1.0-0ok4) yangtze; urgency=medium
* bug修复#161699 #169012
* 新需求:无
* 其他修改:
1.重新编译工程
-- hanteng <hanteng@kylinos.cn> Wed, 10 May 2023 16:21:23 +0800
kylin-virtual-keyboard (2.0.1.0-0ok3) yangtze; urgency=medium
* bug修复#161699 #169012

View File

@ -0,0 +1,52 @@
From: hanteng <hanteng@kylinos.cn>
Date: Wed, 10 May 2023 16:22:51 +0800
Subject: update changelog
---
src/ipc/requestmerger.cpp | 8 ++++----
src/ipc/requestmerger.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/ipc/requestmerger.cpp b/src/ipc/requestmerger.cpp
index ebaf606..5181308 100644
--- a/src/ipc/requestmerger.cpp
+++ b/src/ipc/requestmerger.cpp
@@ -115,16 +115,16 @@ void RequestMerger::init(ExecuteCallback activationExecuteCallback,
updateCurrentState(idleState_);
}
-void RequestMerger::activate() { currentSate_->activate(); }
+void RequestMerger::activate() { currentState_->activate(); }
-void RequestMerger::deactivate() { currentSate_->deactivate(); }
+void RequestMerger::deactivate() { currentState_->deactivate(); }
void RequestMerger::start() { timer_.start(period_); }
void RequestMerger::stop() { timer_.stop(); }
void RequestMerger::updateCurrentState(std::shared_ptr<State> newState) {
- currentSate_ = newState;
+ currentState_ = newState;
}
void RequestMerger::enterIdleState() {
@@ -140,4 +140,4 @@ void RequestMerger::enterDeactivationState() {
start();
}
-void RequestMerger::execute() { currentSate_->execute(); }
+void RequestMerger::execute() { currentState_->execute(); }
diff --git a/src/ipc/requestmerger.h b/src/ipc/requestmerger.h
index a4be9dd..e1740ac 100644
--- a/src/ipc/requestmerger.h
+++ b/src/ipc/requestmerger.h
@@ -52,7 +52,7 @@ private:
int period_ = LEAST_PERIOD;
QTimer timer_;
- std::shared_ptr<State> currentSate_ = nullptr;
+ std::shared_ptr<State> currentState_ = nullptr;
std::shared_ptr<State> idleState_ = nullptr;
std::shared_ptr<State> activationState_ = nullptr;
std::shared_ptr<State> deactivationState_ = nullptr;

View File

@ -1,2 +1,3 @@
0001-update-changelog.patch
0002-update-changelog.patch
0003-update-changelog.patch