From dfdcc20670f108cbcb62aead3d2a502084d1b3d1 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 19 Feb 2011 16:45:06 +0000 Subject: [PATCH] clutter: Remove unused variables --- clutter/clutter-desaturate-effect.c | 3 --- clutter/clutter-main.c | 5 ----- clutter/clutter-shader-effect.c | 4 ---- clutter/clutter-state.c | 3 --- clutter/clutter-table-layout.c | 9 ++------- 5 files changed, 2 insertions(+), 22 deletions(-) diff --git a/clutter/clutter-desaturate-effect.c b/clutter/clutter-desaturate-effect.c index ed613c175..98592cc31 100644 --- a/clutter/clutter-desaturate-effect.c +++ b/clutter/clutter-desaturate-effect.c @@ -123,7 +123,6 @@ clutter_desaturate_effect_pre_paint (ClutterEffect *effect) { ClutterDesaturateEffect *self = CLUTTER_DESATURATE_EFFECT (effect); ClutterEffectClass *parent_class; - float factor; if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect))) return FALSE; @@ -144,8 +143,6 @@ clutter_desaturate_effect_pre_paint (ClutterEffect *effect) return FALSE; } - factor = (float) self->factor; - if (self->shader == COGL_INVALID_HANDLE) { self->shader = cogl_create_shader (COGL_SHADER_TYPE_FRAGMENT); diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index 3bbe785f7..f6cd904b8 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -2027,12 +2027,10 @@ event_click_count_generate (ClutterEvent *event) ClutterInputDevice *device = NULL; ClutterSettings *settings; - ClutterBackend *backend; guint double_click_time; guint double_click_distance; settings = clutter_settings_get_default (); - backend = clutter_get_default_backend (); g_object_get (settings, "double-click-distance", &double_click_distance, @@ -2890,9 +2888,6 @@ void clutter_clear_glyph_cache (void) { CoglPangoFontMap *font_map; - ClutterMainContext *context; - - context = _clutter_context_get_default (); font_map = clutter_context_get_pango_fontmap (); cogl_pango_font_map_clear_glyph_cache (font_map); diff --git a/clutter/clutter-shader-effect.c b/clutter/clutter-shader-effect.c index e496bc5a3..3a64b0268 100644 --- a/clutter/clutter-shader-effect.c +++ b/clutter/clutter-shader-effect.c @@ -573,14 +573,10 @@ clutter_shader_effect_set_uniform_value (ClutterShaderEffect *effect, const gchar *name, const GValue *value) { - ClutterShaderEffectPrivate *priv; - g_return_if_fail (CLUTTER_IS_SHADER_EFFECT (effect)); g_return_if_fail (name != NULL); g_return_if_fail (value != NULL); - priv = effect->priv; - clutter_shader_effect_add_uniform (effect, name, value); } diff --git a/clutter/clutter-state.c b/clutter/clutter-state.c index 70806bb5b..ffacaffc8 100644 --- a/clutter/clutter-state.c +++ b/clutter/clutter-state.c @@ -994,7 +994,6 @@ clutter_state_set_key (ClutterState *state, gdouble pre_delay, gdouble post_delay) { - ClutterStatePrivate *priv; GParamSpec *pspec; ClutterStateKey *state_key; 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 (value, NULL); - priv = state->priv; - pspec = get_property_from_object (object, property_name); if (pspec == NULL) return state; diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c index d3840ab81..4a3910336 100644 --- a/clutter/clutter-table-layout.c +++ b/clutter/clutter-table-layout.c @@ -1060,7 +1060,6 @@ calculate_row_heights (ClutterTableLayout *self, { ClutterActor *child = l->data; ClutterTableChild *meta; - DimensionData *row; gfloat c_min, c_pref; gfloat min_height, pref_height; gint start_row, end_row; @@ -1075,7 +1074,6 @@ calculate_row_heights (ClutterTableLayout *self, if (meta->row_span < 2) continue; - row = &rows[meta->row]; start_row = meta->row; end_row = meta->row + meta->row_span - 1; @@ -1101,6 +1099,7 @@ calculate_row_heights (ClutterTableLayout *self, priv->visible_rows += 1; } } + min_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; GList *list, *children; gint row_spacing, col_spacing; - gint i, table_width, table_height; + gint i; DimensionData *rows, *columns; update_row_col (self, container); @@ -1404,10 +1403,6 @@ clutter_table_layout_allocate (ClutterLayoutManager *layout, col_spacing = (priv->col_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); rows = (DimensionData *) priv->rows->data;