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: add auto registration to qPref*

Browse source 
Instead of having all register calls in subsurface-helper.cpp let
qPref.cpp handle all qPref registration, since they also need to be
different

update subsurface-helper and testqml accordingly.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-31 11:57:28 +02:00 • committed by Dirk Hohndel
parent 7940e45c4c
commit a71afd31ee
6 changed files with 59 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

60
core/settings/qPref.cpp
View file

@ -2,6 +2,10 @@
#include "qPref.h"
#include "qPrefPrivate.h"
#include <QQuickItem>
#include <QQmlEngine>
#include <QQmlContext>
qPref::qPref(QObject *parent) : QObject(parent)
{
}
@ -17,18 +21,46 @@ void qPref::loadSync(bool doSync)
if (!doSync)
uiLanguage(NULL);
qPrefCloudStorage::instance()->loadSync(doSync);
qPrefDisplay::instance()->loadSync(doSync);
qPrefDiveComputer::instance()->loadSync(doSync);
qPrefDivePlanner::instance()->loadSync(doSync);
// qPrefFaceook does not use disk.
qPrefGeneral::instance()->loadSync(doSync);
qPrefGeocoding::instance()->loadSync(doSync);
qPrefLanguage::instance()->loadSync(doSync);
qPrefLocationService::instance()->loadSync(doSync);
qPrefPartialPressureGas::instance()->loadSync(doSync);
qPrefProxy::instance()->loadSync(doSync);
qPrefTechnicalDetails::instance()->loadSync(doSync);
qPrefUnits::instance()->loadSync(doSync);
qPrefUpdateManager::instance()->loadSync(doSync);
// the following calls, ensures qPref* is instanciated, registred and
// that properties are loaded
qPrefCloudStorage::loadSync(doSync);
qPrefDisplay::loadSync(doSync);
qPrefDiveComputer::loadSync(doSync);
qPrefDivePlanner::loadSync(doSync);
qPrefFacebook::loadSync(doSync);
qPrefGeneral::loadSync(doSync);
qPrefGeocoding::loadSync(doSync);
qPrefLanguage::loadSync(doSync);
qPrefLocationService::loadSync(doSync);
qPrefPartialPressureGas::loadSync(doSync);
qPrefProxy::loadSync(doSync);
qPrefTechnicalDetails::loadSync(doSync);
qPrefUnits::loadSync(doSync);
qPrefUpdateManager::loadSync(doSync);
}
#define REGISTER_QPREF(useClass, useQML) \
rc = qmlRegisterType<useClass>("org.subsurfacedivelog.mobile", 1, 0, useQML); \
if (rc < 0) \
qWarning() << "ERROR: Cannot register " << useQML << ", QML will not work!!";
void qPref::registerQML()
{
int rc;
REGISTER_QPREF(qPref, "SsrfPrefs");
REGISTER_QPREF(qPrefCloudStorage, "SsrfCloudStoragePrefs");
REGISTER_QPREF(qPrefDisplay, "SsrfDisplayPrefs");
REGISTER_QPREF(qPrefDiveComputer, "SsrfDiveComputerPrefs");
REGISTER_QPREF(qPrefDivePlanner, "SsrfDivePlannerPrefs");
REGISTER_QPREF(qPrefFacebook, "SsrfFacebookPrefs");
REGISTER_QPREF(qPrefGeneral, "SsrfGeneralPrefs");
REGISTER_QPREF(qPrefGeocoding, "SsrfGeocodingPrefs");
REGISTER_QPREF(qPrefLanguage, "SsrfLanguagePrefs");
REGISTER_QPREF(qPrefLocationService, "SsrfLocationServicePrefs");
REGISTER_QPREF(qPrefPartialPressureGas, "SsrfPartialPressureGasPrefs");
REGISTER_QPREF(qPrefProxy, "SsrfProxyPrefs");
REGISTER_QPREF(qPrefTechnicalDetails, "SsrfTechnicalDetailsPrefs");
REGISTER_QPREF(qPrefUnits, "SsrfUnitPrefs");
REGISTER_QPREF(qPrefUpdateManager, "SsrfUpdateManagerPrefs");
}