From 5d2ed13479a480111355657bf22324118fa576e9 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Wed, 24 Apr 2019 16:20:56 +0200 Subject: Add Notify capability to KConfigXT Lets you specify Notifiers= in .kcfg for config entries that should be written with Notify flag, i.e. announce the change to KConfigWatcher Differential Revision: https://phabricator.kde.org/D20196 --- src/core/kcoreconfigskeleton.cpp | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) (limited to 'src/core/kcoreconfigskeleton.cpp') diff --git a/src/core/kcoreconfigskeleton.cpp b/src/core/kcoreconfigskeleton.cpp index 50f91e93..384efdb4 100644 --- a/src/core/kcoreconfigskeleton.cpp +++ b/src/core/kcoreconfigskeleton.cpp @@ -110,6 +110,16 @@ QString KConfigSkeletonItem::whatsThis() const return d->mWhatsThis; } +void KConfigSkeletonItem::setWriteFlags(KConfigBase::WriteConfigFlags flags) +{ + d->mWriteFlags = flags; +} + +KConfigBase::WriteConfigFlags KConfigSkeletonItem::writeFlags() const +{ + return d->mWriteFlags; +} + QVariant KConfigSkeletonItem::minValue() const { return QVariant(); @@ -144,13 +154,13 @@ void KCoreConfigSkeleton::ItemString::writeConfig(KConfig *config) if (mReference != mLoadedValue) { // WABA: Is this test needed? KConfigGroup cg(config, mGroup); if ((mDefault == mReference) && !cg.hasDefault(mKey)) { - cg.revertToDefault(mKey); + cg.revertToDefault(mKey, writeFlags()); } else if (mType == Path) { - cg.writePathEntry(mKey, mReference); + cg.writePathEntry(mKey, mReference, writeFlags()); } else if (mType == Password) { - cg.writeEntry(mKey, obscuredString(mReference)); + cg.writeEntry(mKey, obscuredString(mReference), writeFlags()); } else { - cg.writeEntry(mKey, mReference); + cg.writeEntry(mKey, mReference, writeFlags()); } mLoadedValue = mReference; } @@ -215,9 +225,9 @@ void KCoreConfigSkeleton::ItemUrl::writeConfig(KConfig *config) if (mReference != mLoadedValue) { // WABA: Is this test needed? KConfigGroup cg(config, mGroup); if ((mDefault == mReference) && !cg.hasDefault(mKey)) { - cg.revertToDefault(mKey); + cg.revertToDefault(mKey, writeFlags()); } else { - cg.writeEntry(mKey, mReference.toString()); + cg.writeEntry(mKey, mReference.toString(), writeFlags()); } mLoadedValue = mReference; } @@ -479,11 +489,11 @@ void KCoreConfigSkeleton::ItemEnum::writeConfig(KConfig *config) if (mReference != mLoadedValue) { // WABA: Is this test needed? KConfigGroup cg(config, mGroup); if ((mDefault == mReference) && !cg.hasDefault(mKey)) { - cg.revertToDefault(mKey); + cg.revertToDefault(mKey, writeFlags()); } else if ((mReference >= 0) && (mReference < mChoices.count())) { - cg.writeEntry(mKey, mChoices[mReference].name); + cg.writeEntry(mKey, mChoices[mReference].name, writeFlags()); } else { - cg.writeEntry(mKey, mReference); + cg.writeEntry(mKey, mReference, writeFlags()); } mLoadedValue = mReference; } @@ -879,10 +889,10 @@ void KCoreConfigSkeleton::ItemPathList::writeConfig(KConfig *config) if (mReference != mLoadedValue) { // WABA: Is this test needed? KConfigGroup cg(config, mGroup); if ((mDefault == mReference) && !cg.hasDefault(mKey)) { - cg.revertToDefault(mKey); + cg.revertToDefault(mKey, writeFlags()); } else { QStringList sl = mReference; - cg.writePathEntry(mKey, sl); + cg.writePathEntry(mKey, sl, writeFlags()); } mLoadedValue = mReference; } @@ -921,13 +931,13 @@ void KCoreConfigSkeleton::ItemUrlList::writeConfig(KConfig *config) if (mReference != mLoadedValue) { // WABA: Is this test needed? KConfigGroup cg(config, mGroup); if ((mDefault == mReference) && !cg.hasDefault(mKey)) { - cg.revertToDefault(mKey); + cg.revertToDefault(mKey, writeFlags()); } else { QStringList strList; for (const QUrl &url : qAsConst(mReference)) { strList.append(url.toString()); } - cg.writeEntry(mKey, strList); + cg.writeEntry(mKey, strList, writeFlags()); } mLoadedValue = mReference; } -- cgit v1.2.1