enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elm: Refactoring. 

Smart data is already initialized so we do not need to re-initialize them if the value equals to 0, NULL, or EINA_FALSE.
Sometimes re-initializing smart data explicitly is needed for readability. So there are left overs.

SVN revision: 82228
This commit is contained in:
Daniel Juyung Seo 2013-01-04 19:10:19 +00:00
parent cf3b781b13
commit ffa9c1e793
28 changed files with 4 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
legacy/elementary/src/lib/elc_hoversel.c
View File

@ -201,16 +201,13 @@ _item_del_pre_hook(Elm_Object_Item *it)
}
static void
_elm_hoversel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_elm_hoversel_smart_add(Eo *obj, void *_pd __UNUSED__,
va_list *list EINA_UNUSED)
{
Elm_Hoversel_Smart_Data *priv = _pd;
eo_do_super(obj, evas_obj_smart_add());
elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
priv->expanded = EINA_FALSE;
evas_object_smart_callback_add(obj, "clicked", _on_clicked, obj);
eo_do(obj, elm_wdg_theme(NULL));

5
legacy/elementary/src/lib/elc_multibuttonentry.c
View File

@ -1520,12 +1520,7 @@ _elm_multibuttonentry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
elm_widget_can_focus_set(obj, EINA_TRUE);
priv->view_state = MULTIBUTTONENTRY_VIEW_NONE;
priv->last_btn_select = EINA_TRUE;
priv->n_str = 0;
priv->rect_for_end = NULL;
priv->add_callback = NULL;
priv->add_callback_data = NULL;
priv->editable = EINA_TRUE;
priv->parent = obj;

1
legacy/elementary/src/lib/elm_actionslider.c
View File

@ -392,7 +392,6 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, evas_obj_smart_add());
priv->mouse_down = EINA_FALSE;
priv->enabled_position = ELM_ACTIONSLIDER_ALL;
priv->drag_button_base =

1
legacy/elementary/src/lib/elm_calendar.c
View File

@ -924,7 +924,6 @@ _elm_calendar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
priv->selected_it = -1;
priv->first_day_it = -1;
priv->format_func = _format_month_year;
priv->marks = NULL;
priv->selectable = (~(ELM_CALENDAR_SELECTABLE_NONE));
edje_object_signal_callback_add

1
legacy/elementary/src/lib/elm_clock.c
View File

@ -662,7 +662,6 @@ _elm_clock_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
priv->cur.edit = EINA_TRUE;
priv->cur.digedit = ELM_CLOCK_EDIT_DEFAULT;
priv->first_interval = DEFAULT_FIRST_INTERVAL;
priv->timediff = 0;
elm_widget_can_focus_set(obj, EINA_TRUE);

3
legacy/elementary/src/lib/elm_colorselector.c
View File

@ -1522,9 +1522,6 @@ _elm_colorselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
priv->grab.x = -1;
priv->grab.y = -1;
priv->grab.xroot = -1;
priv->grab.mouse_motion = NULL;
priv->grab.mouse_up = NULL;
priv->grab.key_up = NULL;
priv->grab.in = EINA_TRUE;
_hsl_to_rgb(priv);

4
legacy/elementary/src/lib/elm_diskselector.c
View File

@ -1245,11 +1245,7 @@ _elm_diskselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect));
priv->item_count = 0;
priv->round = EINA_FALSE;
priv->init = EINA_FALSE;
priv->len_side = 3;
priv->display_item_num_by_api = EINA_FALSE;
eo_do(obj, elm_wdg_theme(NULL));

5
legacy/elementary/src/lib/elm_entry.c
View File

@ -2765,13 +2765,8 @@ _elm_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
priv->cnp_mode = ELM_CNP_MODE_MARKUP;
priv->line_wrap = ELM_WRAP_WORD;
priv->context_menu = EINA_TRUE;
priv->disabled = EINA_FALSE;
priv->auto_save = EINA_TRUE;
priv->editable = EINA_TRUE;
priv->scroll = EINA_FALSE;
priv->text = NULL;
priv->input_panel_imdata = NULL;
elm_layout_theme_set(obj, "entry", "base", elm_widget_style_get(obj));

1
legacy/elementary/src/lib/elm_flipselector.c
View File

@ -568,7 +568,6 @@ _elm_flipselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
(obj, "elm,action,down,stop", "", _signal_val_change_stop, obj);
priv->first_interval = FLIP_FIRST_INTERVAL;
priv->evaluating = EINA_FALSE;
elm_widget_can_focus_set(obj, EINA_TRUE);

