From 0825f644e0b98190d68e0b63c4204fa8282e84b4 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Tue, 14 Aug 2018 09:56:20 +0200 Subject: core: make qPref.* use static Prepare qPref.* to run load/sync Make variables and methods static to give easy access Make getter inline to give faster access Signed-off-by: Jan Iversen :wq --- core/settings/qPref.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'core/settings/qPref.cpp') diff --git a/core/settings/qPref.cpp b/core/settings/qPref.cpp index 36ec4d6c3..e5f662470 100644 --- a/core/settings/qPref.cpp +++ b/core/settings/qPref.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "qPref.h" #include "qPrefPrivate.h" -#include "ssrf-version.h" qPref::qPref(QObject *parent) : QObject(parent) { @@ -14,6 +13,9 @@ qPref *qPref::instance() void qPref::loadSync(bool doSync) { + if (!doSync) + uiLanguage(NULL); + qPrefAnimations::instance()->loadSync(doSync); qPrefCloudStorage::instance()->loadSync(doSync); qPrefDisplay::instance()->loadSync(doSync); @@ -30,13 +32,3 @@ void qPref::loadSync(bool doSync) qPrefUnits::instance()->loadSync(doSync); qPrefUpdateManager::instance()->loadSync(doSync); } - -const QString qPref::canonical_version() const -{ - return QString(CANONICAL_VERSION_STRING); -} - -const QString qPref::mobile_version() const -{ - return QString(MOBILE_VERSION_STRING); -} -- cgit v1.2.3-70-g09d2