[gtk/matthiasc/for-master: 12/12] css: Give none singletons unique names
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/for-master: 12/12] css: Give none singletons unique names
- Date: Sat, 18 Apr 2020 20:48:30 +0000 (UTC)
commit ef8e8ba14d3f316dbade504b7481b38085bfabc0
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Apr 18 15:24:13 2020 -0400
css: Give none singletons unique names
This makes for a less confusing experience in gdb.
gtk/gtkcssfiltervalue.c | 4 ++--
gtk/gtkcssimagevalue.c | 4 ++--
gtk/gtkcssshadowvalue.c | 4 ++--
gtk/gtkcsstransformvalue.c | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkcssfiltervalue.c b/gtk/gtkcssfiltervalue.c
index 453803000e..3269368c69 100644
--- a/gtk/gtkcssfiltervalue.c
+++ b/gtk/gtkcssfiltervalue.c
@@ -703,7 +703,7 @@ static const GtkCssValueClass GTK_CSS_VALUE_FILTER = {
gtk_css_value_filter_print
};
-static GtkCssValue none_singleton = { >K_CSS_VALUE_FILTER, 1, TRUE, 0, { { GTK_CSS_FILTER_NONE } } };
+static GtkCssValue filter_none_singleton = { >K_CSS_VALUE_FILTER, 1, TRUE, 0, { { GTK_CSS_FILTER_NONE } }
};
static GtkCssValue *
gtk_css_filter_value_alloc (guint n_filters)
@@ -721,7 +721,7 @@ gtk_css_filter_value_alloc (guint n_filters)
GtkCssValue *
gtk_css_filter_value_new_none (void)
{
- return _gtk_css_value_ref (&none_singleton);
+ return _gtk_css_value_ref (&filter_none_singleton);
}
static gboolean
diff --git a/gtk/gtkcssimagevalue.c b/gtk/gtkcssimagevalue.c
index 3c1ce454cd..933557f65f 100644
--- a/gtk/gtkcssimagevalue.c
+++ b/gtk/gtkcssimagevalue.c
@@ -136,11 +136,11 @@ static const GtkCssValueClass GTK_CSS_VALUE_IMAGE = {
GtkCssValue *
_gtk_css_image_value_new (GtkCssImage *image)
{
- static GtkCssValue none_singleton = { >K_CSS_VALUE_IMAGE, 1, TRUE, NULL };
+ static GtkCssValue image_none_singleton = { >K_CSS_VALUE_IMAGE, 1, TRUE, NULL };
GtkCssValue *value;
if (image == NULL)
- return _gtk_css_value_ref (&none_singleton);
+ return _gtk_css_value_ref (&image_none_singleton);
value = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_IMAGE);
value->image = image;
diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c
index 9a0917ef94..f66d34205f 100644
--- a/gtk/gtkcssshadowvalue.c
+++ b/gtk/gtkcssshadowvalue.c
@@ -288,12 +288,12 @@ static const GtkCssValueClass GTK_CSS_VALUE_SHADOW = {
gtk_css_value_shadow_print
};
-static GtkCssValue none_singleton = { >K_CSS_VALUE_SHADOW, 1, TRUE, 0 };
+static GtkCssValue shadow_none_singleton = { >K_CSS_VALUE_SHADOW, 1, TRUE, 0 };
GtkCssValue *
gtk_css_shadow_value_new_none (void)
{
- return _gtk_css_value_ref (&none_singleton);
+ return _gtk_css_value_ref (&shadow_none_singleton);
}
static GtkCssValue *
diff --git a/gtk/gtkcsstransformvalue.c b/gtk/gtkcsstransformvalue.c
index e190c450b3..4f6f81bff4 100644
--- a/gtk/gtkcsstransformvalue.c
+++ b/gtk/gtkcsstransformvalue.c
@@ -800,7 +800,7 @@ static const GtkCssValueClass GTK_CSS_VALUE_TRANSFORM = {
gtk_css_value_transform_print
};
-static GtkCssValue none_singleton = { >K_CSS_VALUE_TRANSFORM, 1, TRUE, 0, { { GTK_CSS_TRANSFORM_NONE } }
};
+static GtkCssValue transform_none_singleton = { >K_CSS_VALUE_TRANSFORM, 1, TRUE, 0, { {
GTK_CSS_TRANSFORM_NONE } } };
static GtkCssValue *
gtk_css_transform_value_alloc (guint n_transforms)
@@ -818,7 +818,7 @@ gtk_css_transform_value_alloc (guint n_transforms)
GtkCssValue *
_gtk_css_transform_value_new_none (void)
{
- return _gtk_css_value_ref (&none_singleton);
+ return _gtk_css_value_ref (&transform_none_singleton);
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]