mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

desktop-widgets/preferences: reemove SettingsObjectWrapper

Browse source 
remove use of SettingsObjectWrapper::
remove include of SettingsObjectWrapper.h
use qPrefFoo:: for setters and getters
replace prefs.foo with qPrefXYZ::foo() where feasible
(this expands to the same code, but gives us more control
over the variable).

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-15 11:50:53 +02:00 • committed by Dirk Hohndel
parent 3b84dbe554
commit 6aee600aa7
6 changed files with 71 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

20
desktop-widgets/preferences/preferences_language.cpp
View file

@ -2,7 +2,7 @@
#include "preferences_language.h"
#include "ui_preferences_language.h"
#include "core/qthelper.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h"
#include "core/settings/qPrefLanguage.h"
#include <QApplication>
#include <QMessageBox>
@ -81,16 +81,14 @@ void PreferencesLanguage::syncSettings()
if (languages.count())
currentLocale = m->data(languages.first(),Qt::UserRole).toString();
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());
qPrefLanguage::set_language(currentText);
qPrefLanguage::set_lang_locale(currentLocale);
qPrefLanguage::set_use_system_language(ui->languageSystemDefault->isChecked());
qPrefLanguage::set_time_format_override(!ui->timeFormatSystemDefault->isChecked());
qPrefLanguage::set_date_format_override(!ui->dateFormatSystemDefault->isChecked());
qPrefLanguage::set_time_format(ui->timeFormatEntry->currentText());
qPrefLanguage::set_date_format(ui->dateFormatEntry->currentText());
qPrefLanguage::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");