diff options
| author | David Faure <faure@kde.org> | 2014-03-23 22:54:27 +0100 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2014-03-23 23:00:03 +0100 |
| commit | 80ee4cd6aafc870909308485d6c42023fb875faa (patch) | |
| tree | 3aab249ecc737af847e172643bc9580ce45e6775 | |
| parent | 7a42d3549afbb3907cc2fe9753fbcdf9d0c87ca4 (diff) | |
| download | kconfig-80ee4cd6aafc870909308485d6c42023fb875faa.tar.gz kconfig-80ee4cd6aafc870909308485d6c42023fb875faa.tar.bz2 | |
Revert addition of DelayedParsing, not needed after all.
| -rw-r--r-- | src/core/kconfig.cpp | 6 | ||||
| -rw-r--r-- | src/core/kconfig.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index 4695621a..5b51cce8 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -259,10 +259,8 @@ KConfig::KConfig(const QString &file, OpenFlags mode, { d_ptr->changeFileName(file); // set the local file name - if ((mode & DelayedParsing) == 0) { - // read initial information off disk - reparseConfiguration(); - } + // read initial information off disk + reparseConfiguration(); } KConfig::KConfig(const QString &file, const QString &backend, QStandardPaths::StandardLocation resourceType) diff --git a/src/core/kconfig.h b/src/core/kconfig.h index 5685ebdb..d27eebe7 100644 --- a/src/core/kconfig.h +++ b/src/core/kconfig.h @@ -95,8 +95,7 @@ public: SimpleConfig = 0x00, ///< Just a single config file. NoCascade = IncludeGlobals, ///< Include user's globals, but omit system settings. NoGlobals = CascadeConfig, ///< Cascade to system settings, but omit user's globals. - FullConfig = IncludeGlobals | CascadeConfig, ///< Fully-fledged config, including globals and cascading to system settings - DelayedParsing = 0x04 ///< Do not parse in the constructor, require a call to reparseConfiguration + FullConfig = IncludeGlobals | CascadeConfig ///< Fully-fledged config, including globals and cascading to system settings }; Q_DECLARE_FLAGS(OpenFlags, OpenFlag) |