tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Qt] Removed unused methods

Browse Source
This commit is contained in:
Thiago Marcos P. Santos
2016-12-22 17:44:57 -02:00
committed by Thiago Marcos P. Santos
parent 561694a878
commit ecf1842a26
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/qt/include/qmapboxgl.hpp
View File

@@ -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;

19
platform/qt/src/qmapboxgl.cpp
View File

@@ -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())))