From c84f114dd6bf8f6b2483eea3ec241e664b4bbae9 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 7 Sep 2018 17:09:09 +0200 Subject: [PATCH] rename lv_...clear to lv_..._clean --- lv_objx/lv_list.c | 2 +- lv_objx/lv_list.h | 2 +- lv_objx/lv_page.c | 2 +- lv_objx/lv_page.h | 2 +- lv_objx/lv_win.c | 2 +- lv_objx/lv_win.h | 16 +--------------- 6 files changed, 6 insertions(+), 20 deletions(-) diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c index 4cb31c6fe..16cd6573d 100644 --- a/lv_objx/lv_list.c +++ b/lv_objx/lv_list.c @@ -150,7 +150,7 @@ lv_obj_t * lv_list_create(lv_obj_t * par, const lv_obj_t * copy) * Delete all children of the scrl object, without deleting scrl child. * @param obj pointer to an object */ -void lv_list_clear(lv_obj_t * obj) +void lv_list_clean(lv_obj_t * obj) { lv_obj_t * scrl = lv_page_get_scrl(obj); lv_obj_clean(scrl); diff --git a/lv_objx/lv_list.h b/lv_objx/lv_list.h index 59c545e8a..7fae1a888 100644 --- a/lv_objx/lv_list.h +++ b/lv_objx/lv_list.h @@ -88,7 +88,7 @@ lv_obj_t * lv_list_create(lv_obj_t * par, const lv_obj_t * copy); * Delete all children of the scrl object, without deleting scrl child. * @param obj pointer to an object */ -void lv_list_clear(lv_obj_t *obj); +void lv_list_clean(lv_obj_t *obj); /*====================== * Add/remove functions diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c index b7d4429d8..aac73fe28 100644 --- a/lv_objx/lv_page.c +++ b/lv_objx/lv_page.c @@ -151,7 +151,7 @@ lv_obj_t * lv_page_create(lv_obj_t * par, const lv_obj_t * copy) * Delete all children of the scrl object, without deleting scrl child. * @param obj pointer to an object */ -void lv_page_clear(lv_obj_t * obj) +void lv_page_clean(lv_obj_t * obj) { lv_obj_t * scrl = lv_page_get_scrl(obj); lv_obj_clean(scrl); diff --git a/lv_objx/lv_page.h b/lv_objx/lv_page.h index efd950d4d..98cbf21fe 100644 --- a/lv_objx/lv_page.h +++ b/lv_objx/lv_page.h @@ -90,7 +90,7 @@ lv_obj_t * lv_page_create(lv_obj_t * par, const lv_obj_t * copy); * Delete all children of the scrl object, without deleting scrl child. * @param obj pointer to an object */ -void lv_page_clear(lv_obj_t *obj); +void lv_page_clean(lv_obj_t *obj); /** * Get the press action of the page diff --git a/lv_objx/lv_win.c b/lv_objx/lv_win.c index 51cd15f35..f7be6e33a 100644 --- a/lv_objx/lv_win.c +++ b/lv_objx/lv_win.c @@ -146,7 +146,7 @@ lv_obj_t * lv_win_create(lv_obj_t * par, const lv_obj_t * copy) * Delete all children of the scrl object, without deleting scrl child. * @param obj pointer to an object */ -void lv_win_clear(lv_obj_t * obj) +void lv_win_clean(lv_obj_t * obj) { lv_obj_t * scrl = lv_page_get_scrl(obj); lv_obj_clean(scrl); diff --git a/lv_objx/lv_win.h b/lv_objx/lv_win.h index a1af7c605..a0162d25e 100644 --- a/lv_objx/lv_win.h +++ b/lv_objx/lv_win.h @@ -94,7 +94,7 @@ lv_obj_t * lv_win_create(lv_obj_t * par, const lv_obj_t * copy); * Delete all children of the scrl object, without deleting scrl child. * @param obj pointer to an object */ -void lv_win_clear(lv_obj_t *obj); +void lv_win_clean(lv_obj_t *obj); /*====================== * Add/remove functions @@ -134,20 +134,6 @@ void lv_win_set_title(lv_obj_t * win, const char * title); */ void lv_win_set_btn_size(lv_obj_t * win, lv_coord_t size); -/** - * Set the scroll bar mode of a window - * @param win pointer to a window object - * @param sb_mode the new scroll bar mode from 'lv_sb_mode_t' - */ -void lv_win_set_sb_mode(lv_obj_t *win, lv_sb_mode_t sb_mode); - -/** - * Set the layout of the window - * @param win pointer to a window object - * @param layout the layout from 'lv_layout_t' - */ -void lv_win_set_layout(lv_obj_t *win, lv_layout_t layout); - /** * Set a style of a window * @param win pointer to a window object