1
legacy/elementary/src/lib/elm_gesture_layer.c
View File

@ -3590,7 +3590,6 @@ _elm_gesture_layer_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
Elm_Gesture_Layer_Smart_Data *priv = _pd;
priv->target = NULL;
priv->line_min_length =
_elm_config->glayer_line_min_length * elm_config_finger_size_get();
priv->zoom_distance_tolerance = _elm_config->glayer_zoom_distance_tolerance

10
legacy/elementary/src/lib/elm_glview.c
View File

@ -213,23 +213,13 @@ _elm_glview_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
priv->config->color_format = EVAS_GL_RGB_888;
// Initialize variables
priv->mode = 0;
priv->scale_policy = ELM_GLVIEW_RESIZE_POLICY_RECREATE;
priv->render_policy = ELM_GLVIEW_RENDER_POLICY_ON_DEMAND;
priv->surface = NULL;
// Initialize it to (64,64) (It's an arbitrary value)
priv->w = 64;
priv->h = 64;
// Initialize the rest of the values
priv->init_func = NULL;
priv->del_func = NULL;
priv->render_func = NULL;
priv->render_idle_enterer = NULL;
priv->initialized = EINA_FALSE;
priv->resized = EINA_FALSE;
// Create Context
priv->context = evas_gl_context_create(priv->evasgl, NULL);
if (!priv->context)

1
legacy/elementary/src/lib/elm_image.c
View File

@ -641,7 +641,6 @@ _elm_image_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
/* starts as an Evas image. may switch to an Edje object */
priv->img = _img_new(obj);
priv->prev_img = NULL;
priv->smooth = EINA_TRUE;
priv->fill_inside = EINA_TRUE;

4
legacy/elementary/src/lib/elm_index.c
View File

@ -691,10 +691,6 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, evas_obj_smart_add());
priv->indicator_disabled = EINA_FALSE;
priv->horizontal = EINA_FALSE;
priv->autohide_disabled = EINA_FALSE;
elm_layout_theme_set
(obj, "index", "base/vertical", elm_widget_style_get(obj));

7
legacy/elementary/src/lib/elm_interface_scrollable.c
View File

@ -66,13 +66,6 @@ _elm_pan_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, evas_obj_smart_add());
priv->self = obj;
priv->x = 0;
priv->y = 0;
priv->w = 0;
priv->h = 0;
priv->gravity_x = 0.0;
priv->gravity_y = 0.0;
}
static void

2
legacy/elementary/src/lib/elm_panel.c
View File

@ -328,8 +328,6 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
elm_widget_can_focus_set(obj, EINA_TRUE);
priv->hidden = EINA_FALSE;
priv->bx = evas_object_box_add(evas_object_evas_get(obj));
evas_object_size_hint_align_set(priv->bx, 0.5, 0.5);
evas_object_box_layout_set(priv->bx, _box_layout_cb, priv, NULL);

2
legacy/elementary/src/lib/elm_photo.c
View File

@ -275,8 +275,6 @@ _elm_photo_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
elm_widget_sub_object_add(obj, priv->icon);
priv->long_press_timer = NULL;
_elm_photo_internal_image_follow(obj);
_sizing_eval(obj);

1
legacy/elementary/src/lib/elm_photocam.c
View File

@ -1334,7 +1334,6 @@ _elm_photocam_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do(obj, elm_scrollable_interface_extern_pan_set(priv->pan_obj));
priv->zoom_g_layer = EINA_FALSE;
priv->g_layer_start = 1.0;
priv->zoom = 1;
priv->mode = ELM_PHOTOCAM_ZOOM_MODE_MANUAL;

3
legacy/elementary/src/lib/elm_progressbar.c
View File

@ -241,9 +241,6 @@ _elm_progressbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, evas_obj_smart_add());
priv->horizontal = EINA_TRUE;
priv->inverted = EINA_FALSE;
priv->pulse = EINA_FALSE;
priv->pulse_state = EINA_FALSE;
priv->units = eina_stringshare_add("%.0f %%");
priv->val = MIN_RATIO_LVL;

1
legacy/elementary/src/lib/elm_radio.c
View File

@ -277,7 +277,6 @@ _elm_radio_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
priv->group = calloc(1, sizeof(Group));
priv->group->radios = eina_list_append(priv->group->radios, obj);
priv->state = EINA_FALSE;
elm_widget_can_focus_set(obj, EINA_TRUE);

7
legacy/elementary/src/lib/elm_separator.c
View File

