summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-11-11 11:03:02 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-11-11 23:10:10 +0200
commitbd5397a8864ddac45259e42efdc497f675669d90 (patch)
treefb56db37df3176a96a965bd2118a47c07b28c400
parent910335c51fffe2c59042fc3ebea93778649195f8 (diff)
downloadqtlocation-mapboxgl-bd5397a8864ddac45259e42efdc497f675669d90.tar.gz
[qt] Fix code formatting
-rw-r--r--platform/qt/src/qmapboxgl.cpp28
1 files changed, 13 insertions, 15 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index 64431e233f..b5681d218d 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -7,36 +7,37 @@
#include "qt_conversion.hpp"
#include "qt_geojson.hpp"
+#include <mbgl/actor/scheduler.hpp>
#include <mbgl/annotation/annotation.hpp>
#include <mbgl/map/camera.hpp>
#include <mbgl/map/map.hpp>
#include <mbgl/map/map_options.hpp>
#include <mbgl/math/log2.hpp>
#include <mbgl/math/minmax.hpp>
-#include <mbgl/style/style.hpp>
-#include <mbgl/style/conversion/layer.hpp>
-#include <mbgl/style/conversion/source.hpp>
+#include <mbgl/renderer/renderer.hpp>
+#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/storage/network_status.hpp>
+#include <mbgl/storage/resource_options.hpp>
#include <mbgl/style/conversion/filter.hpp>
#include <mbgl/style/conversion/geojson.hpp>
+#include <mbgl/style/conversion/layer.hpp>
+#include <mbgl/style/conversion/source.hpp>
#include <mbgl/style/conversion_impl.hpp>
#include <mbgl/style/filter.hpp>
-#include <mbgl/style/layers/custom_layer.hpp>
+#include <mbgl/style/image.hpp>
#include <mbgl/style/layers/background_layer.hpp>
#include <mbgl/style/layers/circle_layer.hpp>
-#include <mbgl/style/layers/fill_layer.hpp>
+#include <mbgl/style/layers/custom_layer.hpp>
#include <mbgl/style/layers/fill_extrusion_layer.hpp>
+#include <mbgl/style/layers/fill_layer.hpp>
#include <mbgl/style/layers/line_layer.hpp>
#include <mbgl/style/layers/raster_layer.hpp>
#include <mbgl/style/layers/symbol_layer.hpp>
#include <mbgl/style/rapidjson_conversion.hpp>
#include <mbgl/style/sources/geojson_source.hpp>
#include <mbgl/style/sources/image_source.hpp>
+#include <mbgl/style/style.hpp>
#include <mbgl/style/transition_options.hpp>
-#include <mbgl/style/image.hpp>
-#include <mbgl/renderer/renderer.hpp>
-#include <mbgl/storage/default_file_source.hpp>
-#include <mbgl/storage/network_status.hpp>
-#include <mbgl/storage/resource_options.hpp>
#include <mbgl/util/color.hpp>
#include <mbgl/util/constants.hpp>
#include <mbgl/util/geo.hpp>
@@ -45,7 +46,6 @@
#include <mbgl/util/rapidjson.hpp>
#include <mbgl/util/run_loop.hpp>
#include <mbgl/util/traits.hpp>
-#include <mbgl/actor/scheduler.hpp>
#include <QGuiApplication>
@@ -1316,10 +1316,8 @@ void QMapboxGL::updateSource(const QString &id, const QVariantMap &params)
return;
}
- if (sourceImage) {
- if (params.contains("url")) {
- sourceImage->setURL(params["url"].toString().toStdString());
- }
+ if (sourceImage && params.contains("url")) {
+ sourceImage->setURL(params["url"].toString().toStdString());
} else if (sourceGeoJSON && params.contains("data")) {
Error error;
auto result = convert<mbgl::GeoJSON>(params["data"], error);