diff options
| -rw-r--r-- | platform/qt/include/qmapboxgl.hpp | 9 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 19 |
2 files changed, 2 insertions, 26 deletions
diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp index 8a77bbffab..f54f3954ed 100644 --- a/platform/qt/include/qmapboxgl.hpp +++ b/platform/qt/include/qmapboxgl.hpp @@ -22,11 +22,6 @@ class Q_DECL_EXPORT QMapboxGLSettings public: QMapboxGLSettings(); - enum MapMode { - ContinuousMap = 0, - StillMap - }; - enum GLContextMode { UniqueGLContext = 0, SharedGLContext @@ -43,9 +38,6 @@ public: FlippedYViewport }; - MapMode mapMode() const; - void setMapMode(MapMode); - GLContextMode contextMode() const; void setContextMode(GLContextMode); @@ -68,7 +60,6 @@ public: void setAccessToken(const QString &); private: - MapMode m_mapMode; GLContextMode m_contextMode; ConstrainMode m_constrainMode; ViewportMode m_viewportMode; diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index ae4c028eed..18e9a9f4da 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -42,10 +42,6 @@ using namespace QMapbox; -// mbgl::MapMode -static_assert(mbgl::underlying_type(QMapboxGLSettings::ContinuousMap) == mbgl::underlying_type(mbgl::MapMode::Continuous), "error"); -static_assert(mbgl::underlying_type(QMapboxGLSettings::StillMap) == mbgl::underlying_type(mbgl::MapMode::Still), "error"); - // mbgl::GLContextMode static_assert(mbgl::underlying_type(QMapboxGLSettings::UniqueGLContext) == mbgl::underlying_type(mbgl::GLContextMode::Unique), "error"); static_assert(mbgl::underlying_type(QMapboxGLSettings::SharedGLContext) == mbgl::underlying_type(mbgl::GLContextMode::Shared), "error"); @@ -165,8 +161,7 @@ std::unique_ptr<const mbgl::SpriteImage> toSpriteImage(const QImage &sprite) { configuration is valid for initializing a QMapboxGL. */ QMapboxGLSettings::QMapboxGLSettings() - : m_mapMode(QMapboxGLSettings::ContinuousMap) - , m_contextMode(QMapboxGLSettings::SharedGLContext) + : m_contextMode(QMapboxGLSettings::SharedGLContext) , m_constrainMode(QMapboxGLSettings::ConstrainHeightOnly) , m_viewportMode(QMapboxGLSettings::DefaultViewport) , m_cacheMaximumSize(mbgl::util::DEFAULT_MAX_CACHE_SIZE) @@ -176,16 +171,6 @@ QMapboxGLSettings::QMapboxGLSettings() { } -QMapboxGLSettings::MapMode QMapboxGLSettings::mapMode() const -{ - return m_mapMode; -} - -void QMapboxGLSettings::setMapMode(MapMode mode) -{ - m_mapMode = mode; -} - QMapboxGLSettings::GLContextMode QMapboxGLSettings::contextMode() const { return m_contextMode; @@ -867,7 +852,7 @@ QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settin , mapObj(std::make_unique<mbgl::Map>( *this, mbgl::Size{ static_cast<uint32_t>(size.width()), static_cast<uint32_t>(size.height()) }, pixelRatio, *fileSourceObj, threadPool, - static_cast<mbgl::MapMode>(settings.mapMode()), + mbgl::MapMode::Continuous, static_cast<mbgl::GLContextMode>(settings.contextMode()), static_cast<mbgl::ConstrainMode>(settings.constrainMode()), static_cast<mbgl::ViewportMode>(settings.viewportMode()))) |