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

core: activate qPrefGeneral

Browse source 
remove General from SettingsObjectWrapper and reference qPrefGeneral

update files using SettingsObjectWrapper/General to use qPrefGeneral

this activated qPrefGeneral and removed the similar class from
SettingsObjectWrapper.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-12 21:58:25 +02:00 • committed by Dirk Hohndel
parent 4a7864444b
commit 691025fa24
8 changed files with 53 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mobile-widgets/qmlmanager.cpp
View file

@ -1210,9 +1210,9 @@ void QMLManager::openNoCloudRepo()
if (git == dummy_git_repository) {
git_create_local_repo(filename);
set_filename(filename);
auto s = SettingsObjectWrapper::instance()->general_settings;
s->setDefaultFilename(filename);
s->setDefaultFileBehavior(LOCAL_DEFAULT_FILE);
auto s = qPrefGeneral::instance();
s->set_default_filename(filename);
s->set_default_file_behavior(LOCAL_DEFAULT_FILE);
}
openLocalThenRemote(filename);
@ -1226,9 +1226,9 @@ void QMLManager::saveChangesLocal()
char *filename = NOCLOUD_LOCALSTORAGE;
git_create_local_repo(filename);
set_filename(filename);
auto s = SettingsObjectWrapper::instance()->general_settings;
s->setDefaultFilename(filename);
s->setDefaultFileBehavior(LOCAL_DEFAULT_FILE);
auto s = qPrefGeneral::instance();
s->set_default_filename(filename);
s->set_default_file_behavior(LOCAL_DEFAULT_FILE);
}
} else if (!m_loadFromCloud) {
// this seems silly, but you need a common ancestor in the repository in