From 1e096467917566cf20690e766eaf3651b01f4356 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 22 Jan 2018 06:35:04 +0100 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- effects/slide/slide_config.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/slide/slide_config.desktop b/effects/slide/slide_config.desktop index c39faa38b9..cb884e504d 100644 --- a/effects/slide/slide_config.desktop +++ b/effects/slide/slide_config.desktop @@ -42,6 +42,7 @@ Name[ml]=തെന്നിമാറുക Name[mr]=सरकणे Name[nds]=Glieden Name[nl]=Schuiven +Name[nn]=Skliding Name[pa]=ਸਲਾਈਡ Name[pl]=Slajd Name[pt]=Deslizar From 2c7b1cf76206541fbebeeb19ab22a928895f1819 Mon Sep 17 00:00:00 2001 From: Jaime Torres Date: Mon, 22 Jan 2018 20:15:01 +0100 Subject: [PATCH 2/2] From 22% of cpu in hasTransientInternal to 0.2x% Summary: According to callgrind, checking kwin in release with debug symbols, 22% of cpu time in the method hasTransientInternal is spent doing a cast to Client *, while at the begining of the method, the cast to const Client * only uses 1.0x%. Test Plan: The workload was just show 50 messagebox copying small files and being unable to change the permissions. Reviewers: #kwin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D9982 --- group.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group.cpp b/group.cpp index f39c553fcd..a4c4b0a9fc 100644 --- a/group.cpp +++ b/group.cpp @@ -726,7 +726,7 @@ bool Client::hasTransientInternal(const Client* cl, bool indirect, ConstClientLi for (auto it = transients().constBegin(); it != transients().constEnd(); ++it) { - Client *c = dynamic_cast(*it); + const Client *c = qobject_cast(*it); if (!c) { continue; }