summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-11-22 15:43:19 +0100
committerKonstantin Käfer <mail@kkaefer.com>2016-11-22 20:58:51 +0100
commite76de0540284118845c93c4351c82c6c8d5a090a (patch)
treedc295f87b74c5a4766444f6d1e7020e6219017a8 /test
parent117863f1114551407c481abc752f5fcfd139c878 (diff)
downloadqtlocation-mapboxgl-e76de0540284118845c93c4351c82c6c8d5a090a.tar.gz
[build] move logging to util
Diffstat (limited to 'test')
-rw-r--r--test/src/mbgl/test/fixture_log_observer.hpp2
-rw-r--r--test/src/mbgl/test/util.cpp2
-rw-r--r--test/storage/asset_file_source.test.cpp2
-rw-r--r--test/storage/local_file_source.test.cpp2
-rw-r--r--test/style/conversion/geojson_options.test.cpp2
-rw-r--r--test/style/source.test.cpp2
-rw-r--r--test/text/glyph_atlas.test.cpp2
-rw-r--r--test/util/http_timeout.test.cpp2
-rw-r--r--test/util/mapbox.test.cpp2
-rw-r--r--test/util/text_conversions.test.cpp2
10 files changed, 10 insertions, 10 deletions
diff --git a/test/src/mbgl/test/fixture_log_observer.hpp b/test/src/mbgl/test/fixture_log_observer.hpp
index 918bbee18c..96ddc2c54f 100644
--- a/test/src/mbgl/test/fixture_log_observer.hpp
+++ b/test/src/mbgl/test/fixture_log_observer.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include <mbgl/platform/log.hpp>
+#include <mbgl/util/logging.hpp>
#include <vector>
#include <cstdarg>
diff --git a/test/src/mbgl/test/util.cpp b/test/src/mbgl/test/util.cpp
index 5935750db6..7ca2d72504 100644
--- a/test/src/mbgl/test/util.cpp
+++ b/test/src/mbgl/test/util.cpp
@@ -3,7 +3,7 @@
#include <mbgl/map/map.hpp>
#include <mbgl/gl/offscreen_view.hpp>
#include <mbgl/gl/headless_display.hpp>
-#include <mbgl/platform/log.hpp>
+#include <mbgl/util/logging.hpp>
#include <mbgl/util/image.hpp>
#include <mbgl/util/io.hpp>
#include <mbgl/util/chrono.hpp>
diff --git a/test/storage/asset_file_source.test.cpp b/test/storage/asset_file_source.test.cpp
index ab214ff793..b275cfc05a 100644
--- a/test/storage/asset_file_source.test.cpp
+++ b/test/storage/asset_file_source.test.cpp
@@ -1,5 +1,5 @@
#include <mbgl/storage/asset_file_source.hpp>
-#include <mbgl/platform/platform.hpp>
+#include <mbgl/util/platform.hpp>
#include <mbgl/util/chrono.hpp>
#include <mbgl/util/run_loop.hpp>
#include <mbgl/util/thread.hpp>
diff --git a/test/storage/local_file_source.test.cpp b/test/storage/local_file_source.test.cpp
index afb418d735..c2f04d7543 100644
--- a/test/storage/local_file_source.test.cpp
+++ b/test/storage/local_file_source.test.cpp
@@ -1,5 +1,5 @@
#include <mbgl/storage/local_file_source.hpp>
-#include <mbgl/platform/platform.hpp>
+#include <mbgl/util/platform.hpp>
#include <mbgl/util/run_loop.hpp>
#include <unistd.h>
diff --git a/test/style/conversion/geojson_options.test.cpp b/test/style/conversion/geojson_options.test.cpp
index 46a2aa950b..dc9be237a8 100644
--- a/test/style/conversion/geojson_options.test.cpp
+++ b/test/style/conversion/geojson_options.test.cpp
@@ -4,7 +4,7 @@
#include <mbgl/style/conversion/geojson_options.hpp>
#include <mbgl/test/conversion_stubs.hpp>
-#include <mbgl/platform/log.hpp>
+#include <mbgl/util/logging.hpp>
using namespace mbgl::style;
using namespace mbgl::style::conversion;
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp
index e40089c09f..01f54d6b18 100644
--- a/test/style/source.test.cpp
+++ b/test/style/source.test.cpp
@@ -12,7 +12,7 @@
#include <mbgl/util/io.hpp>
#include <mbgl/util/tileset.hpp>
#include <mbgl/util/default_thread_pool.hpp>
-#include <mbgl/platform/log.hpp>
+#include <mbgl/util/logging.hpp>
#include <mbgl/map/transform.hpp>
#include <mbgl/style/style.hpp>
diff --git a/test/text/glyph_atlas.test.cpp b/test/text/glyph_atlas.test.cpp
index e8564cc69c..020a7140cb 100644
--- a/test/text/glyph_atlas.test.cpp
+++ b/test/text/glyph_atlas.test.cpp
@@ -7,7 +7,7 @@
#include <mbgl/util/run_loop.hpp>
#include <mbgl/util/string.hpp>
#include <mbgl/util/io.hpp>
-#include <mbgl/platform/log.hpp>
+#include <mbgl/util/logging.hpp>
using namespace mbgl;
diff --git a/test/util/http_timeout.test.cpp b/test/util/http_timeout.test.cpp
index 365c40523f..e99c703159 100644
--- a/test/util/http_timeout.test.cpp
+++ b/test/util/http_timeout.test.cpp
@@ -1,6 +1,6 @@
#include <mbgl/test/util.hpp>
-#include <mbgl/platform/log.hpp>
+#include <mbgl/util/logging.hpp>
#include <mbgl/util/http_timeout.hpp>
#include <regex>
#include <iostream>
diff --git a/test/util/mapbox.test.cpp b/test/util/mapbox.test.cpp
index 04c9808ed3..70bb8d0700 100644
--- a/test/util/mapbox.test.cpp
+++ b/test/util/mapbox.test.cpp
@@ -1,6 +1,6 @@
#include <mbgl/test/util.hpp>
-#include <mbgl/platform/log.hpp>
+#include <mbgl/util/logging.hpp>
#include <mbgl/util/mapbox.hpp>
#include <mbgl/util/constants.hpp>
#include <regex>
diff --git a/test/util/text_conversions.test.cpp b/test/util/text_conversions.test.cpp
index 19e30d9f3d..442a49fa0c 100644
--- a/test/util/text_conversions.test.cpp
+++ b/test/util/text_conversions.test.cpp
@@ -2,7 +2,7 @@
#include <mbgl/test/util.hpp>
#include <mbgl/util/utf.hpp>
-#include <mbgl/platform/platform.hpp>
+#include <mbgl/util/platform.hpp>
using namespace mbgl;