Ephoto: Formatting and white space removal. Use like function defintions.

This commit is contained in:
Stephen Houston 2015-02-20 10:07:50 -06:00
parent 4f88f1fc8c
commit 11c8114e26
8 changed files with 138 additions and 138 deletions

View File

@ -34,7 +34,7 @@ Evas_Object *ephoto_window_add(const char *path);
void ephoto_title_set(Ephoto *ephoto, const char *title);
void ephoto_thumb_size_set(Ephoto *ephoto, int size);
Evas_Object *ephoto_thumb_add(Ephoto *ephoto, Evas_Object *parent, const char *path);
void ephoto_thumb_path_set(Evas_Object *o, const char *path);
void ephoto_thumb_path_set(Evas_Object *obj, const char *path);
void ephoto_directory_set(Ephoto *ephoto, const char *path);
Eina_Bool ephoto_config_init(Ephoto *em);

View File

@ -266,7 +266,7 @@ _cropper_move(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EIN
}
static void
_image_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNUSED)
_image_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Cropper *ec = data;
@ -337,7 +337,7 @@ _image_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
}
static void
_cropper_free(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNUSED)
_cropper_free(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Cropper *ec = data;
free(ec);

View File

@ -115,7 +115,7 @@ _ephoto_single_browser_slideshow(void *data, Evas_Object *obj EINA_UNUSED, void
}
static void
_win_free(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_win_free(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto *ephoto = data;
if (ephoto->timer.thumb_regen) ecore_timer_del(ephoto->timer.thumb_regen);
@ -124,7 +124,7 @@ _win_free(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *eve
}
static void
_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto *ephoto = data;
int w, h;
@ -468,10 +468,10 @@ ephoto_thumb_size_set(Ephoto *ephoto, int size)
}
static void
_thumb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void *event_info EINA_UNUSED)
_thumb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Ephoto *ephoto = data;
ephoto->thumbs = eina_list_remove(ephoto->thumbs, o);
ephoto->thumbs = eina_list_remove(ephoto->thumbs, obj);
}
static void
@ -514,7 +514,7 @@ ephoto_thumb_add(Ephoto *ephoto, Evas_Object *parent, const char *path)
}
void
ephoto_thumb_path_set(Evas_Object *o, const char *path)
ephoto_thumb_path_set(Evas_Object *obj, const char *path)
{
Ethumb_Thumb_Format format = ETHUMB_THUMB_FDO;
const char *group = NULL;
@ -535,17 +535,17 @@ ephoto_thumb_path_set(Evas_Object *o, const char *path)
group = eina_list_data_get(g);
edje_file_collection_list_free(g);
}
elm_image_file_set(o, path, group);
evas_object_data_set(o, "ephoto_format", NULL);
elm_image_file_set(obj, path, group);
evas_object_data_set(obj, "ephoto_format", NULL);
return;
}
}
elm_thumb_format_set(o, format);
evas_object_data_set(o, "ephoto_format", (void*)(long)format);
elm_thumb_crop_align_set(o, 0.5, 0.5);
elm_thumb_aspect_set(o, ETHUMB_THUMB_CROP);
elm_thumb_orientation_set(o, ETHUMB_THUMB_ORIENT_ORIGINAL);
elm_thumb_file_set(o, path, group);
elm_thumb_format_set(obj, format);
evas_object_data_set(obj, "ephoto_format", (void*)(long)format);
elm_thumb_crop_align_set(obj, 0.5, 0.5);
elm_thumb_aspect_set(obj, ETHUMB_THUMB_CROP);
elm_thumb_orientation_set(obj, ETHUMB_THUMB_ORIENT_ORIGINAL);
elm_thumb_file_set(obj, path, group);
}
Ephoto_Entry *

View File

