From 72d87364c018c61f2127b7293fff11b83e97b82c Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Wed, 8 Aug 2018 16:34:17 +0200 Subject: core: activate qPrefLanguage remove Language from SettingsObjectWrapper and reference qPrefLanguage update files using SettingsObjectWrapper/Language to use qPrefLanguage this activated qPrefLanguage and removed the similar class from SettingsObjectWrapper. Signed-off-by: Jan Iversen --- desktop-widgets/preferences/preferences_language.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/preferences/preferences_language.cpp b/desktop-widgets/preferences/preferences_language.cpp index e4a63ae9e..2bcd3422d 100644 --- a/desktop-widgets/preferences/preferences_language.cpp +++ b/desktop-widgets/preferences/preferences_language.cpp @@ -82,15 +82,15 @@ void PreferencesLanguage::syncSettings() currentLocale = m->data(languages.first(),Qt::UserRole).toString(); - auto lang = SettingsObjectWrapper::instance()->language_settings; - lang->setLanguage(currentText); - lang->setLangLocale(currentLocale); - lang->setUseSystemLanguage(ui->languageSystemDefault->isChecked()); - lang->setTimeFormatOverride(!ui->timeFormatSystemDefault->isChecked()); - lang->setDateFormatOverride(!ui->dateFormatSystemDefault->isChecked()); - lang->setTimeFormat(ui->timeFormatEntry->currentText()); - lang->setDateFormat(ui->dateFormatEntry->currentText()); - lang->setDateFormatShort(ui->shortDateFormatEntry->text()); + auto lang = qPrefLanguage::instance(); + lang->set_language(currentText); + lang->set_lang_locale(currentLocale); + lang->set_use_system_language(ui->languageSystemDefault->isChecked()); + lang->set_time_format_override(!ui->timeFormatSystemDefault->isChecked()); + lang->set_date_format_override(!ui->dateFormatSystemDefault->isChecked()); + lang->set_time_format(ui->timeFormatEntry->currentText()); + lang->set_date_format(ui->dateFormatEntry->currentText()); + lang->set_date_format_short(ui->shortDateFormatEntry->text()); uiLanguage(NULL); QString qDateTimeWeb = tr("These will be used as is. This might not be what you intended.\nSee http://doc.qt.io/qt-5/qdatetime.html#toString"); -- cgit v1.2.3-70-g09d2