KCoreConfigSkeleton: delay parsing until the call to readConfig()

wilder
David Faure 12 years ago
parent 245e758cb9
commit 66f0e0272c
  1. 6
      src/core/kconfig.cpp
  2. 3
      src/core/kconfig.h
  3. 2
      src/core/kcoreconfigskeleton.cpp

@ -259,8 +259,10 @@ KConfig::KConfig(const QString &file, OpenFlags mode,
{
d_ptr->changeFileName(file); // set the local file name
// read initial information off disk
reparseConfiguration();
if ((mode & DelayedParsing) == 0) {
// read initial information off disk
reparseConfiguration();
}
}
KConfig::KConfig(const QString &file, const QString &backend, QStandardPaths::StandardLocation resourceType)

@ -95,7 +95,8 @@ 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
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
};
Q_DECLARE_FLAGS(OpenFlags, OpenFlag)

@ -986,7 +986,7 @@ KCoreConfigSkeleton::KCoreConfigSkeleton(const QString &configname, QObject *par
{
//qDebug() << "Creating KCoreConfigSkeleton (" << (void *)this << ")";
d->mConfig = KSharedConfig::openConfig(configname);
d->mConfig = KSharedConfig::openConfig(configname, KConfig::FullConfig | KConfig::DelayedParsing);
}
KCoreConfigSkeleton::KCoreConfigSkeleton(KSharedConfig::Ptr pConfig, QObject *parent)

Loading…
Cancel
Save