Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 18:32:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

polkit-kde-kcmmodules-1: adjust to Katie changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-02-01 17:35:46 +00:00
parent fab0e84020
commit 68264dba9d
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
polkit-kde-kcmodules-1/helper/policy-gen/policy-gen.cpp
View file

@ -66,7 +66,14 @@ QList<Action> parse(QSettings &ini)
descriptionExp.setCaseSensitivity(Qt::CaseInsensitive);
nameExp.setCaseSensitivity(Qt::CaseInsensitive);
#ifndef QT_KATIE
foreach(const QString &name, ini.childGroups()) {
#else
foreach(const QString &name, ini.keys()) {
if (name.contains("/")) {
continue;
}
#endif
Action action;
if (name == "Domain") {
@ -81,7 +88,11 @@ QList<Action> parse(QSettings &ini)
action.name = name;
ini.beginGroup(name);
#ifndef QT_KATIE
foreach(const QString &key, ini.childKeys()) {
#else
foreach(const QString &key, ini.groupKeys()) {
#endif
if (descriptionExp.exactMatch(key)) {
QString lang = descriptionExp.capturedTexts().at(1);
@ -133,7 +144,9 @@ QHash<QString, QString> parseDomain(QSettings& ini)
{
QHash<QString, QString> rethash;
#ifndef QT_KATIE
if (ini.childGroups().contains("Domain")) {
#endif
if (ini.contains("Domain/Name")) {
rethash["vendor"] = ini.value("Domain/Name").toString();
}
@ -143,7 +156,9 @@ QHash<QString, QString> parseDomain(QSettings& ini)
if (ini.contains("Domain/Icon")) {
rethash["icon"] = ini.value("Domain/Icon").toString();
}
#ifndef QT_KATIE
}
#endif
return rethash;
}