diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-04-21 17:33:07 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-04-21 17:33:07 +0300 |
commit | 3ee9d12013afd7f513f6a2f41c98684e824e5a60 (patch) | |
tree | ca4969ae3eac1ec8c048c2a5fe3e5405ecc9fed0 /platform | |
parent | 8ec875b87c387713d7e4df5c90e6cac7669ed38b (diff) | |
download | qtlocation-mapboxgl-3ee9d12013afd7f513f6a2f41c98684e824e5a60.tar.gz |
[Qt] Remove duplicated mbgl::Map initialization
Diffstat (limited to 'platform')
-rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index df0e89a53d..e490f75f14 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -105,12 +105,6 @@ QMapboxGL::QMapboxGL(QObject *parent_, const QMapboxGLSettings &settings) : QObject(parent_) , d_ptr(new QMapboxGLPrivate(this, settings)) { - mbgl::MapMode mapMode = static_cast<mbgl::MapMode>(settings.mapMode()); - mbgl::GLContextMode contextMode = static_cast<mbgl::GLContextMode>(settings.contextMode()); - mbgl::ConstrainMode constrainMode = static_cast<mbgl::ConstrainMode>(settings.constrainMode()); - - d_ptr->fileSourceObj->setAccessToken(settings.accessToken().toStdString()); - d_ptr->mapObj = std::make_unique<mbgl::Map>(*d_ptr, *d_ptr->fileSourceObj, mapMode, contextMode, constrainMode); } QMapboxGL::~QMapboxGL() @@ -585,9 +579,11 @@ QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settin settings.cacheDatabaseMaximumSize())) , mapObj(std::make_unique<mbgl::Map>( *this, *fileSourceObj, - mbgl::MapMode::Continuous, - mbgl::GLContextMode::Shared)) + static_cast<mbgl::MapMode>(settings.mapMode()), + static_cast<mbgl::GLContextMode>(settings.contextMode()), + static_cast<mbgl::ConstrainMode>(settings.constrainMode()))) { + fileSourceObj->setAccessToken(settings.accessToken().toStdString()); connect(this, SIGNAL(needsRendering()), q_ptr, SIGNAL(needsRendering())); connect(this, SIGNAL(mapRegionDidChange()), q_ptr, SIGNAL(mapRegionDidChange())); } |