From 9d2d7ee869ecc054355ce0720f75d3cd5d97ae92 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 21 Nov 2017 10:51:10 +0100 Subject: [PATCH] revert include paths --- lv_draw/lv_draw.c | 10 +++++----- lv_draw/lv_draw.h | 2 +- lv_draw/lv_draw_rbasic.c | 2 +- lv_draw/lv_draw_rbasic.h | 6 +++--- lv_draw/lv_draw_vbasic.c | 6 +++--- lv_draw/lv_draw_vbasic.h | 6 +++--- lv_hal/lv_hal_disp.c | 2 +- lv_hal/lv_hal_disp.h | 2 +- lv_hal/lv_hal_indev.c | 2 +- lv_hal/lv_hal_indev.h | 2 +- lv_obj/lv_indev.c | 4 ++-- lv_obj/lv_obj.c | 2 +- lv_obj/lv_obj.h | 8 ++++---- lv_obj/lv_refr.c | 4 ++-- lv_obj/lv_style.c | 2 +- lv_obj/lv_style.h | 8 ++++---- lv_obj/lv_vdb.h | 4 ++-- lv_objx/lv_bar.c | 2 +- lv_objx/lv_btn.c | 4 ++-- lv_objx/lv_btnm.c | 2 +- lv_objx/lv_cont.c | 6 +++--- lv_objx/lv_ddlist.c | 4 ++-- lv_objx/lv_gauge.c | 6 +++--- lv_objx/lv_img.c | 6 +++--- lv_objx/lv_img.h | 4 ++-- lv_objx/lv_label.c | 10 +++++----- lv_objx/lv_label.h | 6 +++--- lv_objx/lv_line.c | 2 +- lv_objx/lv_list.c | 4 ++-- lv_objx/lv_lmeter.c | 2 +- lv_objx/lv_mbox.c | 4 ++-- lv_objx/lv_page.c | 4 ++-- lv_objx/lv_slider.c | 2 +- lv_objx/lv_ta.c | 6 +++--- lv_objx/lv_tabview.c | 2 +- lvgl.h | 4 ++-- 36 files changed, 76 insertions(+), 76 deletions(-) diff --git a/lv_draw/lv_draw.c b/lv_draw/lv_draw.c index bf3ed03f4..c6b9aa163 100644 --- a/lv_draw/lv_draw.c +++ b/lv_draw/lv_draw.c @@ -13,11 +13,11 @@ #include "lv_draw.h" #include "lv_draw_rbasic.h" #include "lv_draw_vbasic.h" -#include "lvgl/misc/gfx/text.h" -#include "lvgl/misc/gfx/circ.h" -#include "lvgl/misc/fs/fsint.h" -#include "lvgl/misc/math/math_base.h" -#include "lvgl/misc/fs/ufs/ufs.h" +#include "misc/gfx/text.h" +#include "misc/gfx/circ.h" +#include "misc/fs/fsint.h" +#include "misc/math/math_base.h" +#include "misc/fs/ufs/ufs.h" #include "../lv_objx/lv_img.h" /********************* diff --git a/lv_draw/lv_draw.h b/lv_draw/lv_draw.h index 3e0a7d789..5c3d20673 100644 --- a/lv_draw/lv_draw.h +++ b/lv_draw/lv_draw.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "misc_conf.h" -#include "lvgl/misc/gfx/text.h" +#include "misc/gfx/text.h" #include "../lv_obj/lv_style.h" /********************* diff --git a/lv_draw/lv_draw_rbasic.c b/lv_draw/lv_draw_rbasic.c index 40de7fa48..b17bb2675 100644 --- a/lv_draw/lv_draw_rbasic.c +++ b/lv_draw/lv_draw_rbasic.c @@ -9,7 +9,7 @@ #include "../lv_hal/lv_hal_disp.h" #include "lv_draw_rbasic.h" #include "lv_conf.h" -#include "lvgl/misc/gfx/font.h" +#include "misc/gfx/font.h" /********************* * DEFINES diff --git a/lv_draw/lv_draw_rbasic.h b/lv_draw/lv_draw_rbasic.h index b57e1d993..f5337d9c3 100644 --- a/lv_draw/lv_draw_rbasic.h +++ b/lv_draw/lv_draw_rbasic.h @@ -13,9 +13,9 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "lvgl/misc/gfx/color.h" -#include "lvgl/misc/gfx/area.h" -#include "lvgl/misc/gfx/font.h" +#include "misc/gfx/color.h" +#include "misc/gfx/area.h" +#include "misc/gfx/font.h" /********************* * DEFINES diff --git a/lv_draw/lv_draw_vbasic.c b/lv_draw/lv_draw_vbasic.c index 228febaa2..56f549402 100644 --- a/lv_draw/lv_draw_vbasic.c +++ b/lv_draw/lv_draw_vbasic.c @@ -10,9 +10,9 @@ #include #include "../lv_hal/lv_hal_disp.h" -#include "lvgl/misc/gfx/area.h" -#include "lvgl/misc/gfx/font.h" -#include "lvgl/misc/gfx/color.h" +#include "misc/gfx/area.h" +#include "misc/gfx/font.h" +#include "misc/gfx/color.h" #if LV_VDB_SIZE != 0 diff --git a/lv_draw/lv_draw_vbasic.h b/lv_draw/lv_draw_vbasic.h index 7326e83a0..4e39117f5 100644 --- a/lv_draw/lv_draw_vbasic.h +++ b/lv_draw/lv_draw_vbasic.h @@ -17,9 +17,9 @@ extern "C" { #if LV_VDB_SIZE != 0 -#include "lvgl/misc/gfx/color.h" -#include "lvgl/misc/gfx/area.h" -#include "lvgl/misc/gfx/font.h" +#include "misc/gfx/color.h" +#include "misc/gfx/area.h" +#include "misc/gfx/font.h" /********************* * DEFINES diff --git a/lv_hal/lv_hal_disp.c b/lv_hal/lv_hal_disp.c index 12c7382c4..fcb73cc9e 100644 --- a/lv_hal/lv_hal_disp.c +++ b/lv_hal/lv_hal_disp.c @@ -12,7 +12,7 @@ #include #include #include "../lv_hal/lv_hal_disp.h" -#include "lvgl/misc/mem/dyn_mem.h" +#include "misc/mem/dyn_mem.h" /********************* * DEFINES diff --git a/lv_hal/lv_hal_disp.h b/lv_hal/lv_hal_disp.h index deec70188..c941ab589 100644 --- a/lv_hal/lv_hal_disp.h +++ b/lv_hal/lv_hal_disp.h @@ -18,7 +18,7 @@ extern "C" { #include #include #include "lv_hal.h" -#include "lvgl/misc/gfx/color.h" +#include "misc/gfx/color.h" /********************* * DEFINES diff --git a/lv_hal/lv_hal_indev.c b/lv_hal/lv_hal_indev.c index 35de85fde..a79bdb934 100644 --- a/lv_hal/lv_hal_indev.c +++ b/lv_hal/lv_hal_indev.c @@ -9,7 +9,7 @@ * INCLUDES *********************/ #include "../lv_hal/lv_hal_indev.h" -#include "lvgl/misc/mem/linked_list.h" +#include "misc/mem/linked_list.h" /********************* * DEFINES diff --git a/lv_hal/lv_hal_indev.h b/lv_hal/lv_hal_indev.h index e01e41c06..db60d978a 100644 --- a/lv_hal/lv_hal_indev.h +++ b/lv_hal/lv_hal_indev.h @@ -18,7 +18,7 @@ extern "C" { #include #include #include "lv_hal.h" -#include "lvgl/misc/gfx/area.h" +#include "misc/gfx/area.h" /********************* * DEFINES diff --git a/lv_obj/lv_indev.c b/lv_obj/lv_indev.c index 7e7f8f68e..ec3b61725 100644 --- a/lv_obj/lv_indev.c +++ b/lv_obj/lv_indev.c @@ -11,8 +11,8 @@ #include "../lv_hal/lv_hal_tick.h" #include "../lv_obj/lv_group.h" -#include "lvgl/misc/os/ptask.h" -#include "lvgl/misc/math/math_base.h" +#include "misc/os/ptask.h" +#include "misc/math/math_base.h" #include "../lv_draw/lv_draw_rbasic.h" #include "lv_obj.h" diff --git a/lv_obj/lv_obj.c b/lv_obj/lv_obj.c index 2342d3478..22268a0ac 100644 --- a/lv_obj/lv_obj.c +++ b/lv_obj/lv_obj.c @@ -14,7 +14,7 @@ #include "../lv_draw/lv_draw_rbasic.h" #include "lv_refr.h" #include "lv_group.h" -#include "lvgl/misc/gfx/anim.h" +#include "misc/gfx/anim.h" #include #include diff --git a/lv_obj/lv_obj.h b/lv_obj/lv_obj.h index 6b9aaf9d2..8df4f0e30 100644 --- a/lv_obj/lv_obj.h +++ b/lv_obj/lv_obj.h @@ -16,10 +16,10 @@ extern "C" { #include "lv_conf.h" #include #include -#include "lvgl/misc/gfx/area.h" -#include "lvgl/misc/mem/dyn_mem.h" -#include "lvgl/misc/mem/linked_list.h" -#include "lvgl/misc/gfx/color.h" +#include "misc/gfx/area.h" +#include "misc/mem/dyn_mem.h" +#include "misc/mem/linked_list.h" +#include "misc/gfx/color.h" #include "lv_style.h" /********************* diff --git a/lv_obj/lv_refr.c b/lv_obj/lv_refr.c index 5da65dbe0..ea373ba54 100644 --- a/lv_obj/lv_refr.c +++ b/lv_obj/lv_refr.c @@ -11,8 +11,8 @@ #include #include "lv_refr.h" #include "lv_vdb.h" -#include "lvgl/misc/os/ptask.h" -#include "lvgl/misc/mem/fifo.h" +#include "misc/os/ptask.h" +#include "misc/mem/fifo.h" /********************* * DEFINES diff --git a/lv_obj/lv_style.c b/lv_obj/lv_style.c index ef39a56aa..89b0a4d98 100644 --- a/lv_obj/lv_style.c +++ b/lv_obj/lv_style.c @@ -9,7 +9,7 @@ #include "lv_conf.h" #include "lv_style.h" #include "lv_obj.h" -#include "lvgl/misc/mem/dyn_mem.h" +#include "misc/mem/dyn_mem.h" /********************* * DEFINES diff --git a/lv_obj/lv_style.h b/lv_obj/lv_style.h index 183668f16..54b356bf4 100644 --- a/lv_obj/lv_style.h +++ b/lv_obj/lv_style.h @@ -14,10 +14,10 @@ extern "C" { * INCLUDES *********************/ #include -#include "lvgl/misc/gfx/color.h" -#include "lvgl/misc/gfx/area.h" -#include "lvgl/misc/gfx/font.h" -#include "lvgl/misc/gfx/anim.h" +#include "misc/gfx/color.h" +#include "misc/gfx/area.h" +#include "misc/gfx/font.h" +#include "misc/gfx/anim.h" /********************* * DEFINES diff --git a/lv_obj/lv_vdb.h b/lv_obj/lv_vdb.h index 83d332852..54a0facf6 100644 --- a/lv_obj/lv_vdb.h +++ b/lv_obj/lv_vdb.h @@ -17,8 +17,8 @@ extern "C" { #if LV_VDB_SIZE != 0 -#include "lvgl/misc/gfx/color.h" -#include "lvgl/misc/gfx/area.h" +#include "misc/gfx/color.h" +#include "misc/gfx/area.h" /********************* * DEFINES diff --git a/lv_objx/lv_bar.c b/lv_objx/lv_bar.c index 3c216e8ae..faaf3b390 100644 --- a/lv_objx/lv_bar.c +++ b/lv_objx/lv_bar.c @@ -14,7 +14,7 @@ #include "lv_bar.h" #include "../lv_draw/lv_draw.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/gfx/anim.h" +#include "misc/gfx/anim.h" #include /********************* diff --git a/lv_objx/lv_btn.c b/lv_objx/lv_btn.c index b19332a97..3388db718 100644 --- a/lv_objx/lv_btn.c +++ b/lv_objx/lv_btn.c @@ -15,8 +15,8 @@ #include "../lv_obj/lv_group.h" #include "../lv_draw/lv_draw.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/gfx/area.h" -#include "lvgl/misc/gfx/color.h" +#include "misc/gfx/area.h" +#include "misc/gfx/color.h" /********************* * DEFINES diff --git a/lv_objx/lv_btnm.c b/lv_objx/lv_btnm.c index 641064de6..e99f5488f 100644 --- a/lv_objx/lv_btnm.c +++ b/lv_objx/lv_btnm.c @@ -14,7 +14,7 @@ #include "../lv_draw/lv_draw.h" #include "../lv_obj/lv_refr.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/gfx/text.h" +#include "misc/gfx/text.h" /********************* * DEFINES diff --git a/lv_objx/lv_cont.c b/lv_objx/lv_cont.c index 670de469a..2f083924c 100644 --- a/lv_objx/lv_cont.c +++ b/lv_objx/lv_cont.c @@ -18,10 +18,10 @@ #include "../lv_draw/lv_draw.h" #include "../lv_draw/lv_draw_vbasic.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/gfx/area.h" +#include "misc/gfx/area.h" -#include "lvgl/misc/gfx/color.h" -#include "lvgl/misc/math/math_base.h" +#include "misc/gfx/color.h" +#include "misc/math/math_base.h" /********************* * DEFINES diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c index 6c9cc9193..a0dc26862 100644 --- a/lv_objx/lv_ddlist.c +++ b/lv_objx/lv_ddlist.c @@ -15,8 +15,8 @@ #include "../lv_obj/lv_group.h" #include "../lv_obj/lv_indev.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/gfx/fonts/symbol_def.h" -#include "lvgl/misc/gfx/anim.h" +#include "misc/gfx/fonts/symbol_def.h" +#include "misc/gfx/anim.h" /********************* * DEFINES diff --git a/lv_objx/lv_gauge.c b/lv_objx/lv_gauge.c index 3121ac16d..baf2d27ac 100644 --- a/lv_objx/lv_gauge.c +++ b/lv_objx/lv_gauge.c @@ -13,9 +13,9 @@ #include "lv_gauge.h" #include "../lv_draw/lv_draw.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/gfx/text.h" -#include "lvgl/misc/math/trigo.h" -#include "lvgl/misc/math/math_base.h" +#include "misc/gfx/text.h" +#include "misc/math/trigo.h" +#include "misc/math/math_base.h" #include #include diff --git a/lv_objx/lv_img.c b/lv_objx/lv_img.c index ef8a30119..48ac02eaa 100644 --- a/lv_objx/lv_img.c +++ b/lv_objx/lv_img.c @@ -13,9 +13,9 @@ #include "lv_img.h" #include "../lv_draw/lv_draw.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/fs/fsint.h" -#include "lvgl/misc/fs/ufs/ufs.h" -#include "lvgl/misc/gfx/text.h" +#include "misc/fs/fsint.h" +#include "misc/fs/ufs/ufs.h" +#include "misc/gfx/text.h" /********************* * DEFINES diff --git a/lv_objx/lv_img.h b/lv_objx/lv_img.h index 2af87322f..eb7cb3b33 100644 --- a/lv_objx/lv_img.h +++ b/lv_objx/lv_img.h @@ -18,7 +18,7 @@ extern "C" { #if USE_LV_IMG != 0 && USE_FSINT != 0 #include "../lv_obj/lv_obj.h" -#include "lvgl/misc/fs/fsint.h" +#include "misc/fs/fsint.h" #ifndef LV_IMG_ENABLE_SYMBOLS #define LV_IMG_ENABLE_SYMBOLS 0 @@ -26,7 +26,7 @@ extern "C" { #if LV_IMG_ENABLE_SYMBOLS != 0 #include "lv_label.h" -#include "lvgl/misc/gfx/fonts/symbol_def.h" +#include "misc/gfx/fonts/symbol_def.h" #endif /********************* diff --git a/lv_objx/lv_label.c b/lv_objx/lv_label.c index 4d6c5b2a3..eb00e01b3 100644 --- a/lv_objx/lv_label.c +++ b/lv_objx/lv_label.c @@ -13,11 +13,11 @@ #include "../lv_obj/lv_obj.h" #include "../lv_obj/lv_group.h" #include "../lv_draw/lv_draw.h" -#include "lvgl/misc/gfx/color.h" -#include "lvgl/misc/gfx/text.h" -#include "lvgl/misc/math/math_base.h" -#include "lvgl/misc/gfx/text.h" -#include "lvgl/misc/gfx/anim.h" +#include "misc/gfx/color.h" +#include "misc/gfx/text.h" +#include "misc/math/math_base.h" +#include "misc/gfx/text.h" +#include "misc/gfx/anim.h" /********************* * DEFINES diff --git a/lv_objx/lv_label.h b/lv_objx/lv_label.h index 56ab6c2e6..3d66a824a 100644 --- a/lv_objx/lv_label.h +++ b/lv_objx/lv_label.h @@ -17,9 +17,9 @@ extern "C" { #if USE_LV_LABEL != 0 #include "../lv_obj/lv_obj.h" -#include "lvgl/misc/gfx/font.h" -#include "lvgl/misc/gfx/text.h" -#include "lvgl/misc/gfx/fonts/symbol_def.h" +#include "misc/gfx/font.h" +#include "misc/gfx/text.h" +#include "misc/gfx/fonts/symbol_def.h" /********************* * DEFINES diff --git a/lv_objx/lv_line.c b/lv_objx/lv_line.c index a0ae534b3..14ef9399a 100644 --- a/lv_objx/lv_line.c +++ b/lv_objx/lv_line.c @@ -11,7 +11,7 @@ #if USE_LV_LINE != 0 #include "lv_line.h" #include "../lv_draw/lv_draw.h" -#include "lvgl/misc/math/math_base.h" +#include "misc/math/math_base.h" #include #include #include diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c index 04a06735b..5c7153fe9 100644 --- a/lv_objx/lv_list.c +++ b/lv_objx/lv_list.c @@ -12,8 +12,8 @@ #include "lv_list.h" #include "../lv_obj/lv_group.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/gfx/anim.h" -#include "lvgl/misc/math/math_base.h" +#include "misc/gfx/anim.h" +#include "misc/math/math_base.h" /********************* * DEFINES diff --git a/lv_objx/lv_lmeter.c b/lv_objx/lv_lmeter.c index f8ab81101..7d56d389d 100644 --- a/lv_objx/lv_lmeter.c +++ b/lv_objx/lv_lmeter.c @@ -13,7 +13,7 @@ #include "../lv_draw/lv_draw.h" #include "../lv_themes/lv_theme.h" #include "../lv_obj/lv_group.h" -#include "lvgl/misc/math/trigo.h" +#include "misc/math/trigo.h" /********************* * DEFINES diff --git a/lv_objx/lv_mbox.c b/lv_objx/lv_mbox.c index d82613d20..e7fa22957 100644 --- a/lv_objx/lv_mbox.c +++ b/lv_objx/lv_mbox.c @@ -13,8 +13,8 @@ #include "lv_mbox.h" #include "../lv_obj/lv_group.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/gfx/anim.h" -#include "lvgl/misc/math/math_base.h" +#include "misc/gfx/anim.h" +#include "misc/math/math_base.h" /********************* * DEFINES diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c index ba60304e8..52016fbce 100644 --- a/lv_objx/lv_page.c +++ b/lv_objx/lv_page.c @@ -9,13 +9,13 @@ #include "lv_conf.h" #if USE_LV_PAGE != 0 -#include "lvgl/misc/math/math_base.h" +#include "misc/math/math_base.h" #include "../lv_obj/lv_group.h" #include "../lv_objx/lv_page.h" #include "../lv_draw/lv_draw.h" #include "../lv_themes/lv_theme.h" #include "../lv_obj/lv_refr.h" -#include "lvgl/misc/gfx/anim.h" +#include "misc/gfx/anim.h" /********************* * DEFINES diff --git a/lv_objx/lv_slider.c b/lv_objx/lv_slider.c index 7f3bffdf9..ecab810f7 100644 --- a/lv_objx/lv_slider.c +++ b/lv_objx/lv_slider.c @@ -13,7 +13,7 @@ #include "../lv_obj/lv_group.h" #include "../lv_draw/lv_draw.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/math/math_base.h" +#include "misc/math/math_base.h" /********************* * DEFINES diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c index b2dfa38ab..64cddc157 100644 --- a/lv_objx/lv_ta.c +++ b/lv_objx/lv_ta.c @@ -14,9 +14,9 @@ #include "../lv_obj/lv_group.h" #include "../lv_draw/lv_draw.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/gfx/anim.h" -#include "lvgl/misc/gfx/text.h" -#include "lvgl/misc/math/math_base.h" +#include "misc/gfx/anim.h" +#include "misc/gfx/text.h" +#include "misc/math/math_base.h" /********************* * DEFINES diff --git a/lv_objx/lv_tabview.c b/lv_objx/lv_tabview.c index 57c484917..d1e511026 100644 --- a/lv_objx/lv_tabview.c +++ b/lv_objx/lv_tabview.c @@ -12,7 +12,7 @@ #include "lv_tabview.h" #include "lv_btnm.h" #include "../lv_themes/lv_theme.h" -#include "lvgl/misc/gfx/anim.h" +#include "misc/gfx/anim.h" /********************* * DEFINES diff --git a/lvgl.h b/lvgl.h index f39f8b280..16a3eaf42 100644 --- a/lvgl.h +++ b/lvgl.h @@ -15,8 +15,8 @@ extern "C" { *********************/ /*Test misc. module version*/ -#include "lvgl/misc/misc.h" -#include "lvgl/misc/os/ptask.h" +#include "misc/misc.h" +#include "misc/os/ptask.h" #include "lv_hal/lv_hal.h"