isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Remove unused variables

Browse Source
This commit is contained in:
Emmanuele Bassi 2011-02-19 16:45:06 +00:00
parent f99d2336f0
commit dfdcc20670
5 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter-desaturate-effect.c
View File

@ -123,7 +123,6 @@ clutter_desaturate_effect_pre_paint (ClutterEffect *effect)
{ {
ClutterDesaturateEffect *self = CLUTTER_DESATURATE_EFFECT (effect); ClutterDesaturateEffect *self = CLUTTER_DESATURATE_EFFECT (effect);
ClutterEffectClass *parent_class; ClutterEffectClass *parent_class;
float factor;
if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect))) if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect)))
return FALSE; return FALSE;
@ -144,8 +143,6 @@ clutter_desaturate_effect_pre_paint (ClutterEffect *effect)
return FALSE; return FALSE;
} }
factor = (float) self->factor;
if (self->shader == COGL_INVALID_HANDLE) if (self->shader == COGL_INVALID_HANDLE)
{ {
self->shader = cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT); self->shader = cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT);

5
clutter/clutter-main.c
View File

@ -2027,12 +2027,10 @@ event_click_count_generate (ClutterEvent *event)
ClutterInputDevice *device = NULL; ClutterInputDevice *device = NULL;
ClutterSettings *settings; ClutterSettings *settings;
ClutterBackend *backend;
guint double_click_time; guint double_click_time;
guint double_click_distance; guint double_click_distance;
settings = clutter_settings_get_default (); settings = clutter_settings_get_default ();
backend = clutter_get_default_backend ();
g_object_get (settings, g_object_get (settings,
"double-click-distance", &double_click_distance, "double-click-distance", &double_click_distance,
@ -2890,9 +2888,6 @@ void
clutter_clear_glyph_cache (void) clutter_clear_glyph_cache (void)
{ {
CoglPangoFontMap *font_map; CoglPangoFontMap *font_map;
ClutterMainContext *context;
context = _clutter_context_get_default ();
font_map = clutter_context_get_pango_fontmap (); font_map = clutter_context_get_pango_fontmap ();
cogl_pango_font_map_clear_glyph_cache (font_map); cogl_pango_font_map_clear_glyph_cache (font_map);

4
clutter/clutter-shader-effect.c
View File

@ -573,14 +573,10 @@ clutter_shader_effect_set_uniform_value (ClutterShaderEffect *effect,
const gchar *name, const gchar *name,
const GValue *value) const GValue *value)
{ {
ClutterShaderEffectPrivate *priv;
g_return_if_fail (CLUTTER_IS_SHADER_EFFECT (effect)); g_return_if_fail (CLUTTER_IS_SHADER_EFFECT (effect));
g_return_if_fail (name != NULL); g_return_if_fail (name != NULL);
g_return_if_fail (value != NULL); g_return_if_fail (value != NULL);
priv = effect->priv;
clutter_shader_effect_add_uniform (effect, name, value); clutter_shader_effect_add_uniform (effect, name, value);
} }

3
clutter/clutter-state.c
View File

@ -994,7 +994,6 @@ clutter_state_set_key (ClutterState *state,
gdouble pre_delay, gdouble pre_delay,
gdouble post_delay) gdouble post_delay)
{ {
ClutterStatePrivate *priv;
GParamSpec *pspec; GParamSpec *pspec;
ClutterStateKey *state_key; ClutterStateKey *state_key;
State *source_state = NULL; State *source_state = NULL;
@ -1005,8 +1004,6 @@ clutter_state_set_key (ClutterState *state,
g_return_val_if_fail (property_name, NULL); g_return_val_if_fail (property_name, NULL);
g_return_val_if_fail (value, NULL); g_return_val_if_fail (value, NULL);
priv = state->priv;
pspec = get_property_from_object (object, property_name); pspec = get_property_from_object (object, property_name);
if (pspec == NULL) if (pspec == NULL)
return state; return state;

9
clutter/clutter-table-layout.c
View File

@ -1060,7 +1060,6 @@ calculate_row_heights (ClutterTableLayout *self,
{ {
ClutterActor *child = l->data; ClutterActor *child = l->data;
ClutterTableChild *meta; ClutterTableChild *meta;
DimensionData *row;
gfloat c_min, c_pref; gfloat c_min, c_pref;
gfloat min_height, pref_height; gfloat min_height, pref_height;
gint start_row, end_row; gint start_row, end_row;
@ -1075,7 +1074,6 @@ calculate_row_heights (ClutterTableLayout *self,
if (meta->row_span < 2) if (meta->row_span < 2)
continue; continue;
row = &rows[meta->row];
start_row = meta->row; start_row = meta->row;
end_row = meta->row + meta->row_span - 1; end_row = meta->row + meta->row_span - 1;
@ -1101,6 +1099,7 @@ calculate_row_heights (ClutterTableLayout *self,
priv->visible_rows += 1; priv->visible_rows += 1;
} }
} }
min_height += priv->row_spacing * (meta->row_span - 1); min_height += priv->row_spacing * (meta->row_span - 1);
pref_height += priv->row_spacing * (meta->row_span - 1); pref_height += priv->row_spacing * (meta->row_span - 1);
@ -1390,7 +1389,7 @@ clutter_table_layout_allocate (ClutterLayoutManager *layout,
ClutterTableLayoutPrivate *priv = self->priv; ClutterTableLayoutPrivate *priv = self->priv;
GList *list, *children; GList *list, *children;
gint row_spacing, col_spacing; gint row_spacing, col_spacing;
gint i, table_width, table_height; gint i;
DimensionData *rows, *columns; DimensionData *rows, *columns;
update_row_col (self, container); update_row_col (self, container);
@ -1404,10 +1403,6 @@ clutter_table_layout_allocate (ClutterLayoutManager *layout,
col_spacing = (priv->col_spacing); col_spacing = (priv->col_spacing);
row_spacing = (priv->row_spacing); row_spacing = (priv->row_spacing);
table_height = (int)(box->y2 - box->y1);
table_width = (int)(box->x2 - box->x1);
calculate_table_dimensions (self, container, box->x2 - box->x1, box->y2 - box->y1); calculate_table_dimensions (self, container, box->x2 - box->x1, box->y2 - box->y1);
rows = (DimensionData *) priv->rows->data; rows = (DimensionData *) priv->rows->data;