GtkWidgetPath: Make API more consistent.

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index f29ca6486112f1ed75d1b4e504a58b616923a1e5..323f397a9c978fec4d6fe727c0b9464405618c94 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -379,7 +379,7 @@ compare_selector_element (GtkWidgetPath   *path,
     {
       GType type;
 
-      type = gtk_widget_path_get_element_type (path, index);
+      type = gtk_widget_path_iter_get_widget_type (path, index);
 
       if (!g_type_is_a (type, elem->type))
         return FALSE;
@@ -436,7 +436,7 @@ compare_selector_element (GtkWidgetPath   *path,
       const gchar *name, *path_name;
 
       name = g_quark_to_string (elem->name);
-      path_name = gtk_widget_path_get_element_name (path, index);
+      path_name = gtk_widget_path_iter_get_name (path, index);
 
       if (!path_name ||
           strcmp (path_name, name) != 0)

diff --git a/gtk/gtkwidgetpath.c b/gtk/gtkwidgetpath.c
index bbac2a7af43bd99fbec3b99ba03498043373245d..60dcfa23710bb47fc620f32d91d07c159f84f1c8 100644 (file)
--- a/gtk/gtkwidgetpath.c
+++ b/gtk/gtkwidgetpath.c
@@ -132,8 +132,8 @@ gtk_widget_path_prepend_type (GtkWidgetPath *path,
 }
 
 GType
-gtk_widget_path_get_element_type (const GtkWidgetPath *path,
-                                  guint                pos)
+gtk_widget_path_iter_get_widget_type (const GtkWidgetPath *path,
+                                      guint                pos)
 {
   GtkPathElement *elem;
 
@@ -145,9 +145,9 @@ gtk_widget_path_get_element_type (const GtkWidgetPath *path,
 }
 
 void
-gtk_widget_path_set_element_type (GtkWidgetPath *path,
-                                  guint          pos,
-                                  GType          type)
+gtk_widget_path_iter_set_widget_type (GtkWidgetPath *path,
+                                      guint          pos,
+                                      GType          type)
 {
   GtkPathElement *elem;
 
@@ -160,8 +160,8 @@ gtk_widget_path_set_element_type (GtkWidgetPath *path,
 }
 
 G_CONST_RETURN gchar *
-gtk_widget_path_get_element_name (const GtkWidgetPath *path,
-                                  guint                pos)
+gtk_widget_path_iter_get_name (const GtkWidgetPath *path,
+                               guint                pos)
 {
   GtkPathElement *elem;
 
@@ -173,9 +173,9 @@ gtk_widget_path_get_element_name (const GtkWidgetPath *path,
 }
 
 void
-gtk_widget_path_set_element_name (GtkWidgetPath *path,
-                                  guint          pos,
-                                  const gchar   *name)
+gtk_widget_path_iter_set_name (GtkWidgetPath *path,
+                               guint          pos,
+                               const gchar   *name)
 {
   GtkPathElement *elem;
 

diff --git a/gtk/gtkwidgetpath.h b/gtk/gtkwidgetpath.h
index b6515e191a2176d60ec9f572582c1b173d2302ff..d6e074edec9fc24d6a0e392363cf38bdd7487519 100644 (file)
--- a/gtk/gtkwidgetpath.h
+++ b/gtk/gtkwidgetpath.h
@@ -38,17 +38,17 @@ guint           gtk_widget_path_length              (const GtkWidgetPath *path);
 guint           gtk_widget_path_prepend_type        (GtkWidgetPath       *path,
                                                      GType                type);
 
-GType               gtk_widget_path_get_element_type (const GtkWidgetPath*path,
-                                                      guint               pos);
-void                gtk_widget_path_set_element_type (GtkWidgetPath      *path,
-                                                      guint               pos,
-                                                      GType               type);
-
-G_CONST_RETURN gchar * gtk_widget_path_get_element_name (const GtkWidgetPath *path,
-                                                         guint                pos);
-void                   gtk_widget_path_set_element_name (GtkWidgetPath       *path,
-                                                         guint                pos,
-                                                         const gchar         *name);
+GType               gtk_widget_path_iter_get_widget_type (const GtkWidgetPath *path,
+                                                          guint                pos);
+void                gtk_widget_path_iter_set_widget_type (GtkWidgetPath       *path,
+                                                          guint                pos,
+                                                          GType                type);
+
+G_CONST_RETURN gchar * gtk_widget_path_iter_get_name (const GtkWidgetPath *path,
+                                                      guint                pos);
+void                   gtk_widget_path_iter_set_name (GtkWidgetPath       *path,
+                                                      guint                pos,
+                                                      const gchar         *name);
 
 void     gtk_widget_path_iter_add_region    (GtkWidgetPath      *path,
                                              guint               pos,