diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-01-19 01:09:11 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-01-19 15:56:54 -0500 |
commit | be4d42507ce67edc479f5497357d02843d80451b (patch) | |
tree | 23614f5ab9e99f280dd0f60caf3df4fef3978f20 /gtk/gtkstylecascade.c | |
parent | 6e88ccf7fb6aa7c47c1783a3fa6d2a218db428c4 (diff) | |
download | gtk+-be4d42507ce67edc479f5497357d02843d80451b.tar.gz |
style cascade: Remove some pointless casts
The casts and checks in gtkstylecascade.c are leftovers
from when we had GtkStyleProviderPrivate, and no longer
serve any purpose.
Diffstat (limited to 'gtk/gtkstylecascade.c')
-rw-r--r-- | gtk/gtkstylecascade.c | 42 |
1 files changed, 10 insertions, 32 deletions
diff --git a/gtk/gtkstylecascade.c b/gtk/gtkstylecascade.c index d0010de2be..ea0f128481 100644 --- a/gtk/gtkstylecascade.c +++ b/gtk/gtkstylecascade.c @@ -108,10 +108,7 @@ gtk_style_cascade_get_settings (GtkStyleProvider *provider) item; item = gtk_style_cascade_iter_next (cascade, &iter)) { - if (!GTK_IS_STYLE_PROVIDER (item)) - continue; - - settings = gtk_style_provider_get_settings (GTK_STYLE_PROVIDER (item)); + settings = gtk_style_provider_get_settings (item); if (settings) { gtk_style_cascade_iter_clear (&iter); @@ -136,18 +133,11 @@ gtk_style_cascade_get_color (GtkStyleProvider *provider, item; item = gtk_style_cascade_iter_next (cascade, &iter)) { - if (GTK_IS_STYLE_PROVIDER (item)) - { - color = gtk_style_provider_get_color (GTK_STYLE_PROVIDER (item), name); - if (color) - { - gtk_style_cascade_iter_clear (&iter); - return color; - } - } - else + color = gtk_style_provider_get_color (item, name); + if (color) { - /* If somebody hits this code path, shout at them */ + gtk_style_cascade_iter_clear (&iter); + return color; } } @@ -176,10 +166,7 @@ gtk_style_cascade_get_keyframes (GtkStyleProvider *provider, item; item = gtk_style_cascade_iter_next (cascade, &iter)) { - if (!GTK_IS_STYLE_PROVIDER (item)) - continue; - - keyframes = gtk_style_provider_get_keyframes (GTK_STYLE_PROVIDER (item), name); + keyframes = gtk_style_provider_get_keyframes (item, name); if (keyframes) { gtk_style_cascade_iter_clear (&iter); @@ -206,19 +193,10 @@ gtk_style_cascade_lookup (GtkStyleProvider *provider, item; item = gtk_style_cascade_iter_next (cascade, &iter)) { - GtkStyleProvider *sp = (GtkStyleProvider *) item; - if (GTK_IS_STYLE_PROVIDER (sp)) - { - gtk_style_provider_lookup (sp, matcher, lookup, - change ? &iter_change : NULL); - if (change) - *change |= iter_change; - } - else - { - /* you lose */ - g_warn_if_reached (); - } + gtk_style_provider_lookup (item, matcher, lookup, + change ? &iter_change : NULL); + if (change) + *change |= iter_change; } gtk_style_cascade_iter_clear (&iter); } |