diff --git a/src/core/UBSetting.cpp b/src/core/UBSetting.cpp index 47b70cdf..8cedb8f0 100644 --- a/src/core/UBSetting.cpp +++ b/src/core/UBSetting.cpp @@ -48,7 +48,7 @@ UBSetting::UBSetting(UBSettings* owner, const QString& pDomain, const QString& p mPath(pDomain + "/" + pKey), mDefaultValue(pDefaultValue) { - //NOOP + get(); // force caching of the setting } UBSetting::~UBSetting() diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 85683459..7901f8b1 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -126,7 +126,6 @@ UBSettings* UBSettings::settings() { if (!sSingleton) { sSingleton = new UBSettings(qApp); - sSingleton->load(); } return sSingleton; } @@ -492,24 +491,6 @@ void UBSettings::save() qDebug() << "User settings saved"; } -/** - * @brief Force load all settings, to cut down on subsequent file access - */ -void UBSettings::load() -{ - qDebug() << "Loading all settings"; - - QStringList keyList = mUserSettings->allKeys() + sAppSettings->allKeys(); - - keyList.removeDuplicates(); - - foreach(const QString& key, keyList) { - value(key); - // value() actually handles saving the value to the queue, so - // we don't need to do it here - } -} - int UBSettings::penWidthIndex() { return value("Board/PenLineWidthIndex", 0).toInt(); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index f395a70f..900c1d8c 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -58,7 +58,6 @@ class UBSettings : public QObject void ValidateKeyboardPaletteKeyBtnSize(); void closing(); void save(); - void load(); int penWidthIndex();