From e09aa42a458f0fb99cf7a9d803415b2bf4d01207 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 2 Sep 2022 10:17:50 -0400 Subject: Cosmetics Clean up property definitions, and pass NULL for all nicks and blurbs. --- pango2/pango-context.c | 79 ++++++++++++++++------------- pango2/pango-font-face.c | 12 +++-- pango2/pango-font-family.c | 9 ++-- pango2/pango-font.c | 15 ++++-- pango2/pango-fontmap.c | 18 ++++--- pango2/pango-hbface.c | 25 ++++++---- pango2/pango-hbfont.c | 3 +- pango2/pango-layout.c | 118 +++++++++++++++++++++++++------------------- pango2/pango-line-breaker.c | 21 ++++---- pango2/pango-lines.c | 20 +++++--- 10 files changed, 187 insertions(+), 133 deletions(-) diff --git a/pango2/pango-context.c b/pango2/pango-context.c index f6d28e11..eb9aedfc 100644 --- a/pango2/pango-context.c +++ b/pango2/pango-context.c @@ -231,27 +231,30 @@ pango2_context_class_init (Pango2ContextClass *klass) * The font map to be searched when fonts are looked up * in this context. */ - properties[PROP_FONT_MAP] = - g_param_spec_object ("font-map", NULL, NULL, PANGO2_TYPE_FONT_MAP, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_FONT_MAP] = g_param_spec_object ("font-map", NULL, NULL, + PANGO2_TYPE_FONT_MAP, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME); /** * Pango2Context:font-description: (attributes org.gtk.Property.get=pango2_context_get_font_description org.gtk.Property.set=pango2_context_set_font_description) * * The default font description for the context. */ - properties[PROP_FONT_DESCRIPTION] = - g_param_spec_boxed ("font-description", NULL, NULL, PANGO2_TYPE_FONT_DESCRIPTION, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_FONT_DESCRIPTION] = g_param_spec_boxed ("font-description", NULL, NULL, + PANGO2_TYPE_FONT_DESCRIPTION, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME); /** * Pango2Context:language: (attributes org.gtk.Property.get=pango2_context_get_language org.gtk.Property.set=pango2_context_set_language) * * The global language for the context. */ - properties[PROP_LANGUAGE] = - g_param_spec_boxed ("language", NULL, NULL, PANGO2_TYPE_LANGUAGE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_LANGUAGE] = g_param_spec_boxed ("language", NULL, NULL, + PANGO2_TYPE_LANGUAGE, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME); /** * Pango2Context:base-direction: (attributes org.gtk.Property.get=pango2_context_get_base_dir org.gtk.Property.set=pango2_context_set_base_dir) @@ -265,10 +268,11 @@ pango2_context_class_init (Pango2ContextClass *klass) * `PANGO2_DIRECTION_WEAK_LTR` or `PANGO2_DIRECTION_WEAK_RTL` is used only * for paragraphs that do not contain any strong characters themselves. */ - properties[PROP_BASE_DIR] = - g_param_spec_enum ("base-direction", NULL, NULL, PANGO2_TYPE_DIRECTION, - PANGO2_DIRECTION_LTR, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_BASE_DIR] = g_param_spec_enum ("base-direction", NULL, NULL, + PANGO2_TYPE_DIRECTION, + PANGO2_DIRECTION_LTR, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME); /** * Pango2Context:base-gravity: (attributes org.gtk.Property.get=pango2_context_get_base_gravity org.gtk.Property.set=pango2_context_set_base_gravity) @@ -277,10 +281,11 @@ pango2_context_class_init (Pango2ContextClass *klass) * * The base gravity is used in laying vertical text out. */ - properties[PROP_BASE_GRAVITY] = - g_param_spec_enum ("base-gravity", NULL, NULL, PANGO2_TYPE_GRAVITY, - PANGO2_GRAVITY_SOUTH, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_BASE_GRAVITY] = g_param_spec_enum ("base-gravity", NULL, NULL, + PANGO2_TYPE_GRAVITY, + PANGO2_GRAVITY_SOUTH, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME); /** * Pango2Context:gravity-hint: (attributes org.gtk.Property.get=pango2_context_get_gravity_hint org.gtk.Property.set=pango2_context_set_gravity_hint) @@ -292,10 +297,11 @@ pango2_context_class_init (Pango2ContextClass *klass) * [method@Pango2.Context.get_gravity] is set to `PANGO2_GRAVITY_EAST` * or `PANGO2_GRAVITY_WEST`. */ - properties[PROP_GRAVITY_HINT] = - g_param_spec_enum ("gravity-hint", NULL, NULL, PANGO2_TYPE_GRAVITY_HINT, - PANGO2_GRAVITY_HINT_NATURAL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_GRAVITY_HINT] = g_param_spec_enum ("gravity-hint", NULL, NULL, + PANGO2_TYPE_GRAVITY_HINT, + PANGO2_GRAVITY_HINT_NATURAL, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME); /** * Pango2Context:matrix: (attributes org.gtk.Property.get=pango2_context_get_matrix org.gtk.Property.set=pango2_context_set_matrix) @@ -309,9 +315,10 @@ pango2_context_class_init (Pango2ContextClass *klass) * hinting that depends on knowing the position of text with respect to * the pixel grid. */ - properties[PROP_MATRIX] = - g_param_spec_boxed ("matrix", NULL, NULL, PANGO2_TYPE_MATRIX, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_MATRIX] = g_param_spec_boxed ("matrix", NULL, NULL, + PANGO2_TYPE_MATRIX, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME); /** * Pango2Context:round-glyph-positions: (attributes org.gtk.Property.get=pango2_context_get_round_glyph_positions org.gtk.Property.set=pango2_context_set_round_glyph_positions) @@ -323,29 +330,31 @@ pango2_context_class_init (Pango2ContextClass *klass) * This is useful when the renderer can't handle subpixel * positioning of glyphs. */ - properties[PROP_ROUND_GLYPH_POSITIONS] = - g_param_spec_boolean ("round-glyph-positions", NULL, NULL, TRUE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_ROUND_GLYPH_POSITIONS] = g_param_spec_boolean ("round-glyph-positions", NULL, NULL, + TRUE, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME); /** * Pango2Context:palette: (attributes org.gtk.Property.get=pango2_context_get_palette org.gtk.Property.set=pango2_context_set_palette) * * The name of the color palette to use for color fonts. */ - properties[PROP_PALETTE] = - g_param_spec_string ("palette", NULL, NULL, "default", - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_PALETTE] = g_param_spec_string ("palette", NULL, NULL, + "default", + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME); /** * Pango2Context:emoji-presentation: (attributes org.gtk.Property.get=pango2_context_get_emoji_presentation org.gtk.Property.set=pango2_context_set_emoji_presentation) * * The preferred Emoji presentation style. */ - properties[PROP_EMOJI_PRESENTATION] = - g_param_spec_enum ("emoji-presentation", NULL, NULL, - PANGO2_TYPE_EMOJI_PRESENTATION, - PANGO2_EMOJI_PRESENTATION_AUTO, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + properties[PROP_EMOJI_PRESENTATION] = g_param_spec_enum ("emoji-presentation", NULL, NULL, + PANGO2_TYPE_EMOJI_PRESENTATION, + PANGO2_EMOJI_PRESENTATION_AUTO, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME); g_object_class_install_properties (object_class, N_PROPERTIES, properties); } diff --git a/pango2/pango-font-face.c b/pango2/pango-font-face.c index 475cb871..79a0c310 100644 --- a/pango2/pango-font-face.c +++ b/pango2/pango-font-face.c @@ -203,7 +203,8 @@ pango2_font_face_class_init (Pango2FontFaceClass *class) * A name representing the style of this face. */ properties[PROP_NAME] = - g_param_spec_string ("name", NULL, NULL, NULL, + g_param_spec_string ("name", NULL, NULL, + NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -240,7 +241,8 @@ pango2_font_face_class_init (Pango2FontFaceClass *class) * lightening or modifying it in some other way. */ properties[PROP_SYNTHESIZED] = - g_param_spec_boolean ("synthesized", NULL, NULL, FALSE, + g_param_spec_boolean ("synthesized", NULL, NULL, + FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -250,7 +252,8 @@ pango2_font_face_class_init (Pango2FontFaceClass *class) * characters form a regular grid. */ properties[PROP_MONOSPACE] = - g_param_spec_boolean ("monospace", NULL, NULL, FALSE, + g_param_spec_boolean ("monospace", NULL, NULL, + FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -260,7 +263,8 @@ pango2_font_face_class_init (Pango2FontFaceClass *class) * to produce variations. */ properties[PROP_VARIABLE] = - g_param_spec_boolean ("variable", NULL, NULL, FALSE, + g_param_spec_boolean ("variable", NULL, NULL, + FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, N_PROPERTIES, properties); diff --git a/pango2/pango-font-family.c b/pango2/pango-font-family.c index 1042c7d3..26940b52 100644 --- a/pango2/pango-font-family.c +++ b/pango2/pango-font-family.c @@ -163,7 +163,8 @@ pango2_font_family_class_init (Pango2FontFamilyClass *class) * The name of the family. */ properties[PROP_NAME] = - g_param_spec_string ("name", NULL, NULL, NULL, + g_param_spec_string ("name", NULL, NULL, + NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -172,7 +173,8 @@ pango2_font_family_class_init (Pango2FontFamilyClass *class) * The type of objects that the family contains. */ properties[PROP_ITEM_TYPE] = - g_param_spec_gtype ("item-type", NULL, NULL, PANGO2_TYPE_FONT_FACE, + g_param_spec_gtype ("item-type", NULL, NULL, + PANGO2_TYPE_FONT_FACE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -181,7 +183,8 @@ pango2_font_family_class_init (Pango2FontFamilyClass *class) * The number of faces contained in the family. */ properties[PROP_N_ITEMS] = - g_param_spec_uint ("n-items", "", "", 0, G_MAXUINT, 0, + g_param_spec_uint ("n-items", NULL, NULL, + 0, G_MAXUINT, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, N_PROPERTIES, properties); diff --git a/pango2/pango-font.c b/pango2/pango-font.c index cdf2fc42..b3b752fd 100644 --- a/pango2/pango-font.c +++ b/pango2/pango-font.c @@ -142,7 +142,8 @@ pango2_font_class_init (Pango2FontClass *class G_GNUC_UNUSED) * The face to which the font belongs. */ properties[PROP_FACE] = - g_param_spec_object ("face", NULL, NULL, PANGO2_TYPE_FONT_FACE, + g_param_spec_object ("face", NULL, NULL, + PANGO2_TYPE_FONT_FACE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -151,7 +152,8 @@ pango2_font_class_init (Pango2FontClass *class G_GNUC_UNUSED) * A `hb_font_t` object backing this font. */ properties[PROP_HB_FONT] = - g_param_spec_boxed ("hb-font", NULL, NULL, HB_GOBJECT_TYPE_FONT, + g_param_spec_boxed ("hb-font", NULL, NULL, + HB_GOBJECT_TYPE_FONT, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -160,7 +162,8 @@ pango2_font_class_init (Pango2FontClass *class G_GNUC_UNUSED) * The size of the font, scaled by `PANGO2_SCALE`. */ properties[PROP_SIZE] = - g_param_spec_int ("size", NULL, NULL, 0, G_MAXINT, 0, + g_param_spec_int ("size", NULL, NULL, + 0, G_MAXINT, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -173,7 +176,8 @@ pango2_font_class_init (Pango2FontClass *class G_GNUC_UNUSED) * size * dpi / 72. */ properties[PROP_DPI] = - g_param_spec_float ("dpi", NULL, NULL, 0, G_MAXFLOAT, 96.0, + g_param_spec_float ("dpi", NULL, NULL, + 0, G_MAXFLOAT, 96.0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -182,7 +186,8 @@ pango2_font_class_init (Pango2FontClass *class G_GNUC_UNUSED) * The gravity of the font. */ properties[PROP_GRAVITY] = - g_param_spec_enum ("gravity", NULL, NULL, PANGO2_TYPE_GRAVITY, + g_param_spec_enum ("gravity", NULL, NULL, + PANGO2_TYPE_GRAVITY, PANGO2_GRAVITY_AUTO, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); diff --git a/pango2/pango-fontmap.c b/pango2/pango-fontmap.c index fe45713d..b137b472 100644 --- a/pango2/pango-fontmap.c +++ b/pango2/pango-fontmap.c @@ -707,7 +707,8 @@ pango2_font_map_class_init (Pango2FontMapClass *class) * (10 * 96. / 72. = 13.3). */ properties[PROP_RESOLUTION] = - g_param_spec_float ("resolution", NULL, NULL, 0, G_MAXFLOAT, 96.0, + g_param_spec_float ("resolution", NULL, NULL, + 0, G_MAXFLOAT, 96.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** @@ -717,8 +718,9 @@ pango2_font_map_class_init (Pango2FontMapClass *class) * this map does not have itself. */ properties[PROP_FALLBACK] = - g_param_spec_object ("fallback", NULL, NULL, PANGO2_TYPE_FONT_MAP, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + g_param_spec_object ("fallback", NULL, NULL, + PANGO2_TYPE_FONT_MAP, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** * Pango2FontMap:item-type: @@ -726,8 +728,9 @@ pango2_font_map_class_init (Pango2FontMapClass *class) * The type of items contained in this list. */ properties[PROP_ITEM_TYPE] = - g_param_spec_gtype ("item-type", "", "", G_TYPE_OBJECT, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_param_spec_gtype ("item-type", NULL, NULL, + G_TYPE_OBJECT, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** * Pango2FontMap:n-items: @@ -735,8 +738,9 @@ pango2_font_map_class_init (Pango2FontMapClass *class) * The number of items contained in this list. */ properties[PROP_N_ITEMS] = - g_param_spec_uint ("n-items", "", "", 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_param_spec_uint ("n-items", NULL, NULL, + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, N_PROPERTIES, properties); } diff --git a/pango2/pango-hbface.c b/pango2/pango-hbface.c index 61be8b38..fc3376e5 100644 --- a/pango2/pango-hbface.c +++ b/pango2/pango-hbface.c @@ -511,7 +511,8 @@ pango2_hb_face_class_init (Pango2HbFaceClass *class) * A `hb_face_t` object backing this face. */ properties[PROP_HB_FACE] = - g_param_spec_boxed ("hb-face", NULL, NULL, HB_GOBJECT_TYPE_FACE, + g_param_spec_boxed ("hb-face", NULL, NULL, + HB_GOBJECT_TYPE_FACE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -520,8 +521,9 @@ pango2_hb_face_class_init (Pango2HbFaceClass *class) * The file that this face was created from, if any. */ properties[PROP_FILE] = - g_param_spec_string ("file", NULL, NULL, NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_param_spec_string ("file", NULL, NULL, + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** * Pango2HbFace:face-index: (attributes org.gtk.Property.get=pango2_hb_face_get_face_index) @@ -530,8 +532,9 @@ pango2_hb_face_class_init (Pango2HbFaceClass *class) * from a file containing data for multiple faces. */ properties[PROP_FACE_INDEX] = - g_param_spec_uint ("face-index", NULL, NULL, 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_param_spec_uint ("face-index", NULL, NULL, + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** * Pango2HbFace:instance-id: (attributes org.gtk.Property.get=pango2_hb_face_get_instance_id) @@ -543,7 +546,8 @@ pango2_hb_face_class_init (Pango2HbFaceClass *class) * be variable. */ properties[PROP_INSTANCE_ID] = - g_param_spec_int ("instance-id", NULL, NULL, -2, G_MAXINT, -1, + g_param_spec_int ("instance-id", NULL, NULL, + -2, G_MAXINT, -1, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -554,7 +558,8 @@ pango2_hb_face_class_init (Pango2HbFaceClass *class) * This property contains a string representation of the variations. */ properties[PROP_VARIATIONS] = - g_param_spec_string ("variations", NULL, NULL, NULL, + g_param_spec_string ("variations", NULL, NULL, + NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -563,7 +568,8 @@ pango2_hb_face_class_init (Pango2HbFaceClass *class) * `TRUE` if the face is using synthetic emboldening. */ properties[PROP_EMBOLDEN] = - g_param_spec_boolean ("embolden", NULL, NULL, FALSE, + g_param_spec_boolean ("embolden", NULL, NULL, + FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** @@ -576,7 +582,8 @@ pango2_hb_face_class_init (Pango2HbFaceClass *class) * sythetic italics and width variations. */ properties[PROP_TRANSFORM] = - g_param_spec_boxed ("transform", NULL, NULL, PANGO2_TYPE_MATRIX, + g_param_spec_boxed ("transform", NULL, NULL, + PANGO2_TYPE_MATRIX, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, N_PROPERTIES, properties); diff --git a/pango2/pango-hbfont.c b/pango2/pango-hbfont.c index 1bac38de..f421407c 100644 --- a/pango2/pango-hbfont.c +++ b/pango2/pango-hbfont.c @@ -915,7 +915,8 @@ pango2_hb_font_class_init (Pango2HbFontClass *class) * This property contains a string representation of the variations. */ properties[PROP_VARIATIONS] = - g_param_spec_string ("variations", NULL, NULL, NULL, + g_param_spec_string ("variations", NULL, NULL, + NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, N_PROPERTIES, properties); diff --git a/pango2/pango-layout.c b/pango2/pango-layout.c index b037c54b..19d3bdc4 100644 --- a/pango2/pango-layout.c +++ b/pango2/pango-layout.c @@ -317,18 +317,20 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * The context for the `Pango2Layout`. */ - props[PROP_CONTEXT] = g_param_spec_object ("context", "context", "context", - PANGO2_TYPE_CONTEXT, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + props[PROP_CONTEXT] = + g_param_spec_object ("context", NULL, NULL, + PANGO2_TYPE_CONTEXT, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:text: (attributes org.gtk.Property.get=pango2_layout_get_text org.gtk.Property.set=pango2_layout_set_text) * * The text of the `Pango2Layout`. */ - props[PROP_TEXT] = g_param_spec_string ("text", "text", "text", - "", - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_TEXT] = + g_param_spec_string ("text", NULL, NULL, + "", + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:attributes: (attributes org.gtk.Property.get=pango2_layout_get_attributes org.gtk.Property.set=pango2_layout_set_attributes) @@ -337,18 +339,20 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * Attributes can affect how the text is formatted. */ - props[PROP_ATTRIBUTES] = g_param_spec_boxed ("attributes", "attributes", "attributes", - PANGO2_TYPE_ATTR_LIST, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_ATTRIBUTES] = + g_param_spec_boxed ("attributes", NULL, NULL, + PANGO2_TYPE_ATTR_LIST, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:font-description: (attributes org.gtk.Property.get=pango2_layout_get_font_description org.gtk.Property.set=pango2_layout_set_font_description) * * The font description of the `Pango2Layout`. */ - props[PROP_FONT_DESCRIPTION] = g_param_spec_boxed ("font-description", "font-description", "font-description", - PANGO2_TYPE_FONT_DESCRIPTION, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_FONT_DESCRIPTION] = + g_param_spec_boxed ("font-description", NULL, NULL, + PANGO2_TYPE_FONT_DESCRIPTION, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:line-height: (attributes org.gtk.Property.get=pango2_layout_get_line_height org.gtk.Property.set=pango2_layout_set_line_height) @@ -360,9 +364,10 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * The default value is 0. */ - props[PROP_LINE_HEIGHT] = g_param_spec_float ("line-height", "line-height", "line-height", - 0., G_MAXFLOAT, 0., - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_LINE_HEIGHT] = + g_param_spec_float ("line-height", NULL, NULL, + 0., G_MAXFLOAT, 0., + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:spacing: (attributes org.gtk.Property.get=pango2_layout_get_spacing org.gtk.Property.set=pango2_layout_set_spacing) @@ -373,9 +378,10 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * The default value is 0. */ - props[PROP_SPACING] = g_param_spec_int ("spacing", "spacing", "spacing", - 0, G_MAXINT, 0, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_SPACING] = + g_param_spec_int ("spacing", NULL, NULL, + 0, G_MAXINT, 0, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:width: (attributes org.gtk.Property.get=pango2_layout_get_width org.gtk.Property.set=pango2_layout_set_width) @@ -386,9 +392,10 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * The default value is -1. */ - props[PROP_WIDTH] = g_param_spec_int ("width", "width", "width", - -1, G_MAXINT, -1, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_WIDTH] = + g_param_spec_int ("width", NULL, NULL, + -1, G_MAXINT, -1, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:height: (attributes org.gtk.Property.get=pango2_layout_get_height org.gtk.Property.set=pango2_layout_set_height) @@ -417,9 +424,10 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * The default value is -1. */ - props[PROP_HEIGHT] = g_param_spec_int ("height", "height", "height", - -G_MAXINT, G_MAXINT, -1, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_HEIGHT] = + g_param_spec_int ("height", NULL, NULL, + -G_MAXINT, G_MAXINT, -1, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:tabs: (attributes org.gtk.Property.get=pango2_layout_get_tabs org.gtk.Property.set=pango2_layout_set_tabs) @@ -429,9 +437,10 @@ pango2_layout_class_init (Pango2LayoutClass *class) * `Pango2Layout` will place content at the next tab position * whenever it meets a Tab character (U+0009). */ - props[PROP_TABS] = g_param_spec_boxed ("tabs", "tabs", "tabs", - PANGO2_TYPE_TAB_ARRAY, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_TABS] = + g_param_spec_boxed ("tabs", NULL, NULL, + PANGO2_TYPE_TAB_ARRAY, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:single-paragraph: (attributes org.gtk.Property.get=pango2_layout_get_single_paragraph org.gtk.Property.set=pango2_layout_set_single_paragraph) @@ -446,9 +455,10 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * The default value is `FALSE`. */ - props[PROP_SINGLE_PARAGRAPH] = g_param_spec_boolean ("single-paragraph", "single-paragraph", "single-paragraph", - FALSE, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_SINGLE_PARAGRAPH] = + g_param_spec_boolean ("single-paragraph", NULL, NULL, + FALSE, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:wrap: (attributes org.gtk.Property.get=pango2_layout_get_wrap org.gtk.Property.set=pango2_layout_set_wrap) @@ -460,10 +470,11 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * The default value is `PANGO2_WRAP_WORD`. */ - props[PROP_WRAP] = g_param_spec_enum ("wrap", "wrap", "wrap", - PANGO2_TYPE_WRAP_MODE, - PANGO2_WRAP_WORD, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_WRAP] = + g_param_spec_enum ("wrap", NULL, NULL, + PANGO2_TYPE_WRAP_MODE, + PANGO2_WRAP_WORD, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:indent: (attributes org.gtk.Property.get=pango2_layout_get_indent org.gtk.Property.set=pango2_layout_set_indent) @@ -478,9 +489,10 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * The default value is 0. */ - props[PROP_INDENT] = g_param_spec_int ("indent", "indent", "indent", - G_MININT, G_MAXINT, 0, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_INDENT] = + g_param_spec_int ("indent", NULL, NULL, + G_MININT, G_MAXINT, 0, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:alignment: (attributes org.gtk.Property.get=pango2_layout_get_alignment org.gtk.Property.set=pango2_layout_set_alignment) @@ -489,10 +501,11 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * The default value is `PANGO2_ALIGN_NATURAL`. */ - props[PROP_ALIGNMENT] = g_param_spec_enum ("alignment", "alignment", "alignment", - PANGO2_TYPE_ALIGNMENT, - PANGO2_ALIGN_NATURAL, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_ALIGNMENT] = + g_param_spec_enum ("alignment", NULL, NULL, + PANGO2_TYPE_ALIGNMENT, + PANGO2_ALIGN_NATURAL, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:ellipsize: (attributes org.gtk.Property.get=pango2_layout_get_ellipsize org.gtk.Property.set=pango2_layout_set_ellipsize) @@ -501,10 +514,11 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * The default value is `PANGO2_ELLIPSIZE_NONE`. */ - props[PROP_ELLIPSIZE] = g_param_spec_enum ("ellipsize", "ellipsize", "ellipsize", - PANGO2_TYPE_ELLIPSIZE_MODE, - PANGO2_ELLIPSIZE_NONE, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_ELLIPSIZE] = + g_param_spec_enum ("ellipsize", NULL, NULL, + PANGO2_TYPE_ELLIPSIZE_MODE, + PANGO2_ELLIPSIZE_NONE, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:auto-dir: (attributes org.gtk.Property.get=pango2_layout_get_auto_dir org.gtk.Property.set=pango2_layout_set_auto_dir) @@ -514,18 +528,20 @@ pango2_layout_class_init (Pango2LayoutClass *class) * * The default value is `TRUE`. */ - props[PROP_AUTO_DIR] = g_param_spec_boolean ("auto-dir", "auto-dir", "auto-dir", - TRUE, - G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); + props[PROP_AUTO_DIR] = + g_param_spec_boolean ("auto-dir", NULL, NULL, + TRUE, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2Layout:lines: (attributes org.gtk.Property.get=pango2_layout_get_lines) * * The `Pango2Lines` object holding the formatted lines. */ - props[PROP_LINES] = g_param_spec_object ("lines", "lines", "lines", - PANGO2_TYPE_LINES, - G_PARAM_READABLE); + props[PROP_LINES] = + g_param_spec_object ("lines", NULL, NULL, + PANGO2_TYPE_LINES, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, NUM_PROPERTIES, props); } diff --git a/pango2/pango-line-breaker.c b/pango2/pango-line-breaker.c index be0e520b..0b188583 100644 --- a/pango2/pango-line-breaker.c +++ b/pango2/pango-line-breaker.c @@ -2261,9 +2261,10 @@ pango2_line_breaker_class_init (Pango2LineBreakerClass *class) * The context for the `Pango2LineBreaker`. */ properties[PROP_CONTEXT] = - g_param_spec_object ("context", "context", "context", - PANGO2_TYPE_CONTEXT, - G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_EXPLICIT_NOTIFY); + g_param_spec_object ("context", NULL, NULL, + PANGO2_TYPE_CONTEXT, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2LineBreaker:base-dir: (attributes org.gtk.Property.get=pango2_line_breaker_get_base_dir org.gtk.Property.set=pango2_line_breaker_set_base_dir) @@ -2273,10 +2274,10 @@ pango2_line_breaker_class_init (Pango2LineBreakerClass *class) * The default value is `PANGO2_DIRECTION_NEUTRAL`. */ properties[PROP_BASE_DIR] = - g_param_spec_enum ("base-dir", "base-dir", "base-dir", - PANGO2_TYPE_DIRECTION, - PANGO2_DIRECTION_NEUTRAL, - G_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY); + g_param_spec_enum ("base-dir", NULL, NULL, + PANGO2_TYPE_DIRECTION, + PANGO2_DIRECTION_NEUTRAL, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); /** * Pango2LineBreaker:tabs: (attributes org.gtk.Property.get=pango2_line_breaker_get_tabs org.gtk.Property.set=pango2_line_breaker_set_tabs) @@ -2287,9 +2288,9 @@ pango2_line_breaker_class_init (Pango2LineBreakerClass *class) * whenever it meets a Tab character (U+0009). */ properties[PROP_TABS] = - g_param_spec_boxed ("tabs", "tabs", "tabs", - PANGO2_TYPE_TAB_ARRAY, - G_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY); + g_param_spec_boxed ("tabs", NULL, NULL, + PANGO2_TYPE_TAB_ARRAY, + G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, N_PROPERTIES, properties); } diff --git a/pango2/pango-lines.c b/pango2/pango-lines.c index a532cd4f..6670a057 100644 --- a/pango2/pango-lines.c +++ b/pango2/pango-lines.c @@ -123,8 +123,9 @@ pango2_lines_class_init (Pango2LinesClass *class) * The number of unknown glyphs in the `Pango2Lines`. */ properties[PROP_UNKNOWN_GLYPHS_COUNT] = - g_param_spec_uint ("unknown-glyphs-count", NULL, NULL, 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_param_spec_uint ("unknown-glyphs-count", NULL, NULL, + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** * Pango2Lines:wrapped: (attributes org.gtk.Property.get=pango2_lines_is_wrapped) @@ -132,8 +133,9 @@ pango2_lines_class_init (Pango2LinesClass *class) * `TRUE` if the `Pango2Lines` contains any wrapped lines. */ properties[PROP_WRAPPED] = - g_param_spec_boolean ("wrapped", NULL, NULL, FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_param_spec_boolean ("wrapped", NULL, NULL, + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** * Pango2Lines:ellipsized: (attributes org.gtk.Property.get=pango2_lines_is_ellipsized) @@ -141,8 +143,9 @@ pango2_lines_class_init (Pango2LinesClass *class) * `TRUE` if the `Pango2Lines` contains any ellipsized lines. */ properties[PROP_ELLIPSIZED] = - g_param_spec_boolean ("ellipsized", NULL, NULL, FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_param_spec_boolean ("ellipsized", NULL, NULL, + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); /** * Pango2Lines:hyphenated: (attributes org.gtk.Property.get=pango2_lines_is_hyphenated) @@ -150,8 +153,9 @@ pango2_lines_class_init (Pango2LinesClass *class) * `TRUE` if the `Pango2Lines` contains any hyphenated lines. */ properties[PROP_HYPHENATED] = - g_param_spec_boolean ("hyphenated", NULL, NULL, FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_param_spec_boolean ("hyphenated", NULL, NULL, + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, N_PROPERTIES, properties); } -- cgit v1.2.1