diff --git a/.gitignore b/.gitignore index 7309055..3d7b508 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.* *~ build/* *.kdev4 diff --git a/qt5/dbusaddons/fcitxqtcontrollerproxy.cpp b/qt5/dbusaddons/fcitxqtcontrollerproxy.cpp index 5539b15..e89d4f3 100644 --- a/qt5/dbusaddons/fcitxqtcontrollerproxy.cpp +++ b/qt5/dbusaddons/fcitxqtcontrollerproxy.cpp @@ -1,8 +1,10 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtcontrollerproxy -c FcitxQtControllerProxy interfaces/org.fcitx.Fcitx.Controller1.xml -i fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtcontrollerproxy -c + * FcitxQtControllerProxy interfaces/org.fcitx.Fcitx.Controller1.xml -i + * fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd. * * This is an auto-generated file. * This file may have been hand-edited. Look for HAND-EDIT comments diff --git a/qt5/dbusaddons/fcitxqtcontrollerproxy.h b/qt5/dbusaddons/fcitxqtcontrollerproxy.h index a87df3a..4c144c0 100644 --- a/qt5/dbusaddons/fcitxqtcontrollerproxy.h +++ b/qt5/dbusaddons/fcitxqtcontrollerproxy.h @@ -1,8 +1,10 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtcontrollerproxy -c FcitxQtControllerProxy interfaces/org.fcitx.Fcitx.Controller1.xml -i fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtcontrollerproxy -c + * FcitxQtControllerProxy interfaces/org.fcitx.Fcitx.Controller1.xml -i + * fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd. * * This is an auto-generated file. * Do not edit! All changes made to it will be lost. @@ -116,6 +118,34 @@ public Q_SLOTS: // METHODS return asyncCallWithArgumentList(QStringLiteral("Exit"), argumentList); } + inline QDBusPendingReply + FullInputMethodGroupInfo(const QString &in0) { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList( + QStringLiteral("FullInputMethodGroupInfo"), argumentList); + } + inline QDBusReply FullInputMethodGroupInfo( + const QString &in0, QString &defaultInputMethod, QString &defaultLayout, + QVariantMap &properties, + FcitxQtFullInputMethodEntryList &inputMethodEntryList) { + QList argumentList; + argumentList << QVariant::fromValue(in0); + QDBusMessage reply = callWithArgumentList( + QDBus::Block, QStringLiteral("FullInputMethodGroupInfo"), + argumentList); + if (reply.type() == QDBusMessage::ReplyMessage && + reply.arguments().count() == 5) { + defaultInputMethod = qdbus_cast(reply.arguments().at(1)); + defaultLayout = qdbus_cast(reply.arguments().at(2)); + properties = qdbus_cast(reply.arguments().at(3)); + inputMethodEntryList = qdbus_cast( + reply.arguments().at(4)); + } + return reply; + } + inline QDBusPendingReply GetAddons() { QList argumentList; diff --git a/qt5/dbusaddons/fcitxqtdbustypes.cpp b/qt5/dbusaddons/fcitxqtdbustypes.cpp index fbccc77..0795c80 100644 --- a/qt5/dbusaddons/fcitxqtdbustypes.cpp +++ b/qt5/dbusaddons/fcitxqtdbustypes.cpp @@ -21,6 +21,7 @@ void registerFcitxQtDBusTypes() { FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtFormattedPreedit); FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtStringKeyValue); FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtInputMethodEntry); + FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtFullInputMethodEntry); FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtLayoutInfo); FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtVariantInfo); FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtConfigOption); @@ -108,6 +109,43 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, return argument; } +QDBusArgument &operator<<(QDBusArgument &argument, + const FcitxQtFullInputMethodEntry &arg) { + argument.beginStructure(); + argument << arg.uniqueName(); + argument << arg.name(); + argument << arg.nativeName(); + argument << arg.icon(); + argument << arg.label(); + argument << arg.languageCode(); + argument << arg.addon(); + argument << arg.configurable(); + argument << arg.properties(); + argument.endStructure(); + return argument; +} + +const QDBusArgument &operator>>(const QDBusArgument &argument, + FcitxQtFullInputMethodEntry &arg) { + QString uniqueName, name, nativeName, icon, label, languageCode, addon; + bool configurable; + QVariantMap properties; + argument.beginStructure(); + argument >> uniqueName >> name >> nativeName >> icon >> label >> + languageCode >> addon >> configurable >> properties; + argument.endStructure(); + arg.setUniqueName(uniqueName); + arg.setName(name); + arg.setNativeName(nativeName); + arg.setIcon(icon); + arg.setLabel(label); + arg.setLanguageCode(languageCode); + arg.setAddon(addon); + arg.setConfigurable(configurable); + arg.setProperties(properties); + return argument; +} + QDBusArgument &operator<<(QDBusArgument &argument, const FcitxQtVariantInfo &arg) { argument.beginStructure(); diff --git a/qt5/dbusaddons/fcitxqtdbustypes.h b/qt5/dbusaddons/fcitxqtdbustypes.h index 777ca0d..336f1e1 100644 --- a/qt5/dbusaddons/fcitxqtdbustypes.h +++ b/qt5/dbusaddons/fcitxqtdbustypes.h @@ -70,6 +70,18 @@ FCITX5_QT_DECLARE_FIELD(QString, languageCode, setLanguageCode); FCITX5_QT_DECLARE_FIELD(bool, configurable, setConfigurable); FCITX5_QT_END_DECLARE_DBUS_TYPE(FcitxQtInputMethodEntry); +FCITX5_QT_BEGIN_DECLARE_DBUS_TYPE(FcitxQtFullInputMethodEntry); +FCITX5_QT_DECLARE_FIELD(QString, uniqueName, setUniqueName); +FCITX5_QT_DECLARE_FIELD(QString, name, setName); +FCITX5_QT_DECLARE_FIELD(QString, nativeName, setNativeName); +FCITX5_QT_DECLARE_FIELD(QString, icon, setIcon); +FCITX5_QT_DECLARE_FIELD(QString, label, setLabel); +FCITX5_QT_DECLARE_FIELD(QString, languageCode, setLanguageCode); +FCITX5_QT_DECLARE_FIELD(QString, addon, setAddon); +FCITX5_QT_DECLARE_FIELD(bool, configurable, setConfigurable); +FCITX5_QT_DECLARE_FIELD(QVariantMap, properties, setProperties); +FCITX5_QT_END_DECLARE_DBUS_TYPE(FcitxQtFullInputMethodEntry); + FCITX5_QT_BEGIN_DECLARE_DBUS_TYPE(FcitxQtVariantInfo); FCITX5_QT_DECLARE_FIELD(QString, variant, setVariant); FCITX5_QT_DECLARE_FIELD(QString, description, setDescription); @@ -133,6 +145,9 @@ Q_DECLARE_METATYPE(fcitx::FcitxQtStringKeyValueList) Q_DECLARE_METATYPE(fcitx::FcitxQtInputMethodEntry) Q_DECLARE_METATYPE(fcitx::FcitxQtInputMethodEntryList) +Q_DECLARE_METATYPE(fcitx::FcitxQtFullInputMethodEntry) +Q_DECLARE_METATYPE(fcitx::FcitxQtFullInputMethodEntryList) + Q_DECLARE_METATYPE(fcitx::FcitxQtVariantInfo) Q_DECLARE_METATYPE(fcitx::FcitxQtVariantInfoList) diff --git a/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.cpp b/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.cpp index ff01fdf..e2b9ee7 100644 --- a/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.cpp +++ b/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.cpp @@ -1,8 +1,10 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxyimpl -c FcitxQtInputContextProxyImpl interfaces/org.fcitx.Fcitx.InputContext1.xml -i fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxyimpl -c + * FcitxQtInputContextProxyImpl interfaces/org.fcitx.Fcitx.InputContext1.xml -i + * fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd. * * This is an auto-generated file. * This file may have been hand-edited. Look for HAND-EDIT comments diff --git a/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.h b/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.h index b5e861e..fab1215 100644 --- a/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.h +++ b/qt5/dbusaddons/fcitxqtinputcontextproxyimpl.h @@ -1,8 +1,10 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxyimpl -c FcitxQtInputContextProxyImpl interfaces/org.fcitx.Fcitx.InputContext1.xml -i fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxyimpl -c + * FcitxQtInputContextProxyImpl interfaces/org.fcitx.Fcitx.InputContext1.xml -i + * fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd. * * This is an auto-generated file. * Do not edit! All changes made to it will be lost. @@ -99,13 +101,6 @@ public Q_SLOTS: // METHODS return asyncCallWithArgumentList(QStringLiteral("SelectCandidate"), argumentList); } - inline QDBusPendingReply<> SetSupportedCapability(qulonglong caps) - { - QList argumentList; - argumentList << QVariant::fromValue(caps); - return asyncCallWithArgumentList(QStringLiteral("SetSupportedCapability"), argumentList); - } - inline QDBusPendingReply<> SetCapability(qulonglong caps) { QList argumentList; @@ -127,6 +122,13 @@ public Q_SLOTS: // METHODS return asyncCallWithArgumentList(QStringLiteral("SetCursorRectV2"), argumentList); } + inline QDBusPendingReply<> SetSupportedCapability(qulonglong caps) { + QList argumentList; + argumentList << QVariant::fromValue(caps); + return asyncCallWithArgumentList( + QStringLiteral("SetSupportedCapability"), argumentList); + } + inline QDBusPendingReply<> SetSurroundingText(const QString &text, unsigned int cursor, unsigned int anchor) { diff --git a/qt5/dbusaddons/fcitxqtinputmethodproxy.cpp b/qt5/dbusaddons/fcitxqtinputmethodproxy.cpp index cfebdd9..dd8d2a8 100644 --- a/qt5/dbusaddons/fcitxqtinputmethodproxy.cpp +++ b/qt5/dbusaddons/fcitxqtinputmethodproxy.cpp @@ -1,8 +1,10 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtinputmethodproxy -c FcitxQtInputMethodProxy interfaces/org.fcitx.Fcitx.InputMethod1.xml -i fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputmethodproxy -c + * FcitxQtInputMethodProxy interfaces/org.fcitx.Fcitx.InputMethod1.xml -i + * fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd. * * This is an auto-generated file. * This file may have been hand-edited. Look for HAND-EDIT comments diff --git a/qt5/dbusaddons/fcitxqtinputmethodproxy.h b/qt5/dbusaddons/fcitxqtinputmethodproxy.h index b8348a9..b70287b 100644 --- a/qt5/dbusaddons/fcitxqtinputmethodproxy.h +++ b/qt5/dbusaddons/fcitxqtinputmethodproxy.h @@ -1,8 +1,10 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtinputmethodproxy -c FcitxQtInputMethodProxy interfaces/org.fcitx.Fcitx.InputMethod1.xml -i fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputmethodproxy -c + * FcitxQtInputMethodProxy interfaces/org.fcitx.Fcitx.InputMethod1.xml -i + * fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd. * * This is an auto-generated file. * Do not edit! All changes made to it will be lost. diff --git a/qt5/dbusaddons/interfaces/org.fcitx.Fcitx.Controller1.xml b/qt5/dbusaddons/interfaces/org.fcitx.Fcitx.Controller1.xml index 7ffc3ec..7faa274 100644 --- a/qt5/dbusaddons/interfaces/org.fcitx.Fcitx.Controller1.xml +++ b/qt5/dbusaddons/interfaces/org.fcitx.Fcitx.Controller1.xml @@ -41,6 +41,16 @@ + + + + + + + + + + diff --git a/qt6/dbusaddons/fcitxqtcontrollerproxy.cpp b/qt6/dbusaddons/fcitxqtcontrollerproxy.cpp index 8484374..5045bde 100644 --- a/qt6/dbusaddons/fcitxqtcontrollerproxy.cpp +++ b/qt6/dbusaddons/fcitxqtcontrollerproxy.cpp @@ -2,9 +2,9 @@ * This file was generated by qdbusxml2cpp version 0.8 * Command line was: qdbusxml2cpp -N -p fcitxqtcontrollerproxy -c * FcitxQtControllerProxy interfaces/org.fcitx.Fcitx.Controller1.xml -i - * fcitxqtdbustypes.h -i fcitx5qt5dbusaddons_export.h + * fcitxqtdbustypes.h -i fcitx5qt6dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2023 The Qt Company Ltd and other contributors. * * This is an auto-generated file. * This file may have been hand-edited. Look for HAND-EDIT comments diff --git a/qt6/dbusaddons/fcitxqtcontrollerproxy.h b/qt6/dbusaddons/fcitxqtcontrollerproxy.h index cdaf31a..70b738f 100644 --- a/qt6/dbusaddons/fcitxqtcontrollerproxy.h +++ b/qt6/dbusaddons/fcitxqtcontrollerproxy.h @@ -1,8 +1,10 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtcontrollerproxy -c FcitxQtControllerProxy interfaces/org.fcitx.Fcitx.Controller1.xml -i fcitxqtdbustypes.h -i fcitx5qt6dbusaddons_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtcontrollerproxy -c + * FcitxQtControllerProxy interfaces/org.fcitx.Fcitx.Controller1.xml -i + * fcitxqtdbustypes.h -i fcitx5qt6dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2023 The Qt Company Ltd and other contributors. * * This is an auto-generated file. * Do not edit! All changes made to it will be lost. @@ -116,6 +118,34 @@ public Q_SLOTS: // METHODS return asyncCallWithArgumentList(QStringLiteral("Exit"), argumentList); } + inline QDBusPendingReply + FullInputMethodGroupInfo(const QString &in0) { + QList argumentList; + argumentList << QVariant::fromValue(in0); + return asyncCallWithArgumentList( + QStringLiteral("FullInputMethodGroupInfo"), argumentList); + } + inline QDBusReply FullInputMethodGroupInfo( + const QString &in0, QString &defaultInputMethod, QString &defaultLayout, + QVariantMap &properties, + FcitxQtFullInputMethodEntryList &inputMethodEntryList) { + QList argumentList; + argumentList << QVariant::fromValue(in0); + QDBusMessage reply = callWithArgumentList( + QDBus::Block, QStringLiteral("FullInputMethodGroupInfo"), + argumentList); + if (reply.type() == QDBusMessage::ReplyMessage && + reply.arguments().size() == 5) { + defaultInputMethod = qdbus_cast(reply.arguments().at(1)); + defaultLayout = qdbus_cast(reply.arguments().at(2)); + properties = qdbus_cast(reply.arguments().at(3)); + inputMethodEntryList = qdbus_cast( + reply.arguments().at(4)); + } + return reply; + } + inline QDBusPendingReply GetAddons() { QList argumentList; @@ -139,7 +169,8 @@ public Q_SLOTS: // METHODS QList argumentList; argumentList << QVariant::fromValue(in0); QDBusMessage reply = callWithArgumentList(QDBus::Block, QStringLiteral("GetConfig"), argumentList); - if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) { + if (reply.type() == QDBusMessage::ReplyMessage && + reply.arguments().size() == 2) { out1 = qdbus_cast(reply.arguments().at(1)); } return reply; @@ -156,7 +187,8 @@ public Q_SLOTS: // METHODS QList argumentList; argumentList << QVariant::fromValue(in0); QDBusMessage reply = callWithArgumentList(QDBus::Block, QStringLiteral("InputMethodGroupInfo"), argumentList); - if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) { + if (reply.type() == QDBusMessage::ReplyMessage && + reply.arguments().size() == 2) { items = qdbus_cast(reply.arguments().at(1)); } return reply; diff --git a/qt6/dbusaddons/fcitxqtdbustypes.cpp b/qt6/dbusaddons/fcitxqtdbustypes.cpp index fbccc77..0795c80 100644 --- a/qt6/dbusaddons/fcitxqtdbustypes.cpp +++ b/qt6/dbusaddons/fcitxqtdbustypes.cpp @@ -21,6 +21,7 @@ void registerFcitxQtDBusTypes() { FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtFormattedPreedit); FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtStringKeyValue); FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtInputMethodEntry); + FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtFullInputMethodEntry); FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtLayoutInfo); FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtVariantInfo); FCITX5_QT_DEFINE_DBUS_TYPE(FcitxQtConfigOption); @@ -108,6 +109,43 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, return argument; } +QDBusArgument &operator<<(QDBusArgument &argument, + const FcitxQtFullInputMethodEntry &arg) { + argument.beginStructure(); + argument << arg.uniqueName(); + argument << arg.name(); + argument << arg.nativeName(); + argument << arg.icon(); + argument << arg.label(); + argument << arg.languageCode(); + argument << arg.addon(); + argument << arg.configurable(); + argument << arg.properties(); + argument.endStructure(); + return argument; +} + +const QDBusArgument &operator>>(const QDBusArgument &argument, + FcitxQtFullInputMethodEntry &arg) { + QString uniqueName, name, nativeName, icon, label, languageCode, addon; + bool configurable; + QVariantMap properties; + argument.beginStructure(); + argument >> uniqueName >> name >> nativeName >> icon >> label >> + languageCode >> addon >> configurable >> properties; + argument.endStructure(); + arg.setUniqueName(uniqueName); + arg.setName(name); + arg.setNativeName(nativeName); + arg.setIcon(icon); + arg.setLabel(label); + arg.setLanguageCode(languageCode); + arg.setAddon(addon); + arg.setConfigurable(configurable); + arg.setProperties(properties); + return argument; +} + QDBusArgument &operator<<(QDBusArgument &argument, const FcitxQtVariantInfo &arg) { argument.beginStructure(); diff --git a/qt6/dbusaddons/fcitxqtdbustypes.h b/qt6/dbusaddons/fcitxqtdbustypes.h index e115a3f..a01f5a4 100644 --- a/qt6/dbusaddons/fcitxqtdbustypes.h +++ b/qt6/dbusaddons/fcitxqtdbustypes.h @@ -70,6 +70,18 @@ FCITX5_QT_DECLARE_FIELD(QString, languageCode, setLanguageCode); FCITX5_QT_DECLARE_FIELD(bool, configurable, setConfigurable); FCITX5_QT_END_DECLARE_DBUS_TYPE(FcitxQtInputMethodEntry); +FCITX5_QT_BEGIN_DECLARE_DBUS_TYPE(FcitxQtFullInputMethodEntry); +FCITX5_QT_DECLARE_FIELD(QString, uniqueName, setUniqueName); +FCITX5_QT_DECLARE_FIELD(QString, name, setName); +FCITX5_QT_DECLARE_FIELD(QString, nativeName, setNativeName); +FCITX5_QT_DECLARE_FIELD(QString, icon, setIcon); +FCITX5_QT_DECLARE_FIELD(QString, label, setLabel); +FCITX5_QT_DECLARE_FIELD(QString, languageCode, setLanguageCode); +FCITX5_QT_DECLARE_FIELD(QString, addon, setAddon); +FCITX5_QT_DECLARE_FIELD(bool, configurable, setConfigurable); +FCITX5_QT_DECLARE_FIELD(QVariantMap, properties, setProperties); +FCITX5_QT_END_DECLARE_DBUS_TYPE(FcitxQtFullInputMethodEntry); + FCITX5_QT_BEGIN_DECLARE_DBUS_TYPE(FcitxQtVariantInfo); FCITX5_QT_DECLARE_FIELD(QString, variant, setVariant); FCITX5_QT_DECLARE_FIELD(QString, description, setDescription); @@ -133,6 +145,9 @@ Q_DECLARE_METATYPE(fcitx::FcitxQtStringKeyValueList) Q_DECLARE_METATYPE(fcitx::FcitxQtInputMethodEntry) Q_DECLARE_METATYPE(fcitx::FcitxQtInputMethodEntryList) +Q_DECLARE_METATYPE(fcitx::FcitxQtFullInputMethodEntry) +Q_DECLARE_METATYPE(fcitx::FcitxQtFullInputMethodEntryList) + Q_DECLARE_METATYPE(fcitx::FcitxQtVariantInfo) Q_DECLARE_METATYPE(fcitx::FcitxQtVariantInfoList) diff --git a/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.cpp b/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.cpp index f945ae5..aee39a8 100644 --- a/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.cpp +++ b/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.cpp @@ -1,8 +1,10 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxyimpl -c FcitxQtInputContextProxyImpl interfaces/org.fcitx.Fcitx.InputContext1.xml -i fcitxqtdbustypes.h -i fcitx5qt6dbusaddons_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxyimpl -c + * FcitxQtInputContextProxyImpl interfaces/org.fcitx.Fcitx.InputContext1.xml -i + * fcitxqtdbustypes.h -i fcitx5qt6dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2023 The Qt Company Ltd and other contributors. * * This is an auto-generated file. * This file may have been hand-edited. Look for HAND-EDIT comments diff --git a/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.h b/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.h index ce83a4f..379a220 100644 --- a/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.h +++ b/qt6/dbusaddons/fcitxqtinputcontextproxyimpl.h @@ -1,8 +1,10 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxyimpl -c FcitxQtInputContextProxyImpl interfaces/org.fcitx.Fcitx.InputContext1.xml -i fcitxqtdbustypes.h -i fcitx5qt6dbusaddons_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxyimpl -c + * FcitxQtInputContextProxyImpl interfaces/org.fcitx.Fcitx.InputContext1.xml -i + * fcitxqtdbustypes.h -i fcitx5qt6dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2023 The Qt Company Ltd and other contributors. * * This is an auto-generated file. * Do not edit! All changes made to it will be lost. @@ -99,13 +101,6 @@ public Q_SLOTS: // METHODS return asyncCallWithArgumentList(QStringLiteral("SelectCandidate"), argumentList); } - inline QDBusPendingReply<> SetSupportedCapability(qulonglong caps) - { - QList argumentList; - argumentList << QVariant::fromValue(caps); - return asyncCallWithArgumentList(QStringLiteral("SetSupportedCapability"), argumentList); - } - inline QDBusPendingReply<> SetCapability(qulonglong caps) { QList argumentList; @@ -127,6 +122,13 @@ public Q_SLOTS: // METHODS return asyncCallWithArgumentList(QStringLiteral("SetCursorRectV2"), argumentList); } + inline QDBusPendingReply<> SetSupportedCapability(qulonglong caps) { + QList argumentList; + argumentList << QVariant::fromValue(caps); + return asyncCallWithArgumentList( + QStringLiteral("SetSupportedCapability"), argumentList); + } + inline QDBusPendingReply<> SetSurroundingText(const QString &text, unsigned int cursor, unsigned int anchor) { diff --git a/qt6/dbusaddons/fcitxqtinputmethodproxy.cpp b/qt6/dbusaddons/fcitxqtinputmethodproxy.cpp index 7198a05..6d6a7fc 100644 --- a/qt6/dbusaddons/fcitxqtinputmethodproxy.cpp +++ b/qt6/dbusaddons/fcitxqtinputmethodproxy.cpp @@ -1,8 +1,10 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtinputmethodproxy -c FcitxQtInputMethodProxy interfaces/org.fcitx.Fcitx.InputMethod1.xml -i fcitxqtdbustypes.h -i fcitx5qt6dbusaddons_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputmethodproxy -c + * FcitxQtInputMethodProxy interfaces/org.fcitx.Fcitx.InputMethod1.xml -i + * fcitxqtdbustypes.h -i fcitx5qt6dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2023 The Qt Company Ltd and other contributors. * * This is an auto-generated file. * This file may have been hand-edited. Look for HAND-EDIT comments diff --git a/qt6/dbusaddons/fcitxqtinputmethodproxy.h b/qt6/dbusaddons/fcitxqtinputmethodproxy.h index e046ab4..88e3dd9 100644 --- a/qt6/dbusaddons/fcitxqtinputmethodproxy.h +++ b/qt6/dbusaddons/fcitxqtinputmethodproxy.h @@ -1,8 +1,10 @@ /* * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -N -p fcitxqtinputmethodproxy -c FcitxQtInputMethodProxy interfaces/org.fcitx.Fcitx.InputMethod1.xml -i fcitxqtdbustypes.h -i fcitx5qt6dbusaddons_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputmethodproxy -c + * FcitxQtInputMethodProxy interfaces/org.fcitx.Fcitx.InputMethod1.xml -i + * fcitxqtdbustypes.h -i fcitx5qt6dbusaddons_export.h * - * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd. + * qdbusxml2cpp is Copyright (C) 2023 The Qt Company Ltd and other contributors. * * This is an auto-generated file. * Do not edit! All changes made to it will be lost. @@ -51,7 +53,8 @@ public Q_SLOTS: // METHODS QList argumentList; argumentList << QVariant::fromValue(in0); QDBusMessage reply = callWithArgumentList(QDBus::Block, QStringLiteral("CreateInputContext"), argumentList); - if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) { + if (reply.type() == QDBusMessage::ReplyMessage && + reply.arguments().size() == 2) { out1 = qdbus_cast(reply.arguments().at(1)); } return reply;