Cleanup clang-tidy issues

fcitx · Jan 18, 2025 · e610cd9 · e610cd9
1 parent 675107b
commit e610cd9
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 26 deletions.
diff --git a/src/bamboo.cpp b/src/bamboo.cpp
@@ -6,22 +6,43 @@
  */
 
 #include "bamboo.h"
+#include "bambooconfig.h"
+#include <algorithm>
+#include <cstdint>
+#include <cstdlib>
 #include <fcitx-config/iniparser.h>
+#include <fcitx-config/rawconfig.h>
+#include <fcitx-utils/capabilityflags.h>
 #include <fcitx-utils/charutils.h>
+#include <fcitx-utils/i18n.h>
 #include <fcitx-utils/keysymgen.h>
+#include <fcitx-utils/log.h>
+#include <fcitx-utils/macros.h>
+#include <fcitx-utils/misc.h>
 #include <fcitx-utils/standardpath.h>
+#include <fcitx-utils/stringutils.h>
 #include <fcitx-utils/textformatflags.h>
 #include <fcitx-utils/utf8.h>
+#include <fcitx/action.h>
+#include <fcitx/addoninstance.h>
+#include <fcitx/event.h>
 #include <fcitx/inputcontext.h>
 #include <fcitx/inputcontextmanager.h>
+#include <fcitx/inputmethodentry.h>
 #include <fcitx/inputpanel.h>
 #include <fcitx/menu.h>
 #include <fcitx/statusarea.h>
+#include <fcitx/text.h>
 #include <fcitx/userinterface.h>
 #include <fcitx/userinterfacemanager.h>
 #include <fcntl.h>
+#include <memory>
 #include <optional>
 #include <stdexcept>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 namespace fcitx {
 
@@ -32,6 +53,8 @@ constexpr std::string_view InputMethodActionPrefix = "bamboo-input-method-";
 constexpr std::string_view CharsetActionPrefix = "bamboo-charset-";
 const std::string CustomKeymapFile = "conf/bamboo-custom-keymap.conf";
 
+FCITX_DEFINE_LOG_CATEGORY(bamboo, "bamboo");
+
 std::string macroFile(std::string_view imName) {
     return stringutils::concat("conf/bamboo-macro-", imName, ".conf");
 }
@@ -48,9 +71,18 @@ uintptr_t newMacroTable(const BambooMacroTable &macroTable) {
     return NewMacroTable(charArray.data());
 }
 
+std::vector<std::string> convertToStringList(char **array) {
+    std::vector<std::string> result;
+    for (int i = 0; array[i]; i++) {
+        result.push_back(array[i]);
+        free(array[i]);
+    }
+    free(array);
+    return result;
+}
+
 } // namespace
 
