diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-13 13:44:20 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-16 09:00:54 -0700 |
| commit | 1f375581c3a31adea9281a7494a73e5c8f1c9a17 (patch) | |
| tree | f84a292e2600a3b7141450fb6f3020f453d9095a | |
| parent | 9ef65440b6bfd2c8da17d2613f8c967682cc0ef9 (diff) | |
| download | qtlocation-mapboxgl-1f375581c3a31adea9281a7494a73e5c8f1c9a17.tar.gz | |
[core] Move {clip,merge}_lines to layout directory
| -rw-r--r-- | cmake/core-files.cmake | 8 | ||||
| -rw-r--r-- | src/mbgl/layout/clip_lines.cpp (renamed from src/mbgl/util/clip_lines.cpp) | 2 | ||||
| -rw-r--r-- | src/mbgl/layout/clip_lines.hpp (renamed from src/mbgl/util/clip_lines.hpp) | 0 | ||||
| -rw-r--r-- | src/mbgl/layout/merge_lines.cpp (renamed from src/mbgl/util/merge_lines.cpp) | 2 | ||||
| -rw-r--r-- | src/mbgl/layout/merge_lines.hpp (renamed from src/mbgl/util/merge_lines.hpp) | 0 | ||||
| -rw-r--r-- | src/mbgl/layout/symbol_layout.cpp | 4 | ||||
| -rw-r--r-- | test/util/merge_lines.cpp | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 20aa4dfd0c..851fe4bd56 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -80,6 +80,10 @@ set(MBGL_CORE_FILES src/mbgl/gl/object_store.hpp # layout + src/mbgl/layout/clip_lines.cpp + src/mbgl/layout/clip_lines.hpp + src/mbgl/layout/merge_lines.cpp + src/mbgl/layout/merge_lines.hpp src/mbgl/layout/symbol_layout.cpp src/mbgl/layout/symbol_layout.hpp @@ -410,8 +414,6 @@ set(MBGL_CORE_FILES src/mbgl/util/chrono.cpp src/mbgl/util/clip_id.cpp src/mbgl/util/clip_id.hpp - src/mbgl/util/clip_lines.cpp - src/mbgl/util/clip_lines.hpp src/mbgl/util/color.cpp src/mbgl/util/compression.cpp src/mbgl/util/constants.cpp @@ -443,8 +445,6 @@ set(MBGL_CORE_FILES src/mbgl/util/mat4.hpp src/mbgl/util/math.cpp src/mbgl/util/math.hpp - src/mbgl/util/merge_lines.cpp - src/mbgl/util/merge_lines.hpp src/mbgl/util/premultiply.cpp src/mbgl/util/premultiply.hpp src/mbgl/util/rapidjson.hpp diff --git a/src/mbgl/util/clip_lines.cpp b/src/mbgl/layout/clip_lines.cpp index 81021f4b5b..05b9103f69 100644 --- a/src/mbgl/util/clip_lines.cpp +++ b/src/mbgl/layout/clip_lines.cpp @@ -1,4 +1,4 @@ -#include <mbgl/util/clip_lines.hpp> +#include <mbgl/layout/clip_lines.hpp> #include <cmath> diff --git a/src/mbgl/util/clip_lines.hpp b/src/mbgl/layout/clip_lines.hpp index c1cfd4bbb9..c1cfd4bbb9 100644 --- a/src/mbgl/util/clip_lines.hpp +++ b/src/mbgl/layout/clip_lines.hpp diff --git a/src/mbgl/util/merge_lines.cpp b/src/mbgl/layout/merge_lines.cpp index 663f757dca..1e33a655e7 100644 --- a/src/mbgl/util/merge_lines.cpp +++ b/src/mbgl/layout/merge_lines.cpp @@ -1,4 +1,4 @@ -#include "merge_lines.hpp" +#include <mbgl/layout/merge_lines.hpp> #include <boost/functional/hash.hpp> diff --git a/src/mbgl/util/merge_lines.hpp b/src/mbgl/layout/merge_lines.hpp index bb4c01f6a2..bb4c01f6a2 100644 --- a/src/mbgl/util/merge_lines.hpp +++ b/src/mbgl/layout/merge_lines.hpp diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index aa22eb428d..2a85ead32b 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -1,4 +1,6 @@ #include <mbgl/layout/symbol_layout.hpp> +#include <mbgl/layout/merge_lines.hpp> +#include <mbgl/layout/clip_lines.hpp> #include <mbgl/renderer/symbol_bucket.hpp> #include <mbgl/style/filter_evaluator.hpp> #include <mbgl/sprite/sprite_store.hpp> @@ -10,8 +12,6 @@ #include <mbgl/util/utf.hpp> #include <mbgl/util/token.hpp> #include <mbgl/util/math.hpp> -#include <mbgl/util/merge_lines.hpp> -#include <mbgl/util/clip_lines.hpp> #include <mbgl/util/std.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/string.hpp> diff --git a/test/util/merge_lines.cpp b/test/util/merge_lines.cpp index 4b6bad15f6..4b8b0c4e79 100644 --- a/test/util/merge_lines.cpp +++ b/test/util/merge_lines.cpp @@ -1,6 +1,6 @@ #include <mbgl/test/util.hpp> -#include <mbgl/util/merge_lines.hpp> +#include <mbgl/layout/merge_lines.hpp> const std::u32string aaa = U"a"; const std::u32string bbb = U"b"; |