From 80ee4cd6aafc870909308485d6c42023fb875faa Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 23 Mar 2014 22:54:27 +0100 Subject: Revert addition of DelayedParsing, not needed after all. --- src/core/kconfig.cpp | 6 ++---- src/core/kconfig.h | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src') 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) -- cgit v1.2.1