diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-25 14:46:56 +0300 |
---|---|---|
committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-25 15:00:14 +0300 |
commit | d00f55de418ecf2ae5f56ba73e249c0567ccd953 (patch) | |
tree | a69e39e25e97231eaa72f05822aa39002392e7aa /platform/qt/app | |
parent | a65c9ca1346b787ae18411b5d2559df28ecacb22 (diff) | |
download | qtlocation-mapboxgl-d00f55de418ecf2ae5f56ba73e249c0567ccd953.tar.gz |
[Qt] Do not use non-Qt headers
Diffstat (limited to 'platform/qt/app')
-rw-r--r-- | platform/qt/app/mapwindow.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/platform/qt/app/mapwindow.cpp b/platform/qt/app/mapwindow.cpp index 474363039f..c2a07fc9c9 100644 --- a/platform/qt/app/mapwindow.cpp +++ b/platform/qt/app/mapwindow.cpp @@ -1,7 +1,5 @@ #include "mapwindow.hpp" -#include <mbgl/util/default_styles.hpp> - #include <QApplication> #include <QDebug> #include <QKeyEvent> @@ -54,16 +52,12 @@ void MapWindow::changeStyle() { static uint8_t currentStyleIndex; - mbgl::util::default_styles::DefaultStyle newStyle = - mbgl::util::default_styles::orderedStyles[currentStyleIndex]; - - QString url(newStyle.url); - m_map.setStyleURL(url); + auto& styles = QMapbox::defaultStyles(); - QString name(newStyle.name); - setWindowTitle(QString("Mapbox GL: ") + name); + m_map.setStyleURL(styles[currentStyleIndex].first); + setWindowTitle(QString("Mapbox GL: ") + styles[currentStyleIndex].second); - if (++currentStyleIndex == mbgl::util::default_styles::numOrderedStyles) { + if (++currentStyleIndex == styles.size()) { currentStyleIndex = 0; } } |