diff options
| author | David Faure <faure@kde.org> | 2014-02-23 12:11:12 +0100 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2014-02-27 20:57:42 +0100 |
| commit | eb604bc60bcc5cd94328de725ac357e728eae624 (patch) | |
| tree | f17972049e58ae845ff35c8d9ed3398e2db2311e | |
| parent | b2a686625fe71637222bcc03c97515ac95bf38a8 (diff) | |
| download | kconfig-eb604bc60bcc5cd94328de725ac357e728eae624.tar.gz kconfig-eb604bc60bcc5cd94328de725ac357e728eae624.tar.bz2 | |
Add sharedConfig() accessor, to avoid manipulating a raw KConfig * as returned by config().
This is useful when using kconfigxt and some other code to read from the same
config file (e.g. KColorScheme::contrastF(config)) - no need to call KSharedConfig::openConfig
twice, just grab the KSharedConfig from the generated class.
REVIEW: 115960
| -rw-r--r-- | src/core/kcoreconfigskeleton.cpp | 5 | ||||
| -rw-r--r-- | src/core/kcoreconfigskeleton.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/core/kcoreconfigskeleton.cpp b/src/core/kcoreconfigskeleton.cpp index 98d9cdcc..9c5fb4a8 100644 --- a/src/core/kcoreconfigskeleton.cpp +++ b/src/core/kcoreconfigskeleton.cpp @@ -1022,6 +1022,11 @@ const KConfig *KCoreConfigSkeleton::config() const return d->mConfig.data(); } +KSharedConfig::Ptr KCoreConfigSkeleton::sharedConfig() const +{ + return d->mConfig; +} + void KCoreConfigSkeleton::setSharedConfig(KSharedConfig::Ptr pConfig) { d->mConfig = pConfig; diff --git a/src/core/kcoreconfigskeleton.h b/src/core/kcoreconfigskeleton.h index 9cd07994..a2b828a4 100644 --- a/src/core/kcoreconfigskeleton.h +++ b/src/core/kcoreconfigskeleton.h @@ -1339,6 +1339,12 @@ public: const KConfig *config() const; /** + * Return the @ref KConfig object used for reading and writing the settings. + * @since 5.0 + */ + KSharedConfig::Ptr sharedConfig() const; + + /** * Set the @ref KSharedConfig object used for reading and writing the settings. */ void setSharedConfig(KSharedConfig::Ptr pConfig); |