diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-08-25 18:18:05 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-08-26 15:52:16 +0300 |
| commit | 9605cac3e979f73f7d09d580cbf1087e251f1b49 (patch) | |
| tree | 6c66411c1f66ede5c9e1395ea7635dcdb6c6e109 | |
| parent | e9a453271bbc782b0b123999bde7160956a1841f (diff) | |
| download | qtlocation-mapboxgl-9605cac3e979f73f7d09d580cbf1087e251f1b49.tar.gz | |
[Qt] setStyleURL and setStyleJSON name review
Qt uses URL as Url and JSON as Json.
| -rw-r--r-- | platform/qt/app/mapwindow.cpp | 2 | ||||
| -rw-r--r-- | platform/qt/include/qmapboxgl.hpp | 8 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 8 | ||||
| -rw-r--r-- | platform/qt/src/qquickmapboxglrenderer.cpp | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/platform/qt/app/mapwindow.cpp b/platform/qt/app/mapwindow.cpp index bc83e2d972..72bb5729ca 100644 --- a/platform/qt/app/mapwindow.cpp +++ b/platform/qt/app/mapwindow.cpp @@ -59,7 +59,7 @@ void MapWindow::changeStyle() auto& styles = QMapbox::defaultStyles(); - m_map.setStyleURL(styles[currentStyleIndex].first); + m_map.setStyleUrl(styles[currentStyleIndex].first); setWindowTitle(QString("Mapbox GL: ") + styles[currentStyleIndex].second); if (++currentStyleIndex == styles.size()) { diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp index a48073f19b..84e5ba5184 100644 --- a/platform/qt/include/qmapboxgl.hpp +++ b/platform/qt/include/qmapboxgl.hpp @@ -119,11 +119,11 @@ public: void cycleDebugOptions(); - QString styleJSON() const; - QString styleURL() const; + QString styleJson() const; + QString styleUrl() const; - void setStyleJSON(const QString &); - void setStyleURL(const QString &); + void setStyleJson(const QString &); + void setStyleUrl(const QString &); double latitude() const; void setLatitude(double latitude); diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index dd243c639a..c0fe6e6b47 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -231,22 +231,22 @@ void QMapboxGL::cycleDebugOptions() d_ptr->mapObj->cycleDebugOptions(); } -QString QMapboxGL::styleJSON() const +QString QMapboxGL::styleJson() const { return QString::fromStdString(d_ptr->mapObj->getStyleJSON()); } -QString QMapboxGL::styleURL() const +QString QMapboxGL::styleUrl() const { return QString::fromStdString(d_ptr->mapObj->getStyleURL()); } -void QMapboxGL::setStyleJSON(const QString &style) +void QMapboxGL::setStyleJson(const QString &style) { d_ptr->mapObj->setStyleJSON(style.toStdString()); } -void QMapboxGL::setStyleURL(const QString &url) +void QMapboxGL::setStyleUrl(const QString &url) { d_ptr->mapObj->setStyleURL(url.toStdString()); } diff --git a/platform/qt/src/qquickmapboxglrenderer.cpp b/platform/qt/src/qquickmapboxglrenderer.cpp index 54ea251b06..9ced17bb35 100644 --- a/platform/qt/src/qquickmapboxglrenderer.cpp +++ b/platform/qt/src/qquickmapboxglrenderer.cpp @@ -85,7 +85,7 @@ void QQuickMapboxGLRenderer::synchronize(QQuickFramebufferObject *item) } if (syncStatus & QQuickMapboxGL::StyleNeedsSync && quickMap->style()) { - m_map->setStyleURL(quickMap->style()->url()); + m_map->setStyleUrl(quickMap->style()->url()); m_styleLoaded = false; } |