@ -43,14 +43,11 @@ _elm_separator_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list E
}
static void
_elm_separator_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_elm_separator_smart_add(Eo *obj, void *_pd __UNUSED__,
va_list *list EINA_UNUSED)
{
Elm_Separator_Smart_Data *priv = _pd;
eo_do_super(obj, evas_obj_smart_add());
priv->horizontal = EINA_FALSE;
elm_widget_can_focus_set(obj, EINA_FALSE);
elm_layout_theme_set

2
legacy/elementary/src/lib/elm_slider.c
View File

@ -755,8 +755,6 @@ _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
priv->horizontal = EINA_TRUE;
priv->indicator_show = EINA_TRUE;
priv->val = 0.0;
priv->val_min = 0.0;
priv->val_max = 1.0;
elm_layout_theme_set

3
legacy/elementary/src/lib/elm_slideshow.c
View File

@ -312,9 +312,6 @@ _elm_slideshow_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
Elm_Slideshow_Smart_Data *priv = _pd;
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
priv->current = NULL;
priv->previous = NULL;
priv->count_item_pre_before = 2;
priv->count_item_pre_after = 2;

5
legacy/elementary/src/lib/elm_spinner.c
View File

@ -631,14 +631,9 @@ _elm_spinner_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do_super(obj, evas_obj_smart_add());
priv->val = 0.0;
priv->val_min = 0.0;
priv->val_max = 100.0;
priv->wrap = 0;
priv->step = 1.0;
priv->first_interval = 0.85;
priv->entry_visible = EINA_FALSE;
priv->editable = EINA_TRUE;
elm_layout_theme_set(obj, "spinner", "base", elm_widget_style_get(obj));
elm_layout_signal_callback_add(obj, "drag", "*", _drag_cb, obj);

11
legacy/elementary/src/lib/elm_thumb.c
View File

@ -544,18 +544,7 @@ _elm_thumb_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
(wd->resize_obj, "thumb", "base",
elm_widget_style_get(obj));
priv->view = NULL;
priv->file = NULL;
priv->key = NULL;
priv->eeh = NULL;
priv->on_hold = EINA_FALSE;
priv->is_video = EINA_FALSE;
priv->was_video = EINA_FALSE;
#ifdef HAVE_ELEMENTARY_ETHUMB
priv->thumb.thumb_path = NULL;
priv->thumb.thumb_key = NULL;
priv->thumb.request = NULL;
evas_object_event_callback_add
(obj, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, priv);
evas_object_event_callback_add

5
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -2156,8 +2156,6 @@ _elm_toolbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect));
priv->more_item = NULL;
priv->selected_item = NULL;
priv->standard_priority = -99999;
eo_do(obj,
@ -2181,10 +2179,7 @@ _elm_toolbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_elm_toolbar_action_down_cb, obj);
priv->shrink_mode = ELM_TOOLBAR_SHRINK_NONE;
priv->priv_icon_size = 0; // unset
priv->theme_icon_size = _elm_toolbar_icon_size_get(obj);
if (priv->priv_icon_size) priv->icon_size = priv->priv_icon_size;
else priv->icon_size = priv->theme_icon_size;
priv->homogeneous = EINA_TRUE;
priv->align = 0.5;

3
legacy/elementary/src/lib/elm_video.c
View File

@ -241,9 +241,6 @@ _elm_video_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
elm_widget_can_focus_set(obj, EINA_TRUE);
#ifdef HAVE_EMOTION
priv->stop = EINA_FALSE;
priv->remember = EINA_FALSE;
priv->emotion = emotion_object_add(evas_object_evas_get(obj));
emotion_object_init(priv->emotion, NULL);

1
legacy/elementary/src/lib/elm_web.c
View File

@ -1164,7 +1164,6 @@ _elm_web_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
(wd->resize_obj, "view,resized",
_ewk_view_resized_cb, priv);
priv->tab_propagate = EINA_FALSE;
priv->inwin_mode = _elm_config->inwin_dialogs_enable;
priv->zoom.min =
ewk_view_zoom_range_min_get(wd->resize_obj);

1
legacy/elementary/src/lib/elm_widget.c
View File

@ -169,7 +169,6 @@ _elm_widget_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
Elm_Widget_Smart_Data *priv = _pd;
priv->obj = obj;
priv->x = priv->y = priv->w = priv->h = 0;
priv->mirrored_auto_mode = EINA_TRUE; /* will follow system locale
* settings */
elm_widget_can_focus_set(obj, EINA_TRUE);