diff options
author | Sergey Yershov <yershov@corp.mail.ru> | 2015-04-10 01:51:36 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:45:51 +0300 |
commit | 7783aee47b31f6e9c7a5e23ffa47e08c4746a1da (patch) | |
tree | c7a0c8db43a54ac97bbe00e249d14c1f7fe56380 /gui | |
parent | 4a3e09e2891211dbe098390748dffb9685799f60 (diff) |
Fix include path for gui
Diffstat (limited to 'gui')
-rw-r--r-- | gui/button.cpp | 10 | ||||
-rw-r--r-- | gui/button.hpp | 10 | ||||
-rw-r--r-- | gui/cached_text_view.cpp | 14 | ||||
-rw-r--r-- | gui/cached_text_view.hpp | 14 | ||||
-rw-r--r-- | gui/controller.cpp | 8 | ||||
-rw-r--r-- | gui/controller.hpp | 16 | ||||
-rw-r--r-- | gui/display_list_cache.cpp | 10 | ||||
-rw-r--r-- | gui/display_list_cache.hpp | 4 | ||||
-rw-r--r-- | gui/element.cpp | 6 | ||||
-rw-r--r-- | gui/element.hpp | 8 | ||||
-rw-r--r-- | gui/gui_tests/gui_tests.cpp | 16 | ||||
-rw-r--r-- | gui/image_view.cpp | 12 | ||||
-rw-r--r-- | gui/image_view.hpp | 6 | ||||
-rw-r--r-- | gui/text_view.cpp | 12 | ||||
-rw-r--r-- | gui/text_view.hpp | 4 |
15 files changed, 75 insertions, 75 deletions
diff --git a/gui/button.cpp b/gui/button.cpp index 87c4e6f6aa..f67b2e29b5 100644 --- a/gui/button.cpp +++ b/gui/button.cpp @@ -1,10 +1,10 @@ -#include "button.hpp" -#include "controller.hpp" +#include "gui/button.hpp" +#include "gui/controller.hpp" -#include "../graphics/screen.hpp" -#include "../graphics/display_list.hpp" +#include "graphics/screen.hpp" +#include "graphics/display_list.hpp" -#include "../geometry/transformations.hpp" +#include "geometry/transformations.hpp" namespace gui diff --git a/gui/button.hpp b/gui/button.hpp index de0fc26eb4..c9f44082b3 100644 --- a/gui/button.hpp +++ b/gui/button.hpp @@ -1,11 +1,11 @@ #pragma once -#include "element.hpp" -#include "text_view.hpp" +#include "gui/element.hpp" +#include "gui/text_view.hpp" -#include "../std/function.hpp" -#include "../std/string.hpp" -#include "../std/unique_ptr.hpp" +#include "std/function.hpp" +#include "std/string.hpp" +#include "std/unique_ptr.hpp" namespace graphics diff --git a/gui/cached_text_view.cpp b/gui/cached_text_view.cpp index 6fe37be3b2..419a4a06c7 100644 --- a/gui/cached_text_view.cpp +++ b/gui/cached_text_view.cpp @@ -1,12 +1,12 @@ -#include "cached_text_view.hpp" -#include "controller.hpp" +#include "gui/cached_text_view.hpp" +#include "gui/controller.hpp" -#include "../geometry/transformations.hpp" +#include "geometry/transformations.hpp" -#include "../graphics/glyph.hpp" -#include "../graphics/screen.hpp" -#include "../graphics/display_list.hpp" -#include "../graphics/glyph_layout.hpp" +#include "graphics/glyph.hpp" +#include "graphics/screen.hpp" +#include "graphics/display_list.hpp" +#include "graphics/glyph_layout.hpp" using namespace graphics; diff --git a/gui/cached_text_view.hpp b/gui/cached_text_view.hpp index e28b080cf2..2fe1b6410d 100644 --- a/gui/cached_text_view.hpp +++ b/gui/cached_text_view.hpp @@ -1,14 +1,14 @@ #pragma once -#include "element.hpp" +#include "gui/element.hpp" -#include "../base/string_utils.hpp" -#include "../base/matrix.hpp" +#include "base/string_utils.hpp" +#include "base/matrix.hpp" -#include "../std/vector.hpp" -#include "../std/shared_ptr.hpp" -#include "../std/unique_ptr.hpp" -#include "../std/function.hpp" +#include "std/vector.hpp" +#include "std/shared_ptr.hpp" +#include "std/unique_ptr.hpp" +#include "std/function.hpp" namespace graphics diff --git a/gui/controller.cpp b/gui/controller.cpp index ff70718f40..d71189d02c 100644 --- a/gui/controller.cpp +++ b/gui/controller.cpp @@ -1,9 +1,9 @@ -#include "controller.hpp" -#include "element.hpp" +#include "gui/controller.hpp" +#include "gui/element.hpp" -#include "../graphics/screen.hpp" +#include "graphics/screen.hpp" -#include "../std/bind.hpp" +#include "std/bind.hpp" namespace gui diff --git a/gui/controller.hpp b/gui/controller.hpp index f9f99496ea..df0796164b 100644 --- a/gui/controller.hpp +++ b/gui/controller.hpp @@ -1,17 +1,17 @@ #pragma once -#include "display_list_cache.hpp" +#include "gui/display_list_cache.hpp" -#include "../graphics/defines.hpp" +#include "graphics/defines.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../base/strings_bundle.hpp" +#include "base/strings_bundle.hpp" -#include "../std/shared_ptr.hpp" -#include "../std/unique_ptr.hpp" -#include "../std/function.hpp" -#include "../std/list.hpp" +#include "std/shared_ptr.hpp" +#include "std/unique_ptr.hpp" +#include "std/function.hpp" +#include "std/list.hpp" namespace graphics diff --git a/gui/display_list_cache.cpp b/gui/display_list_cache.cpp index 19bfb4d364..353a84c742 100644 --- a/gui/display_list_cache.cpp +++ b/gui/display_list_cache.cpp @@ -1,9 +1,9 @@ -#include "display_list_cache.hpp" +#include "gui/display_list_cache.hpp" -#include "../graphics/screen.hpp" -#include "../graphics/display_list.hpp" -#include "../graphics/glyph.hpp" -#include "../graphics/depth_constants.hpp" +#include "graphics/screen.hpp" +#include "graphics/display_list.hpp" +#include "graphics/glyph.hpp" +#include "graphics/depth_constants.hpp" using namespace graphics; diff --git a/gui/display_list_cache.hpp b/gui/display_list_cache.hpp index 3921628604..a88f1137d6 100644 --- a/gui/display_list_cache.hpp +++ b/gui/display_list_cache.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../graphics/glyph_cache.hpp" +#include "graphics/glyph_cache.hpp" -#include "../std/shared_ptr.hpp" +#include "std/shared_ptr.hpp" namespace graphics diff --git a/gui/element.cpp b/gui/element.cpp index 50a9b02053..8e55a03f22 100644 --- a/gui/element.cpp +++ b/gui/element.cpp @@ -1,7 +1,7 @@ -#include "element.hpp" -#include "controller.hpp" +#include "gui/element.hpp" +#include "gui/controller.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" namespace gui diff --git a/gui/element.hpp b/gui/element.hpp index decbd99c17..1e3416e1e0 100644 --- a/gui/element.hpp +++ b/gui/element.hpp @@ -1,10 +1,10 @@ #pragma once -#include "../graphics/overlay_element.hpp" -#include "../graphics/color.hpp" -#include "../graphics/font_desc.hpp" +#include "graphics/overlay_element.hpp" +#include "graphics/color.hpp" +#include "graphics/font_desc.hpp" -#include "../std/map.hpp" +#include "std/map.hpp" namespace graphics diff --git a/gui/gui_tests/gui_tests.cpp b/gui/gui_tests/gui_tests.cpp index f4680bd5d7..0e9f374288 100644 --- a/gui/gui_tests/gui_tests.cpp +++ b/gui/gui_tests/gui_tests.cpp @@ -1,14 +1,14 @@ -#include "../../qt_tstfrm/gui_test_widget.hpp" +#include "qt_tstfrm/gui_test_widget.hpp" -#include "../button.hpp" -#include "../text_view.hpp" -#include "../image_view.hpp" -#include "../cached_text_view.hpp" +#include "gui/button.hpp" +#include "gui/text_view.hpp" +#include "gui/image_view.hpp" +#include "gui/cached_text_view.hpp" -#include "../../graphics/display_list.hpp" +#include "graphics/display_list.hpp" -#include "../../map/country_status_display.hpp" -#include "../../map/framework.hpp" +#include "map/country_status_display.hpp" +#include "map/framework.hpp" struct ButtonTest diff --git a/gui/image_view.cpp b/gui/image_view.cpp index 824bba70c4..6dec9261a9 100644 --- a/gui/image_view.cpp +++ b/gui/image_view.cpp @@ -1,12 +1,12 @@ -#include "image_view.hpp" -#include "controller.hpp" +#include "gui/image_view.hpp" +#include "gui/controller.hpp" -#include "../graphics/screen.hpp" -#include "../graphics/display_list.hpp" +#include "graphics/screen.hpp" +#include "graphics/display_list.hpp" -#include "../geometry/transformations.hpp" +#include "geometry/transformations.hpp" -#include "../base/matrix.hpp" +#include "base/matrix.hpp" namespace gui diff --git a/gui/image_view.hpp b/gui/image_view.hpp index 86419070f7..befe761a6c 100644 --- a/gui/image_view.hpp +++ b/gui/image_view.hpp @@ -1,10 +1,10 @@ #pragma once -#include "element.hpp" +#include "gui/element.hpp" -#include "../graphics/image.hpp" +#include "graphics/image.hpp" -#include "../std/unique_ptr.hpp" +#include "std/unique_ptr.hpp" namespace graphics diff --git a/gui/text_view.cpp b/gui/text_view.cpp index c29224c43d..534b2d4823 100644 --- a/gui/text_view.cpp +++ b/gui/text_view.cpp @@ -1,11 +1,11 @@ -#include "text_view.hpp" -#include "controller.hpp" +#include "gui/text_view.hpp" +#include "gui/controller.hpp" -#include "../graphics/display_list.hpp" -#include "../graphics/screen.hpp" -#include "../graphics/straight_text_element.hpp" +#include "graphics/display_list.hpp" +#include "graphics/screen.hpp" +#include "graphics/straight_text_element.hpp" -#include "../geometry/transformations.hpp" +#include "geometry/transformations.hpp" namespace gui diff --git a/gui/text_view.hpp b/gui/text_view.hpp index f684af5ee5..ea6cf783bd 100644 --- a/gui/text_view.hpp +++ b/gui/text_view.hpp @@ -1,8 +1,8 @@ #pragma once -#include "element.hpp" +#include "gui/element.hpp" -#include "../std/unique_ptr.hpp" +#include "std/unique_ptr.hpp" namespace graphics |