-FCITX_DEFINE_LOG_CATEGORY(bamboo, "bamboo");
 #define FCITX_BAMBOO_DEBUG() FCITX_LOGC(bamboo, Debug)
 
 class BambooState final : public InputContextProperty {
@@ -117,7 +149,8 @@ class BambooState final : public InputContextProperty {
 
         if (keyEvent.key().checkKeyList(*engine_->config().restoreKeyStroke)) {
             EngineSetRestoreKeyStroke(bambooEngine_.handle());
-            return keyEvent.filterAndAccept();
+            keyEvent.filterAndAccept();
+            return;
         }
 
         if (EngineProcessKeyEvent(bambooEngine_.handle(),
@@ -189,16 +222,6 @@ class BambooState final : public InputContextProperty {
     CGoObject bambooEngine_;
 };
 
-std::vector<std::string> convertToStringList(char **array) {
-    std::vector<std::string> result;
-    for (int i = 0; array[i]; i++) {
-        result.push_back(array[i]);
-        free(array[i]);
-    }
-    free(array);
-    return result;
-}
-
 BambooEngine::BambooEngine(Instance *instance)
     : instance_(instance), factory_([this](InputContext &ic) {
           return new BambooState(this, &ic);
@@ -233,7 +256,7 @@ BambooEngine::BambooEngine(Instance *instance)
     inputMethodAction_->setMenu(inputMethodMenu_.get());
     for (const auto &imName : imNames_) {
         inputMethodSubAction_.emplace_back(std::make_unique<SimpleAction>());
-        auto action = inputMethodSubAction_.back().get();
+        auto *action = inputMethodSubAction_.back().get();
         action->setShortText(imName);
         action->setCheckable(true);
         uiManager.registerAction(
@@ -262,7 +285,7 @@ BambooEngine::BambooEngine(Instance *instance)
     auto charsets = convertToStringList(GetCharsetNames());
     for (const auto &charset : charsets) {
         charsetSubAction_.emplace_back(std::make_unique<SimpleAction>());
-        auto action = charsetSubAction_.back().get();
+        auto *action = charsetSubAction_.back().get();
         action->setShortText(charset);
         action->setCheckable(true);
         connections_.emplace_back(action->connect<SimpleAction::Activated>(
@@ -324,13 +347,13 @@ void BambooEngine::reloadConfig() {
 const Configuration *BambooEngine::getSubConfig(const std::string &path) const {
     if (path == "custom_keymap") {
         return &customKeymap_;
-    } else if (stringutils::startsWith(path, MacroPrefix)) {
+    }
+    if (stringutils::startsWith(path, MacroPrefix)) {
         const auto imName = path.substr(MacroPrefix.size());
         if (auto iter = macroTables_.find(imName); iter != macroTables_.end()) {
             return &iter->second;
-        } else {
-            return nullptr;
         }
+        return nullptr;
     }
     return nullptr;
 }
@@ -367,8 +390,8 @@ void BambooEngine::setSubConfig(const std::string &path,
     }
 }
 
-std::string BambooEngine::subMode(const fcitx::InputMethodEntry &,
-                                  fcitx::InputContext &) {
+std::string BambooEngine::subMode(const fcitx::InputMethodEntry & /*entry*/,
+                                  fcitx::InputContext & /*inputContext*/) {
     return *config_.inputMethod;
 }
 
@@ -392,7 +415,7 @@ void BambooEngine::activate(const InputMethodEntry &entry,
 void BambooEngine::deactivate(const InputMethodEntry &entry,
                               InputContextEvent &event) {
     FCITX_UNUSED(entry);
-    auto state = event.inputContext()->propertyFor(&factory_);
+    auto *state = event.inputContext()->propertyFor(&factory_);
     if (event.type() != EventType::InputContextFocusOut) {
         state->commitBuffer();
     } else {
@@ -402,15 +425,15 @@ void BambooEngine::deactivate(const InputMethodEntry &entry,
 
 void BambooEngine::keyEvent(const InputMethodEntry &entry, KeyEvent &keyEvent) {
     FCITX_UNUSED(entry);
-    auto state = keyEvent.inputContext()->propertyFor(&factory_);
+    auto *state = keyEvent.inputContext()->propertyFor(&factory_);
 
     state->keyEvent(keyEvent);
 }
 
 void BambooEngine::reset(const InputMethodEntry &entry,
                          InputContextEvent &event) {
     FCITX_UNUSED(entry);
-    auto state = event.inputContext()->propertyFor(&factory_);
+    auto *state = event.inputContext()->propertyFor(&factory_);
     state->reset();
 }
 
@@ -421,7 +444,7 @@ void BambooEngine::refreshEngine() {
     }
 
     instance_->inputContextManager().foreach([this](InputContext *ic) {
-        auto state = ic->propertyFor(&factory_);
+        auto *state = ic->propertyFor(&factory_);
         state->setEngine();
         if (ic->hasFocus()) {
             state->reset();
@@ -435,7 +458,7 @@ void BambooEngine::refreshOption() {
         return;
     }
     instance_->inputContextManager().foreach([this](InputContext *ic) {
-        auto state = ic->propertyFor(&factory_);
+        auto *state = ic->propertyFor(&factory_);
         state->setOption();
         if (ic->hasFocus()) {
             state->reset();
@@ -487,4 +510,4 @@ void BambooEngine::updateCharsetAction(InputContext *ic) {
 
 } // namespace fcitx
 
-FCITX_ADDON_FACTORY(fcitx::BambooFactory)
+FCITX_ADDON_FACTORY_V2(bamboo, fcitx::BambooFactory)
diff --git a/src/bamboo.h b/src/bamboo.h
@@ -9,15 +9,24 @@
 
 #include "bamboo-core.h"
 #include "bambooconfig.h"
+#include <cstdint>
 #include <fcitx-config/iniparser.h>
+#include <fcitx-config/rawconfig.h>
 #include <fcitx-utils/i18n.h>
+#include <fcitx-utils/signals.h>
 #include <fcitx/action.h>
 #include <fcitx/addonfactory.h>
+#include <fcitx/addoninstance.h>
 #include <fcitx/addonmanager.h>
+#include <fcitx/event.h>
 #include <fcitx/inputcontextproperty.h>
 #include <fcitx/inputmethodengine.h>
 #include <fcitx/instance.h>
+#include <memory>
+#include <optional>
 #include <string>
+#include <unordered_map>
+#include <vector>
 
 namespace fcitx {
 

diff --git a/src/bambooconfig.h b/src/bambooconfig.h
@@ -7,10 +7,16 @@
 #ifndef _FCITX5_BAMBOO_BAMBOOCONFIG_H_
 #define _FCITX5_BAMBOO_BAMBOOCONFIG_H_
 
+#include <algorithm>
+#include <cstddef>
 #include <fcitx-config/configuration.h>
 #include <fcitx-config/option.h>
+#include <fcitx-config/rawconfig.h>
 #include <fcitx-utils/i18n.h>
 #include <fcitx-utils/stringutils.h>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace fcitx {
 
@@ -60,7 +66,7 @@ struct InputMethodConstrain {
         }
         return std::find(list.begin(), list.end(), name) != list.end();
     }
-    void dumpDescription(RawConfig &) const {}
+    void dumpDescription(RawConfig & /*unused*/) const {}
 
 protected:
     const InputMethodOption *option_;