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

cleanup: move initialization of QMLInterface

Browse source 
QMLInterface was initialized in the register_qml_types function.
Therein, it was in an if branch that tested whether the passed-in
engine argument was not NULL. However, on mobile this could never
be NULL. Let's just move the initialization out of that function.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-03-30 21:48:29 +02:00 • committed by Dirk Hohndel
parent 2db6b16a70
commit 53b216b228
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subsurface-helper.cpp
View file

@ -80,6 +80,10 @@ void run_ui()
QScreen *appScreen = QApplication::screens().at(0); QScreen *appScreen = QApplication::screens().at(0);
int availableScreenWidth = appScreen->availableSize().width(); int availableScreenWidth = appScreen->availableSize().width();
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
QQmlContext *ctxt = engine.rootContext();
// Register qml interface classes
QMLInterface::setup(ctxt);
register_qml_types(&engine); register_qml_types(&engine);
KirigamiPlugin::getInstance().registerTypes(); KirigamiPlugin::getInstance().registerTypes();
#if defined(__APPLE__) && !defined(Q_OS_IOS) #if defined(__APPLE__) && !defined(Q_OS_IOS)
@ -101,7 +105,6 @@ void run_ui()
gpsSortModel->setDynamicSortFilter(true); gpsSortModel->setDynamicSortFilter(true);
gpsSortModel->setSortRole(GpsListModel::GpsWhenRole); gpsSortModel->setSortRole(GpsListModel::GpsWhenRole);
gpsSortModel->sort(0, Qt::DescendingOrder); gpsSortModel->sort(0, Qt::DescendingOrder);
QQmlContext *ctxt = engine.rootContext();
ctxt->setContextProperty("gpsModel", gpsSortModel); ctxt->setContextProperty("gpsModel", gpsSortModel);
ctxt->setContextProperty("vendorList", vendorList); ctxt->setContextProperty("vendorList", vendorList);
ctxt->setContextProperty("swipeModel", MobileModels::instance()->swipeModel()); ctxt->setContextProperty("swipeModel", MobileModels::instance()->swipeModel());
@ -195,13 +198,6 @@ void register_qml_types(QQmlEngine *engine)
int rc; int rc;
#ifdef SUBSURFACE_MOBILE #ifdef SUBSURFACE_MOBILE
if (engine != NULL) {
QQmlContext *ct = engine->rootContext();
// Register qml interface classes
QMLInterface::setup(ct);
}
REGISTER_TYPE(QMLManager, "QMLManager"); REGISTER_TYPE(QMLManager, "QMLManager");
REGISTER_TYPE(QMLProfile, "QMLProfile"); REGISTER_TYPE(QMLProfile, "QMLProfile");
REGISTER_TYPE(DiveImportedModel, "DCImportModel"); REGISTER_TYPE(DiveImportedModel, "DCImportModel");