[gtk/css-lookup-caching: 9/26] lookup: Loose the underscores



commit f60a21a1cf0cbe0a527ec9d6b668f5f56e82dd44
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Feb 10 17:35:11 2020 -0500

    lookup: Loose the underscores
    
    We are going to pretty much rewrite this in the
    following commits. Take the opportunity to drop
    the leading _ from the api.

 gtk/gtkcsslookup.c        | 16 ++++++++--------
 gtk/gtkcsslookupprivate.h | 10 +++++-----
 gtk/gtkcssprovider.c      | 10 +++++-----
 gtk/gtkcssstaticstyle.c   |  8 ++++----
 4 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/gtk/gtkcsslookup.c b/gtk/gtkcsslookup.c
index 704de1560b..68551fb3c4 100644
--- a/gtk/gtkcsslookup.c
+++ b/gtk/gtkcsslookup.c
@@ -25,7 +25,7 @@
 #include "gtkprivate.h"
 
 void
-_gtk_css_lookup_init (GtkCssLookup     *lookup)
+gtk_css_lookup_init (GtkCssLookup     *lookup)
 {
   memset (lookup, 0, sizeof (*lookup));
 
@@ -33,14 +33,14 @@ _gtk_css_lookup_init (GtkCssLookup     *lookup)
 }
 
 void
-_gtk_css_lookup_destroy (GtkCssLookup *lookup)
+gtk_css_lookup_destroy (GtkCssLookup *lookup)
 {
   _gtk_bitmask_free (lookup->set_values);
 }
 
 gboolean
-_gtk_css_lookup_is_missing (const GtkCssLookup *lookup,
-                            guint               id)
+gtk_css_lookup_is_missing (const GtkCssLookup *lookup,
+                           guint               id)
 {
   gtk_internal_return_val_if_fail (lookup != NULL, FALSE);
 
@@ -61,10 +61,10 @@ _gtk_css_lookup_is_missing (const GtkCssLookup *lookup,
  * to ensure they are kept alive until _gtk_css_lookup_free() is called.
  **/
 void
-_gtk_css_lookup_set (GtkCssLookup  *lookup,
-                     guint          id,
-                     GtkCssSection *section,
-                     GtkCssValue   *value)
+gtk_css_lookup_set (GtkCssLookup  *lookup,
+                    guint          id,
+                    GtkCssSection *section,
+                    GtkCssValue   *value)
 {
   gtk_internal_return_if_fail (lookup != NULL);
   gtk_internal_return_if_fail (value != NULL);
diff --git a/gtk/gtkcsslookupprivate.h b/gtk/gtkcsslookupprivate.h
index 2655011bbe..344995810a 100644
--- a/gtk/gtkcsslookupprivate.h
+++ b/gtk/gtkcsslookupprivate.h
@@ -40,17 +40,17 @@ struct _GtkCssLookup {
   GtkCssLookupValue  values[GTK_CSS_PROPERTY_N_PROPERTIES];
 };
 
-void                    _gtk_css_lookup_init                    (GtkCssLookup               *lookup);
-void                    _gtk_css_lookup_destroy                 (GtkCssLookup               *lookup);
-gboolean                _gtk_css_lookup_is_missing              (const GtkCssLookup         *lookup,
+void                     gtk_css_lookup_init                    (GtkCssLookup               *lookup);
+void                     gtk_css_lookup_destroy                 (GtkCssLookup               *lookup);
+gboolean                 gtk_css_lookup_is_missing              (const GtkCssLookup         *lookup,
                                                                  guint                       id);
-void                    _gtk_css_lookup_set                     (GtkCssLookup               *lookup,
+void                     gtk_css_lookup_set                     (GtkCssLookup               *lookup,
                                                                  guint                       id,
                                                                  GtkCssSection              *section,
                                                                  GtkCssValue                *value);
 
 static inline const GtkBitmask *
-_gtk_css_lookup_get_set_values (const GtkCssLookup *lookup)
+gtk_css_lookup_get_set_values (const GtkCssLookup *lookup)
 {
   return lookup->set_values;
 }
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 9d26e7172c..72d4ba41c2 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -480,13 +480,13 @@ gtk_css_style_provider_lookup (GtkStyleProvider             *provider,
               GtkCssStyleProperty *prop = ruleset->styles[j].property;
               guint id = _gtk_css_style_property_get_id (prop);
 
-              if (!_gtk_css_lookup_is_missing (lookup, id))
+              if (!gtk_css_lookup_is_missing (lookup, id))
                 continue;
 
-              _gtk_css_lookup_set (lookup,
-                                   id,
-                                   ruleset->styles[j].section,
-                                   ruleset->styles[j].value);
+              gtk_css_lookup_set (lookup,
+                                  id,
+                                  ruleset->styles[j].section,
+                                  ruleset->styles[j].value);
             }
         }
 
diff --git a/gtk/gtkcssstaticstyle.c b/gtk/gtkcssstaticstyle.c
index fee5c01e56..adc8eb524a 100644
--- a/gtk/gtkcssstaticstyle.c
+++ b/gtk/gtkcssstaticstyle.c
@@ -237,7 +237,7 @@ gtk_css_ ## NAME ## _values_init (void) \
 static inline gboolean \
 gtk_css_ ## NAME ## _values_unset (const GtkCssLookup *lookup) \
 { \
-  const GtkBitmask *set_values = _gtk_css_lookup_get_set_values (lookup); \
+  const GtkBitmask *set_values = gtk_css_lookup_get_set_values (lookup); \
   return !_gtk_bitmask_intersects (set_values, gtk_css_ ## NAME ## _values_mask); \
 }
 
@@ -903,7 +903,7 @@ gtk_css_lookup_resolve (GtkCssLookup      *lookup,
   gtk_internal_return_if_fail (GTK_IS_CSS_STATIC_STYLE (style));
   gtk_internal_return_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style));
 
-  if (_gtk_bitmask_is_empty (_gtk_css_lookup_get_set_values (lookup)))
+  if (_gtk_bitmask_is_empty (gtk_css_lookup_get_set_values (lookup)))
     {
       style->background = (GtkCssBackgroundValues *)gtk_css_values_ref (gtk_css_background_initial_values);
       style->border = (GtkCssBorderValues *)gtk_css_values_ref (gtk_css_border_initial_values);
@@ -996,7 +996,7 @@ gtk_css_static_style_new_compute (GtkStyleProvider             *provider,
   GtkCssLookup lookup;
   GtkCssNode *parent;
 
-  _gtk_css_lookup_init (&lookup);
+  gtk_css_lookup_init (&lookup);
 
   if (node)
     gtk_style_provider_lookup (provider,
@@ -1019,7 +1019,7 @@ gtk_css_static_style_new_compute (GtkStyleProvider             *provider,
                           result,
                           parent ? gtk_css_node_get_style (parent) : NULL);
 
-  _gtk_css_lookup_destroy (&lookup);
+  gtk_css_lookup_destroy (&lookup);
 
   return GTK_CSS_STYLE (result);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]