yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kcmkwin/kwinrules] Don't include kdeglobals in rules config

Browse source 
Summary:
There's nothing relevant in kdeglobals and loading it can lead to noise
when deleting groups that override a system default.

We still cascade which will allow kiosk keys to work as well as relevant
system defaults.

Import/Export is unchanged as that already uses SimpleConfig which
includes this flag.

I don't know if it will fix the relevant issue in the bug or just
reduce noise.

CCBUG: 402139

Test Plan: Compiled.

Reviewers: #kwin, zzag

Reviewed By: #kwin, zzag

Subscribers: zzag, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D17645
This commit is contained in:
David Edmundson 2018-12-19 13:07:23 +00:00
parent b07ba3baa3
commit f3060723e1
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/update_default_rules.cpp
View file

@ -40,7 +40,7 @@ int main( int argc, char* argv[] )
return 1; return 1;
} }
KConfig src_cfg( file ); KConfig src_cfg( file );
KConfig dest_cfg( "kwinrulesrc" ); KConfig dest_cfg("kwinrulesrc", KConfig::NoGlobals);
KConfigGroup scg(&src_cfg, "General"); KConfigGroup scg(&src_cfg, "General");
KConfigGroup dcg(&dest_cfg, "General"); KConfigGroup dcg(&dest_cfg, "General");
int count = scg.readEntry( "count", 0 ); int count = scg.readEntry( "count", 0 );

2
kcmkwin/kwinrules/kcm.cpp
View file

@ -39,7 +39,7 @@ namespace KWin
KCMRules::KCMRules(QWidget *parent, const QVariantList &) KCMRules::KCMRules(QWidget *parent, const QVariantList &)
: KCModule(parent) : KCModule(parent)
, config("kwinrulesrc") , config("kwinrulesrc", KConfig::NoGlobals)
{ {
QVBoxLayout *layout = new QVBoxLayout(this); QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0); layout->setMargin(0);

4
kcmkwin/kwinrules/main.cpp
View file

@ -36,7 +36,7 @@ namespace KWin
static void loadRules(QList< Rules* >& rules) static void loadRules(QList< Rules* >& rules)
{ {
KConfig _cfg("kwinrulesrc"); KConfig _cfg("kwinrulesrc", KConfig::NoGlobals);
KConfigGroup cfg(&_cfg, "General"); KConfigGroup cfg(&_cfg, "General");
int count = cfg.readEntry("count", 0); int count = cfg.readEntry("count", 0);
for (int i = 1; for (int i = 1;
@ -50,7 +50,7 @@ static void loadRules(QList< Rules* >& rules)
static void saveRules(const QList< Rules* >& rules) static void saveRules(const QList< Rules* >& rules)
{ {
KConfig cfg("kwinrulesrc"); KConfig cfg("kwinrulesrc", KConfig::NoGlobals);
QStringList groups = cfg.groupList(); QStringList groups = cfg.groupList();
for (QStringList::ConstIterator it = groups.constBegin(); for (QStringList::ConstIterator it = groups.constBegin();
it != groups.constEnd(); it != groups.constEnd();