Skip to content

replace stringutils::startsWith; fcitx 5.1.17 #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eagleoflqj merged 1 commit into from
Dec 22, 2025
Merged

replace stringutils::startsWith; fcitx 5.1.17 #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fcitx5
Open in desktop
Submodule fcitx5 updated 52 files
+2 −2 CMakeLists.txt
+1 −1 README.md
+1 −0 data/org.fcitx.Fcitx5.metainfo.xml.in
+18 −17 po/ca.po
+18 −17 po/da.po
+18 −17 po/de.po
+18 −17 po/es.po
+18 −17 po/fcitx5.pot
+19 −18 po/fr.po
+18 −17 po/he.po
+15 −15 po/ja.po
+20 −19 po/ko.po
+19 −19 po/ru.po
+18 −17 po/vi.po
+22 −20 po/zh_CN.po
+19 −18 po/zh_TW.po
+1 −1 src/frontend/waylandim/waylandim.h
+1 −1 src/frontend/waylandim/waylandimserverv2.cpp
+1 −1 src/lib/fcitx-config/configuration.cpp
+2 −2 src/lib/fcitx-utils/dbus/bus.h
+1 −1 src/lib/fcitx-utils/dbus/servicewatcher.h
+1 −1 src/lib/fcitx-utils/eventloopinterface.h
+1 −1 src/lib/fcitx-utils/fs.cpp
+2 −2 src/lib/fcitx-utils/inputbuffer.h
+1 −1 src/lib/fcitx-utils/keylist
+1 −1 src/lib/fcitx-utils/keysymgen.h
+1 −1 src/lib/fcitx-utils/signals.h
+1 −1 src/lib/fcitx-utils/unixfd.h
+1 −1 src/lib/fcitx-utils/uuid_p.h
+1 −1 src/lib/fcitx-wayland/input-method-v2/input-method-unstable-v2.xml
+1 −1 src/lib/fcitx/action.h
+1 −1 src/lib/fcitx/candidatelist.h
+1 −1 src/lib/fcitx/inputcontextmanager.h
+2 −2 src/lib/fcitx/inputcontextproperty.h
+1 −1 src/lib/fcitx/inputmethodentry.h
+1 −1 src/lib/fcitx/inputmethodmanager.cpp
+1 −1 src/lib/fcitx/inputmethodmanager.h
+1 −1 src/lib/fcitx/userinterfacemanager.h
+2 −2 src/modules/clipboard/waylandclipboard.h
+1 −1 src/modules/notificationitem/dbusmenu.cpp
+119 −61 src/modules/notificationitem/notificationitem.cpp
+8 −2 src/modules/notificationitem/notificationitem.h
+38 −4 src/modules/notifications/notifications.cpp
+17 −0 src/modules/notifications/notifications.h
+1 −1 src/modules/spell/spell-custom-dict.cpp
+54 −16 src/modules/wayland/waylandmodule.cpp
+1 −1 src/modules/xcb/xcbconnection.cpp
+2 −2 src/ui/classic/theme.cpp
+1 −1 src/ui/classic/waylandcursor.cpp
+1 −1 src/ui/classic/xcbmenu.cpp
+2 −2 src/ui/classic/xcbtraywindow.cpp
+1 −1 src/ui/kimpanel/kimpanel.cpp
9 changes: 4 additions & 5 deletions src/config/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ std::string getConfig(const std::string &uri) {
if (uri == globalConfigPath) {
auto &config = fcitx.instance()->globalConfig().config();
return configToJson(config);
} else if (fcitx::stringutils::startsWith(uri,
addonConfigPrefix)) {
} else if (uri.starts_with(addonConfigPrefix)) {
auto [addonName, subPath] = parseAddonUri(uri);
auto *addonInfo = fcitx.addonMgr().addonInfo(addonName);
if (!addonInfo) {
Expand All @@ -55,7 +54,7 @@ std::string getConfig(const std::string &uri) {
addonName + "\""}};
}
return configToJson(*config);
} else if (fcitx::stringutils::startsWith(uri, imConfigPrefix)) {
} else if (uri.starts_with(imConfigPrefix)) {
auto imName = uri.substr(sizeof(imConfigPrefix) - 1);
auto *entry =
fcitx.instance()->inputMethodManager().entry(imName);
Expand Down Expand Up @@ -102,7 +101,7 @@ bool setConfig(const char *uri_, const char *json_) {
return false;
}
});
} else if (fcitx::stringutils::startsWith(uri, addonConfigPrefix)) {
} else if (uri.starts_with(addonConfigPrefix)) {
return with_fcitx([&](Fcitx &fcitx) {
auto [addonName, subPath] = parseAddonUri(uri);
auto *addon =
Expand All @@ -120,7 +119,7 @@ bool setConfig(const char *uri_, const char *json_) {
return false;
}
});
} else if (fcitx::stringutils::startsWith(uri, imConfigPrefix)) {
} else if (uri.starts_with(imConfigPrefix)) {
return with_fcitx([&](Fcitx &fcitx) {
auto im = uri.substr(sizeof(imConfigPrefix) - 1);
const auto *entry =
Expand Down
Loading