aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2024-07-28 15:07:15 +0000
committersaturneric <[email protected]>2024-07-28 15:07:15 +0000
commitadc5d89717cc1498c69792799c74ace413cca713 (patch)
tree698d46d2d36f95fcb74a6aa449ffcba1a4d5f637
parentfix: can not import binary key data (diff)
downloadGpgFrontend-adc5d89717cc1498c69792799c74ace413cca713.tar.gz
GpgFrontend-adc5d89717cc1498c69792799c74ace413cca713.zip
fix: correct the spelling of 'deactivate'
-rw-r--r--src/core/module/GlobalModuleContext.cpp4
-rw-r--r--src/core/module/Module.cpp6
-rw-r--r--src/core/module/Module.h2
-rw-r--r--src/core/module/ModuleManager.cpp6
-rw-r--r--src/core/module/ModuleManager.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/src/core/module/GlobalModuleContext.cpp b/src/core/module/GlobalModuleContext.cpp
index 26c13a1b..c35e5229 100644
--- a/src/core/module/GlobalModuleContext.cpp
+++ b/src/core/module/GlobalModuleContext.cpp
@@ -197,8 +197,8 @@ class GlobalModuleContext::Impl {
}
auto module_info = module_info_opt.value();
- // activate the module if it is not already deactive.
- if (module_info->activate && (module_info->module->Deactive() == 0)) {
+ // activate the module if it is not already Deactivate.
+ if (module_info->activate && (module_info->module->Deactivate() == 0)) {
for (const auto& event_ids : module_info->listening_event_ids) {
auto& modules = module_events_table_[event_ids];
if (auto it = modules.find(module_id); it != modules.end()) {
diff --git a/src/core/module/Module.cpp b/src/core/module/Module.cpp
index ea2fea08..78a8810f 100644
--- a/src/core/module/Module.cpp
+++ b/src/core/module/Module.cpp
@@ -152,7 +152,7 @@ class Module::Impl {
return -1;
}
- auto Deactive() -> int {
+ auto Deactivate() -> int {
if (good_ && deactivate_api_ != nullptr) return deactivate_api_();
return -1;
}
@@ -248,7 +248,7 @@ class Module::Impl {
{"GFRegisterModule", reinterpret_cast<void**>(&register_api_)},
{"GFActiveModule", reinterpret_cast<void**>(&activate_api_)},
{"GFExecuteModule", reinterpret_cast<void**>(&execute_api_)},
- {"GFDeactiveModule", reinterpret_cast<void**>(&deactivate_api_)},
+ {"GFDeactivateModule", reinterpret_cast<void**>(&deactivate_api_)},
{"GFUnregisterModule", reinterpret_cast<void**>(&unregister_api_)},
};
@@ -279,7 +279,7 @@ auto Module::Exec(EventReference event) -> int {
return p_->Exec(std::move(event));
}
-auto Module::Deactive() -> int { return p_->Deactive(); }
+auto Module::Deactivate() -> int { return p_->Deactivate(); }
auto Module::UnRegister() -> int { return p_->UnRegister(); }
diff --git a/src/core/module/Module.h b/src/core/module/Module.h
index c332d455..e609d64e 100644
--- a/src/core/module/Module.h
+++ b/src/core/module/Module.h
@@ -61,7 +61,7 @@ class GPGFRONTEND_CORE_EXPORT Module : public QObject {
virtual auto Exec(EventReference) -> int;
- virtual auto Deactive() -> int;
+ virtual auto Deactivate() -> int;
virtual auto UnRegister() -> int;
diff --git a/src/core/module/ModuleManager.cpp b/src/core/module/ModuleManager.cpp
index 45e9f657..51611a72 100644
--- a/src/core/module/ModuleManager.cpp
+++ b/src/core/module/ModuleManager.cpp
@@ -170,7 +170,7 @@ class ModuleManager::Impl {
__func__, nullptr));
}
- void DeactiveModule(const ModuleIdentifier& identifier) {
+ void DeactivateModule(const ModuleIdentifier& identifier) {
Thread::TaskRunnerGetter::GetInstance()
.GetTaskRunner(Thread::TaskRunnerGetter::kTaskRunnerType_Default)
->PostTask(new Thread::Task(
@@ -281,8 +281,8 @@ void ModuleManager::ActiveModule(ModuleIdentifier id) {
return p_->ActiveModule(id);
}
-void ModuleManager::DeactiveModule(ModuleIdentifier id) {
- return p_->DeactiveModule(id);
+void ModuleManager::DeactivateModule(ModuleIdentifier id) {
+ return p_->DeactivateModule(id);
}
auto ModuleManager::GetTaskRunner(ModuleIdentifier id)
diff --git a/src/core/module/ModuleManager.h b/src/core/module/ModuleManager.h
index 08abbd27..9f7fab18 100644
--- a/src/core/module/ModuleManager.h
+++ b/src/core/module/ModuleManager.h
@@ -87,7 +87,7 @@ class GPGFRONTEND_CORE_EXPORT ModuleManager
void ActiveModule(ModuleIdentifier);
- void DeactiveModule(ModuleIdentifier);
+ void DeactivateModule(ModuleIdentifier);
auto GetTaskRunner(ModuleIdentifier) -> std::optional<TaskRunnerPtr>;