move static addons to v2

Author: eagleoflqj

common/common.cpp

@@ -1,9 +1,7 @@
 #include "common.h"
 #include "../engines/fcitx5-hallelujah/src/factory.h"
 #include "../fcitx5/src/lib/fcitx/addoninstance.h"
-#include "../iosfrontend/iosfrontend.h"
-#include "../iosnotifications/iosnotifications.h"
-#include "../uipanel/uipanel.h"
+#include "../fcitx5/src/lib/fcitx/addonmanager.h"
 #include "nativestreambuf.h"
 #include <filesystem>
 
@@ -15,23 +13,17 @@ fcitx::HallelujahFactory HallelujahFactory;
 
 namespace fs = std::filesystem;
 
-static fcitx::IosFrontendFactory IosFrontendFactory;
-static fcitx::IosNotificationsFactory IosNotificationsFactory;
-static fcitx::UIPanelFactory UIPanelFactory;
-
 static fcitx::StaticAddonRegistry addons = {
 #ifdef HALLELUJAH
     std::make_pair<std::string, fcitx::AddonFactory *>("hallelujah",
                                                        &HallelujahFactory),
 #endif
-    std::make_pair<std::string, fcitx::AddonFactory *>("iosfrontend",
-                                                       &IosFrontendFactory),
-    std::make_pair<std::string, fcitx::AddonFactory *>(
-        "notifications", &IosNotificationsFactory),
-    std::make_pair<std::string, fcitx::AddonFactory *>("uipanel",
-                                                       &UIPanelFactory),
 };
 
+FCITX_IMPORT_ADDON_FACTORY(addons, iosfrontend);
+FCITX_IMPORT_ADDON_FACTORY(addons, notifications);
+FCITX_IMPORT_ADDON_FACTORY(addons, uipanel);
+
 #ifdef HALLELUJAH
 FCITX_IMPORT_ADDON_FACTORY(addons, spell);
 #endif

iosfrontend/iosfrontend.cpp

@@ -53,3 +53,5 @@ void IosInputContext::updatePreeditImpl() {
                                    preedit.cursor());
 }
 } // namespace fcitx
+
+FCITX_ADDON_FACTORY_V2(iosfrontend, fcitx::IosFrontendFactory);

iosnotifications/iosnotifications.cpp

@@ -29,3 +29,5 @@ void Notifications::closeNotification(uint64_t internalId) {
     FCITX_INFO() << "closeNotification " << internalId;
 }
 } // namespace fcitx
+
+FCITX_ADDON_FACTORY_V2(notifications, fcitx::IosNotificationsFactory);

uipanel/uipanel.cpp

@@ -74,6 +74,8 @@ void UIPanel::updateStatusArea(InputContext *ic) {
 
 } // namespace fcitx
 
+FCITX_ADDON_FACTORY_V2(uipanel, fcitx::UIPanelFactory);
+
 void selectCandidate(int index) {
     with_fcitx([index] {
         auto ic = instance->mostRecentInputContext();