Clang-tidy on dbus addon

Author: wengxt

src/modules/dbus/dbusmodule.cpp

@@ -8,15 +8,33 @@
 #include "config.h"
 
 #include <pwd.h>
-#include <fstream>
+#include <unistd.h>
+#include <cstdint>
+#include <memory>
 #include <set>
 #include <sstream>
+#include <stdexcept>
+#include <string>
+#include <tuple>
+#include <unordered_set>
+#include <utility>
+#include <vector>
 #include <format>
+#include "fcitx-config/configuration.h"
 #include "fcitx-config/dbushelper.h"
+#include "fcitx-config/rawconfig.h"
 #include "fcitx-utils/dbus/bus.h"
+#include "fcitx-utils/dbus/message.h"
+#include "fcitx-utils/dbus/objectvtable.h"
 #include "fcitx-utils/dbus/variant.h"
+#include "fcitx-utils/eventloopinterface.h"
 #include "fcitx-utils/i18n.h"
+#include "fcitx-utils/log.h"
+#include "fcitx-utils/misc.h"
 #include "fcitx-utils/stringutils.h"
+#include "fcitx-utils/unixfd.h"
+#include "fcitx/addoninfo.h"
+#include "fcitx/addoninstance.h"
 #include "fcitx/addonmanager.h"
 #include "fcitx/focusgroup.h"
 #include "fcitx/inputcontextmanager.h"
@@ -27,6 +45,8 @@
 #include "dbusmodule.h"
 #include "keyboard_public.h"
 #ifdef ENABLE_X11
+#include <xcb/xcb.h>
+#include <xcb/xproto.h>
 #include "xcb_public.h"
 #endif
 #ifdef WAYLAND_FOUND
@@ -143,24 +163,28 @@ class Controller1 : public ObjectVTable<Controller1> {
             });
     }
     void configure() { instance_->configure(); }
-    void configureAddon(const std::string &) { instance_->configure(); }
-    void configureInputMethod(const std::string &) { instance_->configure(); }
+    void configureAddon(const std::string & /*unused*/) {
+        instance_->configure();
+    }
+    void configureInputMethod(const std::string & /*unused*/) {
+        instance_->configure();
+    }
     std::string currentUI() { return instance_->currentUI(); }
     std::string addonForInputMethod(const std::string &imName) {
         return instance_->addonForInputMethod(imName);
     }
-    void activate() { return instance_->activate(); }
-    void deactivate() { return instance_->deactivate(); }
-    void toggle() { return instance_->toggle(); }
-    void resetInputMethodList() { return instance_->resetInputMethodList(); }
+    void activate() { instance_->activate(); }
+    void deactivate() { instance_->deactivate(); }
+    void toggle() { instance_->toggle(); }
+    void resetInputMethodList() { instance_->resetInputMethodList(); }
     int state() { return instance_->state(); }
-    void reloadConfig() { return instance_->reloadConfig(); }
+    void reloadConfig() { instance_->reloadConfig(); }
     void reloadAddonConfig(const std::string &addonName) {
-        return instance_->reloadAddonConfig(addonName);
+        instance_->reloadAddonConfig(addonName);
     }
     std::string currentInputMethod() { return instance_->currentInputMethod(); }
     void setCurrentInputMethod(const std::string &imName) {
-        return instance_->setCurrentInputMethod(imName);
+        instance_->setCurrentInputMethod(imName);
     }
 
     std::vector<std::string> inputMethodGroups() {
@@ -463,9 +487,9 @@ class Controller1 : public ObjectVTable<Controller1> {
                     continue;
                 }
                 bool enabled = info->isDefaultEnabled();
-                if (disabledSet.count(info->uniqueName())) {
+                if (disabledSet.contains(info->uniqueName())) {
                     enabled = false;
-                } else if (enabledSet.count(info->uniqueName())) {
+                } else if (enabledSet.contains(info->uniqueName())) {
                     enabled = true;
                 }
                 result.emplace_back(info->uniqueName(), info->name().match(),
@@ -502,9 +526,9 @@ class Controller1 : public ObjectVTable<Controller1> {
                     continue;
                 }
                 bool enabled = info->isDefaultEnabled();
-                if (disabledSet.count(info->uniqueName())) {
+                if (disabledSet.contains(info->uniqueName())) {
                     enabled = false;
-                } else if (enabledSet.count(info->uniqueName())) {
+                } else if (enabledSet.contains(info->uniqueName())) {
                     enabled = true;
                 }
                 result.emplace_back(info->uniqueName(), info->name().match(),
@@ -629,7 +653,7 @@ class Controller1 : public ObjectVTable<Controller1> {
         std::stringstream ss;
         instance_->inputContextManager().foreachGroup([&ss](FocusGroup *group) {
             ss << "Group [" << group->display() << "] has " << group->size()
-               << " InputContext(s)" << std::endl;
+               << " InputContext(s)" << '\n';
             group->foreach([&ss](InputContext *ic) {
                 ss << "  IC [";
                 for (auto v : ic->uuid()) {
@@ -639,12 +663,12 @@ class Controller1 : public ObjectVTable<Controller1> {
                    << " frontend:" << ic->frontendName() << " cap:"
                    << std::format("{:x}",
                                   static_cast<uint64_t>(ic->capabilityFlags()))
-                   << " focus:" << ic->hasFocus() << std::endl;
+                   << " focus:" << ic->hasFocus() << '\n';
                 return true;
             });
             return true;
         });
-        ss << "Input Context without group" << std::endl;
+        ss << "Input Context without group" << '\n';
         instance_->inputContextManager().foreach([&ss](InputContext *ic) {
             if (ic->focusGroup()) {
                 return true;
@@ -658,7 +682,7 @@ class Controller1 : public ObjectVTable<Controller1> {
             }
             ss << "] program:" << ic->program()
                << " frontend:" << ic->frontendName()
-               << " focus:" << ic->hasFocus() << std::endl;
+               << " focus:" << ic->hasFocus() << '\n';
             return true;
         });
         return ss.str();
@@ -677,7 +701,7 @@ class Controller1 : public ObjectVTable<Controller1> {
 
     bool canRestart() { return instance_->canRestart(); }
 
-    void save() { return instance_->save(); }
+    void save() { instance_->save(); }
 
     void setLogRule(const std::string &rule) { Log::setLogRule(rule); }
 

src/modules/dbus/dbusmodule.h

@@ -7,9 +7,13 @@
 #ifndef _FCITX_MODULES_DBUS_DBUSMODULE_H_
 #define _FCITX_MODULES_DBUS_DBUSMODULE_H_
 
+#include <memory>
+#include <string>
+#include "fcitx-utils/dbus/bus.h"
 #include "fcitx-utils/dbus/servicewatcher.h"
-#include "fcitx/addonfactory.h"
+#include "fcitx-utils/handlertable.h"
 #include "fcitx/addoninstance.h"
+#include "fcitx/addonmanager.h"
 #include "fcitx/instance.h"
 #include "dbus_public.h"