From e6dbf02e0e56660a584dc78ce729f048cdf3c78b Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Sat, 11 Jun 2011 07:36:37 +0000 Subject: [PATCH] Elementary: Removed trailing whitespaces from c,h,am,ac,in. I think there is no more whitespaces in elementary. So from now on please check if your code is whitespace-free when you commit it. If so, no one will suffer from removing whitespaces and merge conflict. SVN revision: 60223 --- legacy/elementary/config/default/Makefile.am | 2 +- legacy/elementary/config/standard/Makefile.am | 2 +- .../data/edje_externals/Makefile.am | 4 ++-- legacy/elementary/data/objects/Makefile.am | 4 ++-- legacy/elementary/src/lib/Elementary.h.in | 12 +++++------ legacy/elementary/src/lib/els_scroller.c | 20 +++++++++---------- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/legacy/elementary/config/default/Makefile.am b/legacy/elementary/config/default/Makefile.am index ba2bc9666a..03113bb838 100644 --- a/legacy/elementary/config/default/Makefile.am +++ b/legacy/elementary/config/default/Makefile.am @@ -20,4 +20,4 @@ files_DATA = \ clean-local: rm -rf *.cfg *~ - + diff --git a/legacy/elementary/config/standard/Makefile.am b/legacy/elementary/config/standard/Makefile.am index 88cae80e0b..60ce44b6db 100644 --- a/legacy/elementary/config/standard/Makefile.am +++ b/legacy/elementary/config/standard/Makefile.am @@ -20,4 +20,4 @@ files_DATA = \ clean-local: rm -rf *.cfg *~ - + diff --git a/legacy/elementary/data/edje_externals/Makefile.am b/legacy/elementary/data/edje_externals/Makefile.am index 7ac358c9e4..59de514a07 100644 --- a/legacy/elementary/data/edje_externals/Makefile.am +++ b/legacy/elementary/data/edje_externals/Makefile.am @@ -2,8 +2,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in EDJE_CC = @edje_cc@ -EDJE_FLAGS_VERBOSE_ = -EDJE_FLAGS_VERBOSE_0 = +EDJE_FLAGS_VERBOSE_ = +EDJE_FLAGS_VERBOSE_0 = EDJE_FLAGS_VERBOSE_1 = -v EDJE_FLAGS = $(EDJE_FLAGS_$(V)) -id $(top_srcdir)/data/edje_externals -fd $(top_srcdir)/data/edje_externals diff --git a/legacy/elementary/data/objects/Makefile.am b/legacy/elementary/data/objects/Makefile.am index def92eafc7..33e9ebc904 100644 --- a/legacy/elementary/data/objects/Makefile.am +++ b/legacy/elementary/data/objects/Makefile.am @@ -2,8 +2,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in EDJE_CC = @edje_cc@ -EDJE_FLAGS_VERBOSE_ = -EDJE_FLAGS_VERBOSE_0 = +EDJE_FLAGS_VERBOSE_ = +EDJE_FLAGS_VERBOSE_0 = EDJE_FLAGS_VERBOSE_1 = -v EDJE_FLAGS = $(EDJE_FLAGS_$(V)) -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in index 05ddafa724..ae91d4f645 100644 --- a/legacy/elementary/src/lib/Elementary.h.in +++ b/legacy/elementary/src/lib/Elementary.h.in @@ -786,12 +786,12 @@ extern "C" { { ELM_GLVIEW_ALPHA = 1, ELM_GLVIEW_DEPTH = 2, - ELM_GLVIEW_STENCIL = 4 - } Elm_GLView_Mode; + ELM_GLVIEW_STENCIL = 4 + } Elm_GLView_Mode; /** - * Defines a policy for the glview resizing. - * + * Defines a policy for the glview resizing. + * * @note Default is ELM_GLVIEW_RESIZE_POLICY_RECREATE */ typedef enum _Elm_GLView_Resize_Policy @@ -3066,7 +3066,7 @@ EAPI Elm_Genlist_Item *elm_genlist_item_sorted_insert(Evas_Object *obj, const El * selected and get selected. The event_info parameter is the * segment item index. */ - + EAPI Evas_Object *elm_grid_add(Evas_Object *parent); EAPI void elm_grid_size_set(Evas_Object *obj, int w, int h); EAPI void elm_grid_size_get(Evas_Object *obj, int *w, int *h); @@ -3075,7 +3075,7 @@ EAPI Elm_Genlist_Item *elm_genlist_item_sorted_insert(Evas_Object *obj, const El EAPI void elm_grid_clear(Evas_Object *obj, Eina_Bool clear); EAPI void elm_grid_pack_set(Evas_Object *subobj, int x, int y, int w, int h); EAPI void elm_grid_pack_get(Evas_Object *subobj, int *x, int *y, int *w, int *h); - + #ifdef __cplusplus } #endif diff --git a/legacy/elementary/src/lib/els_scroller.c b/legacy/elementary/src/lib/els_scroller.c index 046e3bdca5..92da7f729b 100644 --- a/legacy/elementary/src/lib/els_scroller.c +++ b/legacy/elementary/src/lib/els_scroller.c @@ -1628,12 +1628,12 @@ static void _down_coord_eval(Smart_Data *sd, Evas_Coord *x, Evas_Coord *y) { Evas_Coord minx, miny; - + if (sd->down.dir_x) *x = sd->down.sx - (*x - sd->down.x); else *x = sd->down.sx; if (sd->down.dir_y) *y = sd->down.sy - (*y - sd->down.y); else *y = sd->down.sy; - + if ((sd->down.dir_x) || (sd->down.dir_y)) { if (!((sd->down.dir_x) && (sd->down.dir_y))) @@ -1644,15 +1644,15 @@ _down_coord_eval(Smart_Data *sd, Evas_Coord *x, Evas_Coord *y) } sd->pan_func.min_get(sd->pan_obj, &minx, &miny); - + if (*x < minx) *x += (minx - *x) * _elm_config->thumbscroll_border_friction; else if (sd->child.w <= sd->w) *x += (sd->down.sx - *x) * _elm_config->thumbscroll_border_friction; else if ((sd->child.w - sd->w + minx) < *x) - *x += (sd->child.w - sd->w + minx - *x) * + *x += (sd->child.w - sd->w + minx - *x) * _elm_config->thumbscroll_border_friction; - + if (*y < miny) *y += (miny - *y) * _elm_config->thumbscroll_border_friction; else if (sd->child.h <= sd->h) @@ -1679,7 +1679,7 @@ _smart_hold_animator(void *data) Evas_Coord x, y, dx, dy; double t, dt; } pos[60]; - + tdiff = sd->down.hist.est_timestamp_diff; tnow = ecore_time_get() - tdiff; t = tnow; @@ -1704,7 +1704,7 @@ _smart_hold_animator(void *data) } pos[i].x = x - basex; pos[i].y = y - basey; - pos[i].t = + pos[i].t = sd->down.history[i].timestamp - sd->down.history[0].timestamp; count++; } @@ -1747,7 +1747,7 @@ _smart_hold_animator(void *data) } // printf("%3.5f %i %i\n", ecore_time_get(), sd->down.hold_y, fy); } - + elm_smart_scroller_child_pos_get(sd->smart_obj, &ox, &oy); if (sd->down.dir_x) { @@ -1761,7 +1761,7 @@ _smart_hold_animator(void *data) (!elm_widget_drag_child_locked_y_get(sd->widget))) oy = fy; } - + elm_smart_scroller_child_pos_set(sd->smart_obj, ox, oy); return ECORE_CALLBACK_RENEW; } @@ -2247,7 +2247,7 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void * x += (sd->child.w - sd->w + minx - x) * _elm_config->thumbscroll_border_friction; } - + sd->down.hold_x = x; sd->down.hold_y = y; if (!sd->down.hold_animator)