callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssmatcher: Remove type argument from name matcher

Browse Source 
We no longer use types when matching names.
This commit is contained in:
Benjamin Otte 2016-02-05 23:43:05 +01:00
parent fe6d4cbdf5
commit e8fca5bbbe
3 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gtk/gtkcssmatcher.c
View File

@ -74,8 +74,7 @@ gtk_css_matcher_widget_path_get_state (const GtkCssMatcher *matcher)
static gboolean static gboolean
gtk_css_matcher_widget_path_has_name (const GtkCssMatcher *matcher, gtk_css_matcher_widget_path_has_name (const GtkCssMatcher *matcher,
/*interned*/ const char *name, /*interned*/ const char *name)
GType type)
{ {
const GtkWidgetPath *siblings; const GtkWidgetPath *siblings;
@ -85,11 +84,7 @@ gtk_css_matcher_widget_path_has_name (const GtkCssMatcher *matcher,
const char *path_name = gtk_widget_path_iter_get_object_name (siblings, matcher->path.sibling_index); const char *path_name = gtk_widget_path_iter_get_object_name (siblings, matcher->path.sibling_index);
if (path_name == NULL) if (path_name == NULL)
{ path_name = g_type_name (gtk_widget_path_iter_get_object_type (siblings, matcher->path.sibling_index));
if (type == 0)
return FALSE;
return g_type_is_a (gtk_widget_path_iter_get_object_type (siblings, matcher->path.sibling_index), type);
}
return path_name == name; return path_name == name;
} }
@ -98,11 +93,7 @@ gtk_css_matcher_widget_path_has_name (const GtkCssMatcher *matcher,
const char *path_name = gtk_widget_path_iter_get_object_name (matcher->path.path, matcher->path.index); const char *path_name = gtk_widget_path_iter_get_object_name (matcher->path.path, matcher->path.index);
if (path_name == NULL) if (path_name == NULL)
{ path_name = g_type_name (gtk_widget_path_iter_get_object_type (matcher->path.path, matcher->path.index));
if (type == 0)
return FALSE;
return g_type_is_a (gtk_widget_path_iter_get_object_type (matcher->path.path, matcher->path.index), type);
}
return path_name == name; return path_name == name;
} }
@ -251,15 +242,9 @@ gtk_css_matcher_node_get_state (const GtkCssMatcher *matcher)
static gboolean static gboolean
gtk_css_matcher_node_has_name (const GtkCssMatcher *matcher, gtk_css_matcher_node_has_name (const GtkCssMatcher *matcher,
/*interned*/ const char *name, /*interned*/ const char *name)
GType type)
{ {
const char *node_name = gtk_css_node_get_name (matcher->node.node); return gtk_css_node_get_name (matcher->node.node) == name;
if (node_name == NULL)
return g_type_is_a (gtk_css_node_get_widget_type (matcher->node.node), type);
return node_name == name;
} }
static gboolean static gboolean
@ -375,8 +360,7 @@ gtk_css_matcher_any_get_state (const GtkCssMatcher *matcher)
static gboolean static gboolean
gtk_css_matcher_any_has_name (const GtkCssMatcher *matcher, gtk_css_matcher_any_has_name (const GtkCssMatcher *matcher,
/*interned*/ const char *name, /*interned*/ const char *name)
GType type)
{ {
return TRUE; return TRUE;
} }
@ -457,11 +441,10 @@ gtk_css_matcher_superset_get_state (const GtkCssMatcher *matcher)
static gboolean static gboolean
gtk_css_matcher_superset_has_name (const GtkCssMatcher *matcher, gtk_css_matcher_superset_has_name (const GtkCssMatcher *matcher,
/*interned*/ const char *name, /*interned*/ const char *name)
GType type)
{ {
if (matcher->superset.relevant & GTK_CSS_CHANGE_NAME) if (matcher->superset.relevant & GTK_CSS_CHANGE_NAME)
return _gtk_css_matcher_has_name (matcher->superset.subset, name, type); return _gtk_css_matcher_has_name (matcher->superset.subset, name);
else else
return TRUE; return TRUE;
} }

8
gtk/gtkcssmatcherprivate.h
View File

@ -37,8 +37,7 @@ struct _GtkCssMatcherClass {
GtkStateFlags (* get_state) (const GtkCssMatcher *matcher); GtkStateFlags (* get_state) (const GtkCssMatcher *matcher);
gboolean (* has_name) (const GtkCssMatcher *matcher, gboolean (* has_name) (const GtkCssMatcher *matcher,
/*interned*/const char*name, /*interned*/const char*name);
GType type);
gboolean (* has_class) (const GtkCssMatcher *matcher, gboolean (* has_class) (const GtkCssMatcher *matcher,
GQuark class_name); GQuark class_name);
gboolean (* has_id) (const GtkCssMatcher *matcher, gboolean (* has_id) (const GtkCssMatcher *matcher,
@ -109,10 +108,9 @@ _gtk_css_matcher_get_state (const GtkCssMatcher *matcher)
static inline gboolean static inline gboolean
_gtk_css_matcher_has_name (const GtkCssMatcher *matcher, _gtk_css_matcher_has_name (const GtkCssMatcher *matcher,
/*interned*/ const char *name, /*interned*/ const char *name)
GType type)
{ {
return matcher->klass->has_name (matcher, name, type); return matcher->klass->has_name (matcher, name);
} }
static inline gboolean static inline gboolean

2
gtk/gtkcssselector.c
View File

@ -633,7 +633,7 @@ static gboolean
match_name (const GtkCssSelector *selector, match_name (const GtkCssSelector *selector,
const GtkCssMatcher *matcher) const GtkCssMatcher *matcher)
{ {
return _gtk_css_matcher_has_name (matcher, selector->name.reference->name, selector->name.reference->type); return _gtk_css_matcher_has_name (matcher, selector->name.reference->name);
} }
static guint static guint