diff options
Diffstat (limited to 'src/core/kcoreconfigskeleton.cpp')
-rw-r--r-- | src/core/kcoreconfigskeleton.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/core/kcoreconfigskeleton.cpp b/src/core/kcoreconfigskeleton.cpp index 69a4bf04..04b8b071 100644 --- a/src/core/kcoreconfigskeleton.cpp +++ b/src/core/kcoreconfigskeleton.cpp @@ -1073,17 +1073,17 @@ void KCoreConfigSkeleton::read() for (it = d->mItems.constBegin(); it != d->mItems.constEnd(); ++it) { (*it)->readConfig(d->mConfig.data()); } - usrReadConfig(); + usrRead(); } -bool KCoreConfigSkeleton::writeConfig() +bool KCoreConfigSkeleton::save() { //qDebug(); KConfigSkeletonItem::List::ConstIterator it; for (it = d->mItems.constBegin(); it != d->mItems.constEnd(); ++it) { (*it)->writeConfig(d->mConfig.data()); } - if (!usrWriteConfig()) { + if (!usrSave()) { return false; } @@ -1091,7 +1091,6 @@ bool KCoreConfigSkeleton::writeConfig() if (!d->mConfig->sync()) { return false; } - load(); emit configChanged(); } return true; @@ -1106,10 +1105,26 @@ void KCoreConfigSkeleton::usrSetDefaults() { } +void KCoreConfigSkeleton::usrRead() +{ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + usrReadConfig(); +#pragma GCC diagnostic pop +} + void KCoreConfigSkeleton::usrReadConfig() { } +bool KCoreConfigSkeleton::usrSave() +{ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + return usrWriteConfig(); +#pragma GCC diagnostic pop +} + bool KCoreConfigSkeleton::usrWriteConfig() { return true; |