[gtk+] cssmatcher: Remove type argument from name matcher
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] cssmatcher: Remove type argument from name matcher
- Date: Fri, 5 Feb 2016 22:48:52 +0000 (UTC)
commit e8fca5bbbe6a40c15fd19d8c899b5f4fa7f17876
Author: Benjamin Otte <otte redhat com>
Date: Fri Feb 5 23:43:05 2016 +0100
cssmatcher: Remove type argument from name matcher
We no longer use types when matching names.
gtk/gtkcssmatcher.c | 33 ++++++++-------------------------
gtk/gtkcssmatcherprivate.h | 8 +++-----
gtk/gtkcssselector.c | 2 +-
3 files changed, 12 insertions(+), 31 deletions(-)
---
diff --git a/gtk/gtkcssmatcher.c b/gtk/gtkcssmatcher.c
index 8dd26d5..8afdab1 100644
--- a/gtk/gtkcssmatcher.c
+++ b/gtk/gtkcssmatcher.c
@@ -74,8 +74,7 @@ gtk_css_matcher_widget_path_get_state (const GtkCssMatcher *matcher)
static gboolean
gtk_css_matcher_widget_path_has_name (const GtkCssMatcher *matcher,
- /*interned*/ const char *name,
- GType type)
+ /*interned*/ const char *name)
{
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);
if (path_name == NULL)
- {
- if (type == 0)
- return FALSE;
- return g_type_is_a (gtk_widget_path_iter_get_object_type (siblings, matcher->path.sibling_index),
type);
- }
+ path_name = g_type_name (gtk_widget_path_iter_get_object_type (siblings,
matcher->path.sibling_index));
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);
if (path_name == NULL)
- {
- if (type == 0)
- return FALSE;
- return g_type_is_a (gtk_widget_path_iter_get_object_type (matcher->path.path,
matcher->path.index), type);
- }
+ path_name = g_type_name (gtk_widget_path_iter_get_object_type (matcher->path.path,
matcher->path.index));
return path_name == name;
}
@@ -251,15 +242,9 @@ gtk_css_matcher_node_get_state (const GtkCssMatcher *matcher)
static gboolean
gtk_css_matcher_node_has_name (const GtkCssMatcher *matcher,
- /*interned*/ const char *name,
- GType type)
+ /*interned*/ const char *name)
{
- const char *node_name = gtk_css_node_get_name (matcher->node.node);
-
- if (node_name == NULL)
- return g_type_is_a (gtk_css_node_get_widget_type (matcher->node.node), type);
-
- return node_name == name;
+ return gtk_css_node_get_name (matcher->node.node) == name;
}
static gboolean
@@ -375,8 +360,7 @@ gtk_css_matcher_any_get_state (const GtkCssMatcher *matcher)
static gboolean
gtk_css_matcher_any_has_name (const GtkCssMatcher *matcher,
- /*interned*/ const char *name,
- GType type)
+ /*interned*/ const char *name)
{
return TRUE;
}
@@ -457,11 +441,10 @@ gtk_css_matcher_superset_get_state (const GtkCssMatcher *matcher)
static gboolean
gtk_css_matcher_superset_has_name (const GtkCssMatcher *matcher,
- /*interned*/ const char *name,
- GType type)
+ /*interned*/ const char *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
return TRUE;
}
diff --git a/gtk/gtkcssmatcherprivate.h b/gtk/gtkcssmatcherprivate.h
index 82be762..29890a8 100644
--- a/gtk/gtkcssmatcherprivate.h
+++ b/gtk/gtkcssmatcherprivate.h
@@ -37,8 +37,7 @@ struct _GtkCssMatcherClass {
GtkStateFlags (* get_state) (const GtkCssMatcher *matcher);
gboolean (* has_name) (const GtkCssMatcher *matcher,
- /*interned*/const char*name,
- GType type);
+ /*interned*/const char*name);
gboolean (* has_class) (const GtkCssMatcher *matcher,
GQuark class_name);
gboolean (* has_id) (const GtkCssMatcher *matcher,
@@ -109,10 +108,9 @@ _gtk_css_matcher_get_state (const GtkCssMatcher *matcher)
static inline gboolean
_gtk_css_matcher_has_name (const GtkCssMatcher *matcher,
- /*interned*/ const char *name,
- GType type)
+ /*interned*/ const char *name)
{
- return matcher->klass->has_name (matcher, name, type);
+ return matcher->klass->has_name (matcher, name);
}
static inline gboolean
diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c
index b23e1fd..e40a8df 100644
--- a/gtk/gtkcssselector.c
+++ b/gtk/gtkcssselector.c
@@ -633,7 +633,7 @@ static gboolean
match_name (const GtkCssSelector *selector,
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]