@ -458,7 +458,7 @@ _flip_vert(Ephoto_Single_Browser *sb)
}
static void
_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info)
_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
{
Ephoto_Single_Browser *sb = data;
Evas_Event_Mouse_Wheel *ev = event_info;
@ -654,28 +654,28 @@ _zoom_out(Ephoto_Single_Browser *sb)
}
static void
_zoom_in_cb(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_zoom_in_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_zoom_in(sb);
}
static void
_zoom_out_cb(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_zoom_out_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_zoom_out(sb);
}
static void
_zoom_1_cb(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_zoom_1_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_zoom_set(sb, 1.0);
}
static void
_zoom_fit_cb(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_zoom_fit_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_zoom_fit(sb);
@ -840,7 +840,7 @@ static void _cancel_crop(void *data, Evas_Object *obj EINA_UNUSED, void *event_i
}
static void
_crop_image(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_crop_image(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
sb->cropping = 1;
@ -848,63 +848,63 @@ _crop_image(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED
}
static void
_go_first(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_go_first(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_first_entry(sb);
}
static void
_go_prev(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_go_prev(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_prev_entry(sb);
}
static void
_go_next(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_go_next(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_next_entry(sb);
}
static void
_go_last(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_go_last(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_last_entry(sb);
}
static void
_go_rotate_counterclock(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_go_rotate_counterclock(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_rotate_counterclock(sb);
}
static void
_go_rotate_clock(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_go_rotate_clock(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_rotate_clock(sb);
}
static void
_go_flip_horiz(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_go_flip_horiz(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_flip_horiz(sb);
}
static void
_go_flip_vert(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_go_flip_vert(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
_flip_vert(sb);
}
static void
_slideshow(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_slideshow(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
if (sb->entry)
@ -912,14 +912,14 @@ _slideshow(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
}
static void
_back(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_back(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
evas_object_smart_callback_call(sb->main, "back", sb->entry);
}
static void
_settings(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_settings(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
@ -928,7 +928,7 @@ _settings(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
}
static void
_about(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_about(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Single_Browser *sb = data;
@ -937,7 +937,7 @@ _about(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
}
static void
_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info)
_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
{
Ephoto_Single_Browser *sb = data;
Evas_Event_Key_Down *ev = event_info;
@ -1001,7 +1001,7 @@ _entry_free(void *data, const Ephoto_Entry *entry EINA_UNUSED)
}
static void
_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
char tmp_path[PATH_MAX];
Ephoto_Single_Browser *sb = data;

View File

@ -10,7 +10,7 @@ struct _Ephoto_Slideshow
};
static void
_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info)
_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
{
Ephoto_Slideshow *ss = data;
Evas_Event_Key_Down *ev = event_info;
@ -38,7 +38,7 @@ _key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *eve
}
static void
_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Slideshow *ss = data;
evas_object_smart_callback_call(ss->slideshow, "back", ss->entry);

View File

@ -244,7 +244,7 @@ _todo_items_process(void *data)
}
static void
_ephoto_dir_selected(void *data, Evas_Object *o EINA_UNUSED, void *event_info)
_ephoto_dir_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
{
Ephoto_Thumb_Browser *tb = data;
Elm_Object_Item *it = event_info;
@ -255,7 +255,7 @@ _ephoto_dir_selected(void *data, Evas_Object *o EINA_UNUSED, void *event_info)
}
static void
_ephoto_dir_go_home(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_ephoto_dir_go_home(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Thumb_Browser *tb = data;
@ -264,7 +264,7 @@ _ephoto_dir_go_home(void *data, Evas_Object *o EINA_UNUSED, void *event_info EIN
}
static void
_ephoto_dir_go_up(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_ephoto_dir_go_up(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Thumb_Browser *tb = data;
@ -278,7 +278,7 @@ _ephoto_dir_go_up(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_
}
static void
_ephoto_thumb_selected(void *data, Evas_Object *o EINA_UNUSED, void *event_info)
_ephoto_thumb_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
{
Ephoto_Thumb_Browser *tb = data;
Elm_Object_Item *it = event_info;
@ -302,29 +302,29 @@ _zoom_set(Ephoto_Thumb_Browser *tb, int zoom)
}
static void
_zoom_in(void *data, Evas_Object *o, void *event_info EINA_UNUSED)
_zoom_in(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Ephoto_Thumb_Browser *tb = data;
Evas_Object *min = evas_object_data_get(o, "min");
Evas_Object *min = evas_object_data_get(obj, "min");
int zoom = tb->ephoto->config->thumb_size+ZOOM_STEP;
_zoom_set(tb, zoom);
if (zoom >= ZOOM_MAX) elm_object_disabled_set(o, EINA_TRUE);
if (zoom >= ZOOM_MAX) elm_object_disabled_set(obj, EINA_TRUE);
if (zoom > ZOOM_MIN) elm_object_disabled_set(min, EINA_FALSE);
}
static void
_zoom_out(void *data, Evas_Object *o, void *event_info EINA_UNUSED)
_zoom_out(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Ephoto_Thumb_Browser *tb = data;
Evas_Object *max = evas_object_data_get(o, "max");
Evas_Object *max = evas_object_data_get(obj, "max");
int zoom = tb->ephoto->config->thumb_size-ZOOM_STEP;
_zoom_set(tb, zoom);
if (zoom <= ZOOM_MIN) elm_object_disabled_set(o, EINA_TRUE);
if (zoom <= ZOOM_MIN) elm_object_disabled_set(obj, EINA_TRUE);
if (zoom < ZOOM_MAX) elm_object_disabled_set(max, EINA_FALSE);
}
static void
_slideshow(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_slideshow(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Thumb_Browser *tb = data;
Elm_Object_Item *it = elm_gengrid_selected_item_get(tb->grid);
@ -338,7 +338,7 @@ _slideshow(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
}
static void
_settings(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_settings(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Thumb_Browser *tb = data;
@ -347,7 +347,7 @@ _settings(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
}
static void
_about(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_about(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Thumb_Browser *tb = data;
@ -356,7 +356,7 @@ _about(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
}
static void
_ephoto_dir_show_folders(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_ephoto_dir_show_folders(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Thumb_Browser *tb = data;
@ -372,7 +372,7 @@ _ephoto_dir_show_folders(void *data, Evas_Object *o EINA_UNUSED, void *event_inf
}
static void
_ephoto_dir_hide_folders(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_ephoto_dir_hide_folders(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Thumb_Browser *tb = data;
Evas_Object *icon, *max, *min, *but, *ic;
@ -424,7 +424,7 @@ _ephoto_dir_hide_folders(void *data, Evas_Object *o EINA_UNUSED, void *event_inf
}
static void
_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info)
_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
{
Ephoto_Thumb_Browser *tb = data;
Evas_Event_Key_Down *ev = event_info;
@ -621,7 +621,7 @@ _dnd_item_data_get(Evas_Object *obj, Elm_Object_Item *it, Elm_Drag_User_Info *in
}
static void
_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ephoto_Thumb_Browser *tb = data;
Ecore_Event_Handler *handler;