From 542e2a9075868f443320d8b2298f32fa2e7d22b1 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Tue, 4 Feb 2014 21:48:06 +0900 Subject: [PATCH] enventor - code clean up. hide data types as possible. --- src/bin/base_gui.c | 4 ++-- src/bin/config_data.c | 6 ++---- src/bin/ctxpopup.c | 6 ++---- src/bin/dummy_obj.c | 4 ++-- src/bin/main.c | 4 ++-- src/bin/panes.c | 2 ++ src/include/common.h | 3 --- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c index 23c1d25..bab75ed 100644 --- a/src/bin/base_gui.c +++ b/src/bin/base_gui.c @@ -1,11 +1,11 @@ #include #include "common.h" -struct base_s +typedef struct base_s { Evas_Object *win; Evas_Object *layout; -}; +} base_data; static base_data *g_bd = NULL; diff --git a/src/bin/config_data.c b/src/bin/config_data.c index 43a4e65..190fef1 100644 --- a/src/bin/config_data.c +++ b/src/bin/config_data.c @@ -1,7 +1,7 @@ #include #include "common.h" -struct config_s +typedef struct config_s { const char *edc_path; const char *edj_path; @@ -28,9 +28,7 @@ struct config_s Eina_Bool dummy_swallow : 1; Eina_Bool auto_indent : 1; Eina_Bool hotkeys : 1; -}; - -typedef struct config_s config_data; +} config_data; static config_data *g_cd = NULL; diff --git a/src/bin/ctxpopup.c b/src/bin/ctxpopup.c index e8be85b..156671c 100644 --- a/src/bin/ctxpopup.c +++ b/src/bin/ctxpopup.c @@ -1,14 +1,12 @@ #include #include "common.h" -struct ctxpopup_data_s { +typedef struct ctxpopup_data_s { Evas_Smart_Cb selected_cb; Evas_Smart_Cb relay_cb; Evas_Object *ctxpopup; void *data; -}; - -typedef struct ctxpopup_data_s ctxpopup_data; +} ctxpopup_data; static void btn_plus_cb(void *data, Evas_Object *obj EINA_UNUSED, diff --git a/src/bin/dummy_obj.c b/src/bin/dummy_obj.c index 9bba04b..f492d73 100644 --- a/src/bin/dummy_obj.c +++ b/src/bin/dummy_obj.c @@ -10,12 +10,12 @@ typedef struct part_obj_s Eina_Stringshare *name; } part_obj; -struct dummy_obj_s +typedef struct dummy_obj_s { Evas_Object *layout; Eina_List *swallows; Ecore_Animator *animator; -}; +} dummy_obj; const char *DUMMYOBJ = "dummy_obj"; diff --git a/src/bin/main.c b/src/bin/main.c index fef4df2..a73ef62 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -3,7 +3,7 @@ #include "config.h" #include "common.h" -struct app_s +typedef struct app_s { edit_data *ed; edj_mgr *em; @@ -13,7 +13,7 @@ struct app_s Eina_Bool ctrl_pressed : 1; Eina_Bool shift_pressed : 1; -}; +} app_data; int main(int argc, char **argv); diff --git a/src/bin/panes.c b/src/bin/panes.c index 87d4b6c..1892a3d 100644 --- a/src/bin/panes.c +++ b/src/bin/panes.c @@ -253,4 +253,6 @@ panes_init(Evas_Object *parent) pd->state = PANES_SPLIT_VIEW; evas_object_data_set(panes, PANES_DATA, pd); + + return panes; } diff --git a/src/include/common.h b/src/include/common.h index 9e2b5a8..e8b2073 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -2,17 +2,14 @@ #define __COMMON_H__ typedef struct viewer_s view_data; -typedef struct app_s app_data; typedef struct statusbar_s stats_data; typedef struct editor_s edit_data; typedef struct syntax_color_s color_data; typedef struct parser_s parser_data; typedef struct attr_value_s attr_value; -typedef struct dummy_obj_s dummy_obj; typedef struct syntax_helper_s syntax_helper; typedef struct indent_s indent_data; typedef struct edj_mgr_s edj_mgr; -typedef struct base_s base_data; #include "edc_editor.h" #include "menu.h"