From 3f09a86e7a710cf7dc840403d39d9ab9f1f2c2c3 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sat, 2 Dec 2023 10:09:00 +0100 Subject: [PATCH] clutter: Drop CLUTTER_PARAM_* defines They are not used every where making the codebase very incosistent So just drop the current usages Part-of: --- clutter/clutter/clutter-actor-meta.c | 9 +- clutter/clutter/clutter-actor.c | 111 ++++++++++++------ clutter/clutter/clutter-align-constraint.c | 12 +- clutter/clutter/clutter-bind-constraint.c | 12 +- clutter/clutter/clutter-binding-pool.c | 3 +- clutter/clutter/clutter-box-layout.c | 6 +- .../clutter-brightness-contrast-effect.c | 6 +- clutter/clutter/clutter-click-action.c | 12 +- clutter/clutter/clutter-clone.c | 3 +- clutter/clutter/clutter-color-state.c | 3 +- clutter/clutter/clutter-colorize-effect.c | 3 +- clutter/clutter/clutter-deform-effect.c | 9 +- clutter/clutter/clutter-desaturate-effect.c | 3 +- clutter/clutter/clutter-flow-layout.c | 28 +++-- clutter/clutter/clutter-gesture-action.c | 12 +- clutter/clutter/clutter-input-device-tool.c | 16 ++- clutter/clutter/clutter-input-device.c | 49 ++++++-- clutter/clutter/clutter-layout-meta.c | 9 +- clutter/clutter/clutter-page-turn-effect.c | 9 +- clutter/clutter/clutter-pan-action.c | 12 +- clutter/clutter/clutter-path-constraint.c | 6 +- clutter/clutter/clutter-path.c | 6 +- clutter/clutter/clutter-private.h | 4 - clutter/clutter/clutter-seat.c | 3 +- clutter/clutter/clutter-settings.c | 39 ++++-- clutter/clutter/clutter-shader-effect.c | 4 +- clutter/clutter/clutter-snap-constraint.c | 16 ++- clutter/clutter/clutter-stage-manager.c | 3 +- clutter/clutter/clutter-stage.c | 12 +- clutter/clutter/clutter-text.c | 83 ++++++++----- clutter/clutter/clutter-timeline.c | 26 ++-- .../clutter/clutter-virtual-input-device.c | 8 +- .../native/meta-input-device-native.c | 6 +- .../native/meta-input-settings-native.c | 3 +- .../native/meta-virtual-input-device-native.c | 6 +- src/backends/x11/meta-input-device-x11.c | 3 +- 36 files changed, 378 insertions(+), 177 deletions(-) diff --git a/clutter/clutter/clutter-actor-meta.c b/clutter/clutter/clutter-actor-meta.c index 357c0f951..7e157ed17 100644 --- a/clutter/clutter/clutter-actor-meta.c +++ b/clutter/clutter/clutter-actor-meta.c @@ -208,7 +208,8 @@ clutter_actor_meta_class_init (ClutterActorMetaClass *klass) obj_props[PROP_ACTOR] = g_param_spec_object ("actor", NULL, NULL, CLUTTER_TYPE_ACTOR, - CLUTTER_PARAM_READABLE | + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -219,7 +220,8 @@ clutter_actor_meta_class_init (ClutterActorMetaClass *klass) obj_props[PROP_NAME] = g_param_spec_string ("name", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterActorMeta:enabled: @@ -229,7 +231,8 @@ clutter_actor_meta_class_init (ClutterActorMetaClass *klass) obj_props[PROP_ENABLED] = g_param_spec_boolean ("enabled", NULL, NULL, TRUE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); gobject_class->finalize = clutter_actor_meta_finalize; gobject_class->set_property = clutter_actor_meta_set_property; diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c index d39380bc5..270396519 100644 --- a/clutter/clutter/clutter-actor.c +++ b/clutter/clutter/clutter-actor.c @@ -5842,7 +5842,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_float ("fixed-x", NULL, NULL, -G_MAXFLOAT, G_MAXFLOAT, 0.0, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -5857,7 +5858,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_float ("fixed-y", NULL, NULL, -G_MAXFLOAT, G_MAXFLOAT, 0, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -5869,7 +5871,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_FIXED_POSITION_SET] = g_param_spec_boolean ("fixed-position-set", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -5886,7 +5889,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_float ("min-width", NULL, NULL, 0.0, G_MAXFLOAT, 0.0, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -5902,7 +5906,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_float ("min-height", NULL, NULL, 0.0, G_MAXFLOAT, 0.0, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -5918,7 +5923,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_float ("natural-width", NULL, NULL, 0.0, G_MAXFLOAT, 0.0, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -5934,7 +5940,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_float ("natural-height", NULL, NULL, 0.0, G_MAXFLOAT, 0.0, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -5946,7 +5953,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_MIN_WIDTH_SET] = g_param_spec_boolean ("min-width-set", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -5958,7 +5966,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_MIN_HEIGHT_SET] = g_param_spec_boolean ("min-height-set", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -5970,7 +5979,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_NATURAL_WIDTH_SET] = g_param_spec_boolean ("natural-width-set", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -5982,7 +5992,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_NATURAL_HEIGHT_SET] = g_param_spec_boolean ("natural-height-set", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6062,7 +6073,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_enum ("request-mode", NULL, NULL, CLUTTER_TYPE_REQUEST_MODE, CLUTTER_REQUEST_HEIGHT_FOR_WIDTH, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6119,7 +6131,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_flags ("offscreen-redirect", NULL, NULL, CLUTTER_TYPE_OFFSCREEN_REDIRECT, 0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterActor:visible: @@ -6131,7 +6144,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_VISIBLE] = g_param_spec_boolean ("visible", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6143,7 +6157,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_MAPPED] = g_param_spec_boolean ("mapped", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE | + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6154,7 +6169,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_REALIZED] = g_param_spec_boolean ("realized", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE | + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6167,7 +6183,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_REACTIVE] = g_param_spec_boolean ("reactive", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6178,7 +6195,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_HAS_CLIP] = g_param_spec_boolean ("has-clip", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE | + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6207,7 +6225,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_NAME] = g_param_spec_string ("name", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6476,7 +6495,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_SHOW_ON_SET_PARENT] = /* XXX:2.0 - remove */ g_param_spec_boolean ("show-on-set-parent", NULL, NULL, TRUE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterActor:clip-to-allocation: @@ -6490,7 +6510,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_CLIP_TO_ALLOCATION] = g_param_spec_boolean ("clip-to-allocation", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6502,7 +6523,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_enum ("text-direction", NULL, NULL, CLUTTER_TYPE_TEXT_DIRECTION, CLUTTER_TEXT_DIRECTION_LTR, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6514,7 +6536,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_HAS_POINTER] = g_param_spec_boolean ("has-pointer", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE | + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6525,7 +6548,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_ACTIONS] = g_param_spec_object ("actions", NULL, NULL, CLUTTER_TYPE_ACTION, - CLUTTER_PARAM_WRITABLE | + G_PARAM_WRITABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6536,7 +6560,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_CONSTRAINTS] = g_param_spec_object ("constraints", NULL, NULL, CLUTTER_TYPE_CONSTRAINT, - CLUTTER_PARAM_WRITABLE | + G_PARAM_WRITABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6547,7 +6572,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_EFFECT] = g_param_spec_object ("effect", NULL, NULL, CLUTTER_TYPE_EFFECT, - CLUTTER_PARAM_WRITABLE | + G_PARAM_WRITABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6559,7 +6585,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_LAYOUT_MANAGER] = g_param_spec_object ("layout-manager", NULL, NULL, CLUTTER_TYPE_LAYOUT_MANAGER, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6599,7 +6626,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_enum ("x-align", NULL, NULL, CLUTTER_TYPE_ACTOR_ALIGN, CLUTTER_ACTOR_ALIGN_FILL, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6612,7 +6640,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_enum ("y-align", NULL, NULL, CLUTTER_TYPE_ACTOR_ALIGN, CLUTTER_ACTOR_ALIGN_FILL, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6699,7 +6728,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_BACKGROUND_COLOR_SET] = g_param_spec_boolean ("background-color-set", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE | + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6726,7 +6756,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_FIRST_CHILD] = g_param_spec_object ("first-child", NULL, NULL, CLUTTER_TYPE_ACTOR, - CLUTTER_PARAM_READABLE | + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6737,7 +6768,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_LAST_CHILD] = g_param_spec_object ("last-child", NULL, NULL, CLUTTER_TYPE_ACTOR, - CLUTTER_PARAM_READABLE | + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6749,7 +6781,8 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_CONTENT] = g_param_spec_object ("content", NULL, NULL, CLUTTER_TYPE_CONTENT, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6773,7 +6806,8 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_enum ("content-gravity", NULL, NULL, CLUTTER_TYPE_CONTENT_GRAVITY, CLUTTER_CONTENT_GRAVITY_RESIZE_FILL, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6799,14 +6833,16 @@ clutter_actor_class_init (ClutterActorClass *klass) g_param_spec_enum ("minification-filter", NULL, NULL, CLUTTER_TYPE_SCALING_FILTER, CLUTTER_SCALING_FILTER_LINEAR, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); obj_props[PROP_MAGNIFICATION_FILTER] = g_param_spec_enum ("magnification-filter", NULL, NULL, CLUTTER_TYPE_SCALING_FILTER, CLUTTER_SCALING_FILTER_LINEAR, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -6831,8 +6867,9 @@ clutter_actor_class_init (ClutterActorClass *klass) obj_props[PROP_COLOR_STATE] = g_param_spec_object ("color-state", NULL, NULL, CLUTTER_TYPE_COLOR_STATE, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); g_object_class_install_properties (object_class, PROP_LAST, obj_props); diff --git a/clutter/clutter/clutter-align-constraint.c b/clutter/clutter/clutter-align-constraint.c index 7c5158c4c..cbda4dede 100644 --- a/clutter/clutter/clutter-align-constraint.c +++ b/clutter/clutter/clutter-align-constraint.c @@ -291,7 +291,9 @@ clutter_align_constraint_class_init (ClutterAlignConstraintClass *klass) obj_props[PROP_SOURCE] = g_param_spec_object ("source", NULL, NULL, CLUTTER_TYPE_ACTOR, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); /** * ClutterAlignConstraint:align-axis: @@ -302,7 +304,9 @@ clutter_align_constraint_class_init (ClutterAlignConstraintClass *klass) g_param_spec_enum ("align-axis", NULL, NULL, CLUTTER_TYPE_ALIGN_AXIS, CLUTTER_ALIGN_X_AXIS, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); /** * ClutterAlignConstraint:pivot-point: @@ -340,7 +344,9 @@ clutter_align_constraint_class_init (ClutterAlignConstraintClass *klass) g_param_spec_float ("factor", NULL, NULL, 0.0, 1.0, 0.0, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); gobject_class->dispose = clutter_align_constraint_dispose; gobject_class->set_property = clutter_align_constraint_set_property; diff --git a/clutter/clutter/clutter-bind-constraint.c b/clutter/clutter/clutter-bind-constraint.c index 9805a67dd..ae0907a7f 100644 --- a/clutter/clutter/clutter-bind-constraint.c +++ b/clutter/clutter/clutter-bind-constraint.c @@ -394,7 +394,9 @@ clutter_bind_constraint_class_init (ClutterBindConstraintClass *klass) obj_props[PROP_SOURCE] = g_param_spec_object ("source", NULL, NULL, CLUTTER_TYPE_ACTOR, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); /** * ClutterBindConstraint:coordinate: @@ -405,7 +407,9 @@ clutter_bind_constraint_class_init (ClutterBindConstraintClass *klass) g_param_spec_enum ("coordinate", NULL, NULL, CLUTTER_TYPE_BIND_COORDINATE, CLUTTER_BIND_X, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); /** * ClutterBindConstraint:offset: @@ -416,7 +420,9 @@ clutter_bind_constraint_class_init (ClutterBindConstraintClass *klass) g_param_spec_float ("offset", NULL, NULL, -G_MAXFLOAT, G_MAXFLOAT, 0.0f, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); g_object_class_install_properties (gobject_class, PROP_LAST, diff --git a/clutter/clutter/clutter-binding-pool.c b/clutter/clutter/clutter-binding-pool.c index 60dc0d498..e057cc4a4 100644 --- a/clutter/clutter/clutter-binding-pool.c +++ b/clutter/clutter/clutter-binding-pool.c @@ -310,7 +310,8 @@ clutter_binding_pool_class_init (ClutterBindingPoolClass *klass) obj_props[PROP_NAME] = g_param_spec_string ("name", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_properties (gobject_class, diff --git a/clutter/clutter/clutter-box-layout.c b/clutter/clutter/clutter-box-layout.c index 5d1611f6f..005e3ab75 100644 --- a/clutter/clutter/clutter-box-layout.c +++ b/clutter/clutter/clutter-box-layout.c @@ -938,7 +938,8 @@ clutter_box_layout_class_init (ClutterBoxLayoutClass *klass) obj_props[PROP_HOMOGENEOUS] = g_param_spec_boolean ("homogeneous", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterBoxLayout:spacing: @@ -948,7 +949,8 @@ clutter_box_layout_class_init (ClutterBoxLayoutClass *klass) obj_props[PROP_SPACING] = g_param_spec_uint ("spacing", NULL, NULL, 0, G_MAXUINT, 0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); gobject_class->set_property = clutter_box_layout_set_property; gobject_class->get_property = clutter_box_layout_get_property; diff --git a/clutter/clutter/clutter-brightness-contrast-effect.c b/clutter/clutter/clutter-brightness-contrast-effect.c index 069e2304d..212ade1de 100644 --- a/clutter/clutter/clutter-brightness-contrast-effect.c +++ b/clutter/clutter/clutter-brightness-contrast-effect.c @@ -265,7 +265,8 @@ clutter_brightness_contrast_effect_class_init (ClutterBrightnessContrastEffectCl obj_props[PROP_BRIGHTNESS] = clutter_param_spec_color ("brightness", NULL, NULL, &no_brightness_change, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterBrightnessContrastEffect:contrast: @@ -281,7 +282,8 @@ clutter_brightness_contrast_effect_class_init (ClutterBrightnessContrastEffectCl obj_props[PROP_CONTRAST] = clutter_param_spec_color ("contrast", NULL, NULL, &no_contrast_change, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); g_object_class_install_properties (gobject_class, PROP_LAST, obj_props); } diff --git a/clutter/clutter/clutter-click-action.c b/clutter/clutter/clutter-click-action.c index 56023f37a..d30674988 100644 --- a/clutter/clutter/clutter-click-action.c +++ b/clutter/clutter/clutter-click-action.c @@ -560,7 +560,8 @@ clutter_click_action_class_init (ClutterClickActionClass *klass) obj_props[PROP_PRESSED] = g_param_spec_boolean ("pressed", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); /** * ClutterClickAction:held: @@ -570,7 +571,8 @@ clutter_click_action_class_init (ClutterClickActionClass *klass) obj_props[PROP_HELD] = g_param_spec_boolean ("held", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); /** * ClutterClickAction:long-press-duration: @@ -585,7 +587,8 @@ clutter_click_action_class_init (ClutterClickActionClass *klass) g_param_spec_int ("long-press-duration", NULL, NULL, -1, G_MAXINT, -1, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterClickAction:long-press-threshold: @@ -600,7 +603,8 @@ clutter_click_action_class_init (ClutterClickActionClass *klass) g_param_spec_int ("long-press-threshold", NULL, NULL, -1, G_MAXINT, -1, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); g_object_class_install_properties (gobject_class, PROP_LAST, diff --git a/clutter/clutter/clutter-clone.c b/clutter/clutter/clutter-clone.c index 9624c2e53..179e7ca63 100644 --- a/clutter/clutter/clutter-clone.c +++ b/clutter/clutter/clutter-clone.c @@ -358,7 +358,8 @@ clutter_clone_class_init (ClutterCloneClass *klass) g_param_spec_object ("source", NULL, NULL, CLUTTER_TYPE_ACTOR, G_PARAM_CONSTRUCT | - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); g_object_class_install_properties (gobject_class, PROP_LAST, obj_props); } diff --git a/clutter/clutter/clutter-color-state.c b/clutter/clutter/clutter-color-state.c index 3146044a6..e72749ea8 100644 --- a/clutter/clutter/clutter-color-state.c +++ b/clutter/clutter/clutter-color-state.c @@ -153,7 +153,8 @@ clutter_color_state_class_init (ClutterColorStateClass *klass) g_param_spec_enum ("colorspace", NULL, NULL, CLUTTER_TYPE_COLORSPACE, CLUTTER_COLORSPACE_SRGB, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_properties (gobject_class, N_PROPS, obj_props); diff --git a/clutter/clutter/clutter-colorize-effect.c b/clutter/clutter/clutter-colorize-effect.c index 33a1a643d..46db57ff5 100644 --- a/clutter/clutter/clutter-colorize-effect.c +++ b/clutter/clutter/clutter-colorize-effect.c @@ -180,7 +180,8 @@ clutter_colorize_effect_class_init (ClutterColorizeEffectClass *klass) obj_props[PROP_TINT] = clutter_param_spec_color ("tint", NULL, NULL, &default_tint, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); g_object_class_install_properties (gobject_class, PROP_LAST, obj_props); } diff --git a/clutter/clutter/clutter-deform-effect.c b/clutter/clutter/clutter-deform-effect.c index 76286d3a2..2450f9b93 100644 --- a/clutter/clutter/clutter-deform-effect.c +++ b/clutter/clutter/clutter-deform-effect.c @@ -578,7 +578,8 @@ clutter_deform_effect_class_init (ClutterDeformEffectClass *klass) g_param_spec_uint ("x-tiles", NULL, NULL, 1, G_MAXUINT, DEFAULT_N_TILES, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterDeformEffect:y-tiles: @@ -590,7 +591,8 @@ clutter_deform_effect_class_init (ClutterDeformEffectClass *klass) g_param_spec_uint ("y-tiles", NULL, NULL, 1, G_MAXUINT, DEFAULT_N_TILES, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterDeformEffect:back-material: @@ -603,7 +605,8 @@ clutter_deform_effect_class_init (ClutterDeformEffectClass *klass) obj_props[PROP_BACK_MATERIAL] = g_param_spec_object ("back-material", NULL, NULL, COGL_TYPE_PIPELINE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); gobject_class->finalize = clutter_deform_effect_finalize; gobject_class->set_property = clutter_deform_effect_set_property; diff --git a/clutter/clutter/clutter-desaturate-effect.c b/clutter/clutter/clutter-desaturate-effect.c index 242299260..341e7150b 100644 --- a/clutter/clutter/clutter-desaturate-effect.c +++ b/clutter/clutter/clutter-desaturate-effect.c @@ -198,7 +198,8 @@ clutter_desaturate_effect_class_init (ClutterDesaturateEffectClass *klass) g_param_spec_double ("factor", NULL, NULL, 0.0, 1.0, 1.0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); gobject_class->dispose = clutter_desaturate_effect_dispose; gobject_class->set_property = clutter_desaturate_effect_set_property; diff --git a/clutter/clutter/clutter-flow-layout.c b/clutter/clutter/clutter-flow-layout.c index bdfa01081..e884ab4fa 100644 --- a/clutter/clutter/clutter-flow-layout.c +++ b/clutter/clutter/clutter-flow-layout.c @@ -916,7 +916,9 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass) g_param_spec_enum ("orientation", NULL, NULL, CLUTTER_TYPE_FLOW_ORIENTATION, CLUTTER_FLOW_HORIZONTAL, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); /** * ClutterFlowLayout:homogeneous: @@ -927,7 +929,8 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass) flow_properties[PROP_HOMOGENEOUS] = g_param_spec_boolean ("homogeneous", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterFlowLayout:column-spacing: @@ -940,7 +943,8 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass) g_param_spec_float ("column-spacing", NULL, NULL, 0.0, G_MAXFLOAT, 0.0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterFlowLayout:row-spacing: @@ -953,7 +957,8 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass) g_param_spec_float ("row-spacing", NULL, NULL, 0.0, G_MAXFLOAT, 0.0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterFlowLayout:min-column-width: @@ -964,7 +969,8 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass) g_param_spec_float ("min-column-width", NULL, NULL, 0.0, G_MAXFLOAT, 0.0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterFlowLayout:max-column-width: @@ -976,7 +982,8 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass) g_param_spec_float ("max-column-width", NULL, NULL, -1.0, G_MAXFLOAT, -1.0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterFlowLayout:min-row-height: @@ -987,7 +994,8 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass) g_param_spec_float ("min-row-height", NULL, NULL, 0.0, G_MAXFLOAT, 0.0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterFlowLayout:max-row-height: @@ -999,7 +1007,8 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass) g_param_spec_float ("max-row-height", NULL, NULL, -1.0, G_MAXFLOAT, -1.0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterFlowLayout:snap-to-grid: @@ -1010,7 +1019,8 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass) flow_properties[PROP_SNAP_TO_GRID] = g_param_spec_boolean ("snap-to-grid", NULL, NULL, TRUE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); gobject_class->finalize = clutter_flow_layout_finalize; gobject_class->set_property = clutter_flow_layout_set_property; diff --git a/clutter/clutter/clutter-gesture-action.c b/clutter/clutter/clutter-gesture-action.c index 0fa0a4576..e9c083bd0 100644 --- a/clutter/clutter/clutter-gesture-action.c +++ b/clutter/clutter/clutter-gesture-action.c @@ -678,7 +678,8 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass) gesture_props[PROP_N_TOUCH_POINTS] = g_param_spec_int ("n-touch-points", NULL, NULL, 1, G_MAXINT, 1, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterGestureAction:threshold-trigger-edge: @@ -691,7 +692,8 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass) g_param_spec_enum ("threshold-trigger-edge", NULL, NULL, CLUTTER_TYPE_GESTURE_TRIGGER_EDGE, CLUTTER_GESTURE_TRIGGER_EDGE_NONE, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); /** @@ -706,7 +708,8 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass) gesture_props[PROP_THRESHOLD_TRIGGER_DISTANCE_X] = g_param_spec_float ("threshold-trigger-distance-x", NULL, NULL, -1.0, G_MAXFLOAT, -1.0, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); /** @@ -721,7 +724,8 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass) gesture_props[PROP_THRESHOLD_TRIGGER_DISTANCE_Y] = g_param_spec_float ("threshold-trigger-distance-y", NULL, NULL, -1.0, G_MAXFLOAT, -1.0, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_properties (gobject_class, diff --git a/clutter/clutter/clutter-input-device-tool.c b/clutter/clutter/clutter-input-device-tool.c index a020aeb87..cdc7a9e94 100644 --- a/clutter/clutter/clutter-input-device-tool.c +++ b/clutter/clutter/clutter-input-device-tool.c @@ -122,20 +122,28 @@ clutter_input_device_tool_class_init (ClutterInputDeviceToolClass *klass) g_param_spec_enum ("type", NULL, NULL, CLUTTER_TYPE_INPUT_DEVICE_TOOL_TYPE, CLUTTER_INPUT_DEVICE_TOOL_NONE, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); props[PROP_SERIAL] = g_param_spec_uint64 ("serial", NULL, NULL, 0, G_MAXUINT64, 0, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); props[PROP_ID] = g_param_spec_uint64 ("id", NULL, NULL, 0, G_MAXUINT64, 0, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); props[PROP_AXES] = g_param_spec_flags ("axes", NULL, NULL, CLUTTER_TYPE_INPUT_AXIS_FLAGS, CLUTTER_INPUT_AXIS_FLAG_NONE, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); g_object_class_install_properties (gobject_class, PROP_LAST, props); } diff --git a/clutter/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c index e9750cc66..5959461a7 100644 --- a/clutter/clutter/clutter-input-device.c +++ b/clutter/clutter/clutter-input-device.c @@ -319,7 +319,8 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass) obj_props[PROP_NAME] = g_param_spec_string ("name", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); /** @@ -331,7 +332,8 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass) g_param_spec_enum ("device-type", NULL, NULL, CLUTTER_TYPE_INPUT_DEVICE_TYPE, CLUTTER_POINTER_DEVICE, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); /** @@ -342,7 +344,8 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass) obj_props[PROP_CAPABILITIES] = g_param_spec_flags ("capabilities", NULL, NULL, CLUTTER_TYPE_INPUT_CAPABILITIES, 0, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); /** @@ -353,7 +356,9 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass) obj_props[PROP_SEAT] = g_param_spec_object ("seat", NULL, NULL, CLUTTER_TYPE_SEAT, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); /** * ClutterInputDevice:mode: @@ -364,7 +369,9 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass) g_param_spec_enum ("device-mode", NULL, NULL, CLUTTER_TYPE_INPUT_MODE, CLUTTER_INPUT_MODE_FLOATING, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); /** * ClutterInputDevice:has-cursor: @@ -374,7 +381,9 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass) obj_props[PROP_HAS_CURSOR] = g_param_spec_boolean ("has-cursor", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); /** * ClutterInputDevice:vendor-id: @@ -384,7 +393,9 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass) obj_props[PROP_VENDOR_ID] = g_param_spec_string ("vendor-id", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); /** * ClutterInputDevice:product-id: @@ -394,32 +405,44 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass) obj_props[PROP_PRODUCT_ID] = g_param_spec_string ("product-id", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); obj_props[PROP_N_RINGS] = g_param_spec_int ("n-rings", NULL, NULL, 0, G_MAXINT, 0, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); obj_props[PROP_N_STRIPS] = g_param_spec_int ("n-strips", NULL, NULL, 0, G_MAXINT, 0, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); obj_props[PROP_N_MODE_GROUPS] = g_param_spec_int ("n-mode-groups", NULL, NULL, 0, G_MAXINT, 0, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); obj_props[PROP_N_BUTTONS] = g_param_spec_int ("n-buttons", NULL, NULL, 0, G_MAXINT, 0, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); obj_props[PROP_DEVICE_NODE] = g_param_spec_string ("device-node", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); gobject_class->constructed = clutter_input_device_constructed; gobject_class->dispose = clutter_input_device_dispose; diff --git a/clutter/clutter/clutter-layout-meta.c b/clutter/clutter/clutter-layout-meta.c index 7fc2d6f2c..b49917d84 100644 --- a/clutter/clutter/clutter-layout-meta.c +++ b/clutter/clutter/clutter-layout-meta.c @@ -158,7 +158,8 @@ clutter_layout_meta_class_init (ClutterLayoutMetaClass *klass) g_param_spec_object ("manager", NULL, NULL, CLUTTER_TYPE_LAYOUT_MANAGER, G_PARAM_CONSTRUCT_ONLY | - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterLayoutMeta:container: @@ -169,7 +170,8 @@ clutter_layout_meta_class_init (ClutterLayoutMetaClass *klass) g_param_spec_object ("container", NULL, NULL, CLUTTER_TYPE_ACTOR, G_PARAM_CONSTRUCT_ONLY | - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterLayoutMeta:actor: @@ -180,7 +182,8 @@ clutter_layout_meta_class_init (ClutterLayoutMetaClass *klass) g_param_spec_object ("actor", NULL, NULL, CLUTTER_TYPE_ACTOR, G_PARAM_CONSTRUCT_ONLY | - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); g_object_class_install_properties (gobject_class, PROP_LAST, obj_props); } diff --git a/clutter/clutter/clutter-page-turn-effect.c b/clutter/clutter/clutter-page-turn-effect.c index 62686e06e..3563e3186 100644 --- a/clutter/clutter/clutter-page-turn-effect.c +++ b/clutter/clutter/clutter-page-turn-effect.c @@ -218,7 +218,8 @@ clutter_page_turn_effect_class_init (ClutterPageTurnEffectClass *klass) pspec = g_param_spec_double ("period", NULL, NULL, 0.0, 1.0, 0.0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_PERIOD] = pspec; g_object_class_install_property (gobject_class, PROP_PERIOD, pspec); @@ -230,7 +231,8 @@ clutter_page_turn_effect_class_init (ClutterPageTurnEffectClass *klass) pspec = g_param_spec_double ("angle", NULL, NULL, 0.0, 360.0, 0.0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_ANGLE] = pspec; g_object_class_install_property (gobject_class, PROP_ANGLE, pspec); @@ -242,7 +244,8 @@ clutter_page_turn_effect_class_init (ClutterPageTurnEffectClass *klass) pspec = g_param_spec_float ("radius", NULL, NULL, -G_MAXFLOAT, G_MAXFLOAT, 24.0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_RADIUS] = pspec; g_object_class_install_property (gobject_class, PROP_RADIUS, pspec); diff --git a/clutter/clutter/clutter-pan-action.c b/clutter/clutter/clutter-pan-action.c index 850d4b0e7..3e3960f9c 100644 --- a/clutter/clutter/clutter-pan-action.c +++ b/clutter/clutter/clutter-pan-action.c @@ -478,7 +478,8 @@ clutter_pan_action_class_init (ClutterPanActionClass *klass) g_param_spec_enum ("pan-axis", NULL, NULL, CLUTTER_TYPE_PAN_AXIS, CLUTTER_PAN_AXIS_NONE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterPanAction:interpolate: @@ -488,7 +489,8 @@ clutter_pan_action_class_init (ClutterPanActionClass *klass) pan_props[PROP_INTERPOLATE] = g_param_spec_boolean ("interpolate", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterPanAction:deceleration: @@ -501,7 +503,8 @@ clutter_pan_action_class_init (ClutterPanActionClass *klass) pan_props[PROP_DECELERATION] = g_param_spec_double ("deceleration", NULL, NULL, FLOAT_EPSILON, 1.0, default_deceleration_rate, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterPanAction:acceleration-factor: @@ -515,7 +518,8 @@ clutter_pan_action_class_init (ClutterPanActionClass *klass) pan_props[PROP_ACCELERATION_FACTOR] = g_param_spec_double ("acceleration-factor", NULL, NULL, 1.0, G_MAXDOUBLE, default_acceleration_factor, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); gobject_class->constructed = clutter_pan_action_constructed; gobject_class->set_property = clutter_pan_action_set_property; diff --git a/clutter/clutter/clutter-path-constraint.c b/clutter/clutter/clutter-path-constraint.c index 064018997..619ac3151 100644 --- a/clutter/clutter/clutter-path-constraint.c +++ b/clutter/clutter/clutter-path-constraint.c @@ -200,7 +200,8 @@ clutter_path_constraint_class_init (ClutterPathConstraintClass *klass) path_properties[PROP_PATH] = g_param_spec_object ("path", NULL, NULL, CLUTTER_TYPE_PATH, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterPathConstraint:offset: @@ -211,7 +212,8 @@ clutter_path_constraint_class_init (ClutterPathConstraintClass *klass) g_param_spec_float ("offset", NULL, NULL, -1.0, 2.0, 0.0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); gobject_class->set_property = clutter_path_constraint_set_property; gobject_class->get_property = clutter_path_constraint_get_property; diff --git a/clutter/clutter/clutter-path.c b/clutter/clutter/clutter-path.c index 2c0571376..57c4bc719 100644 --- a/clutter/clutter/clutter-path.c +++ b/clutter/clutter/clutter-path.c @@ -185,13 +185,15 @@ clutter_path_class_init (ClutterPathClass *klass) pspec = g_param_spec_string ("description", NULL, NULL, "", - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_DESCRIPTION] = pspec; g_object_class_install_property (gobject_class, PROP_DESCRIPTION, pspec); pspec = g_param_spec_uint ("length", NULL, NULL, 0, G_MAXUINT, 0, - CLUTTER_PARAM_READABLE); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_LENGTH] = pspec; g_object_class_install_property (gobject_class, PROP_LENGTH, pspec); } diff --git a/clutter/clutter/clutter-private.h b/clutter/clutter/clutter-private.h index de6d54a95..da0b30163 100644 --- a/clutter/clutter/clutter-private.h +++ b/clutter/clutter/clutter-private.h @@ -69,10 +69,6 @@ typedef struct _ClutterContext ClutterContext; #define CLUTTER_ACTOR_IN_PREF_SIZE(a) ((CLUTTER_PRIVATE_FLAGS (a) & (CLUTTER_IN_PREF_HEIGHT|CLUTTER_IN_PREF_WIDTH)) != FALSE) #define CLUTTER_ACTOR_IN_MAP_UNMAP(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_MAP_UNMAP) != FALSE) -#define CLUTTER_PARAM_READABLE (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS) -#define CLUTTER_PARAM_WRITABLE (G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS) -#define CLUTTER_PARAM_READWRITE (G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS) - #define CLUTTER_PARAM_ANIMATABLE (1 << G_PARAM_USER_SHIFT) /* automagic interning of a static string */ diff --git a/clutter/clutter/clutter-seat.c b/clutter/clutter/clutter-seat.c index 0e4a4d4c7..6405f32dd 100644 --- a/clutter/clutter/clutter-seat.c +++ b/clutter/clutter/clutter-seat.c @@ -299,7 +299,8 @@ clutter_seat_class_init (ClutterSeatClass *klass) props[PROP_TOUCH_MODE] = g_param_spec_boolean ("touch-mode", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); /** * ClutterSeat::name: diff --git a/clutter/clutter/clutter-settings.c b/clutter/clutter/clutter-settings.c index 3601cb480..9f5de1f14 100644 --- a/clutter/clutter/clutter-settings.c +++ b/clutter/clutter/clutter-settings.c @@ -779,7 +779,8 @@ clutter_settings_class_init (ClutterSettingsClass *klass) g_param_spec_int ("double-click-time", NULL, NULL, 0, G_MAXINT, 250, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterSettings:double-click-distance: @@ -791,7 +792,8 @@ clutter_settings_class_init (ClutterSettingsClass *klass) g_param_spec_int ("double-click-distance", NULL, NULL, 0, G_MAXINT, 5, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterSettings:dnd-drag-threshold: @@ -803,7 +805,8 @@ clutter_settings_class_init (ClutterSettingsClass *klass) g_param_spec_int ("dnd-drag-threshold", NULL, NULL, 1, G_MAXINT, 8, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterSettings:font-name: @@ -814,7 +817,8 @@ clutter_settings_class_init (ClutterSettingsClass *klass) obj_props[PROP_FONT_NAME] = g_param_spec_string ("font-name", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterSettings:font-antialias: @@ -827,7 +831,8 @@ clutter_settings_class_init (ClutterSettingsClass *klass) g_param_spec_int ("font-antialias", NULL, NULL, -1, 1, -1, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterSettings:font-dpi: @@ -840,13 +845,15 @@ clutter_settings_class_init (ClutterSettingsClass *klass) g_param_spec_int ("font-dpi", NULL, NULL, -1, 1024 * 1024, -1, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_UNSCALED_FONT_DPI] = g_param_spec_int ("unscaled-font-dpi", NULL, NULL, -1, 1024 * 1024, -1, - CLUTTER_PARAM_WRITABLE); + G_PARAM_WRITABLE | + G_PARAM_STATIC_STRINGS); /** * ClutterSettings:font-hinting: @@ -859,7 +866,8 @@ clutter_settings_class_init (ClutterSettingsClass *klass) g_param_spec_int ("font-hinting", NULL, NULL, -1, 1, -1, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterSettings:font-hint-style: @@ -875,7 +883,8 @@ clutter_settings_class_init (ClutterSettingsClass *klass) obj_props[PROP_FONT_HINT_STYLE] = g_param_spec_string ("font-hint-style", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterSettings:font-subpixel-order: @@ -892,7 +901,8 @@ clutter_settings_class_init (ClutterSettingsClass *klass) obj_props[PROP_FONT_RGBA] = g_param_spec_string ("font-subpixel-order", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterSettings:long-press-duration: @@ -906,13 +916,15 @@ clutter_settings_class_init (ClutterSettingsClass *klass) g_param_spec_int ("long-press-duration", NULL, NULL, 0, G_MAXINT, 500, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_FONTCONFIG_TIMESTAMP] = g_param_spec_uint ("fontconfig-timestamp", NULL, NULL, 0, G_MAXUINT, 0, - CLUTTER_PARAM_WRITABLE); + G_PARAM_WRITABLE | + G_PARAM_STATIC_STRINGS); /** * ClutterText:password-hint-time: @@ -926,7 +938,8 @@ clutter_settings_class_init (ClutterSettingsClass *klass) g_param_spec_uint ("password-hint-time", NULL, NULL, 0, G_MAXUINT, 0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); gobject_class->set_property = clutter_settings_set_property; gobject_class->get_property = clutter_settings_get_property; diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c index 44444ac77..16d0d94bb 100644 --- a/clutter/clutter/clutter-shader-effect.c +++ b/clutter/clutter/clutter-shader-effect.c @@ -446,7 +446,9 @@ clutter_shader_effect_class_init (ClutterShaderEffectClass *klass) g_param_spec_enum ("shader-type", NULL, NULL, CLUTTER_TYPE_SHADER_TYPE, CLUTTER_FRAGMENT_SHADER, - CLUTTER_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_WRITABLE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); gobject_class->set_property = clutter_shader_effect_set_property; gobject_class->finalize = clutter_shader_effect_finalize; diff --git a/clutter/clutter/clutter-snap-constraint.c b/clutter/clutter/clutter-snap-constraint.c index f78e56efe..d7faca340 100644 --- a/clutter/clutter/clutter-snap-constraint.c +++ b/clutter/clutter/clutter-snap-constraint.c @@ -313,7 +313,9 @@ clutter_snap_constraint_class_init (ClutterSnapConstraintClass *klass) obj_props[PROP_SOURCE] = g_param_spec_object ("source", NULL, NULL, CLUTTER_TYPE_ACTOR, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); /** * ClutterSnapConstraint:from-edge: @@ -324,7 +326,9 @@ clutter_snap_constraint_class_init (ClutterSnapConstraintClass *klass) g_param_spec_enum ("from-edge", NULL, NULL, CLUTTER_TYPE_SNAP_EDGE, CLUTTER_SNAP_EDGE_RIGHT, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); /** * ClutterSnapConstraint:to-edge: @@ -335,7 +339,9 @@ clutter_snap_constraint_class_init (ClutterSnapConstraintClass *klass) g_param_spec_enum ("to-edge", NULL, NULL, CLUTTER_TYPE_SNAP_EDGE, CLUTTER_SNAP_EDGE_RIGHT, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); /** * ClutterSnapConstraint:offset: @@ -347,7 +353,9 @@ clutter_snap_constraint_class_init (ClutterSnapConstraintClass *klass) g_param_spec_float ("offset", NULL, NULL, -G_MAXFLOAT, G_MAXFLOAT, 0.0f, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); gobject_class->dispose = clutter_snap_constraint_dispose; gobject_class->set_property = clutter_snap_constraint_set_property; diff --git a/clutter/clutter/clutter-stage-manager.c b/clutter/clutter/clutter-stage-manager.c index 4aaa7acfe..04ea5691d 100644 --- a/clutter/clutter/clutter-stage-manager.c +++ b/clutter/clutter/clutter-stage-manager.c @@ -111,7 +111,8 @@ clutter_stage_manager_class_init (ClutterStageManagerClass *klass) PROP_DEFAULT_STAGE, g_param_spec_object ("default-stage", NULL, NULL, CLUTTER_TYPE_STAGE, - CLUTTER_PARAM_READABLE)); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); /** * ClutterStageManager::stage-added: diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 3452b8eda..9efbf520c 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -1385,7 +1385,8 @@ clutter_stage_class_init (ClutterStageClass *klass) obj_props[PROP_PERSPECTIVE] = g_param_spec_boxed ("perspective", NULL, NULL, CLUTTER_TYPE_PERSPECTIVE, - CLUTTER_PARAM_READABLE | + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -1396,7 +1397,8 @@ clutter_stage_class_init (ClutterStageClass *klass) obj_props[PROP_TITLE] = g_param_spec_string ("title", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -1410,7 +1412,8 @@ clutter_stage_class_init (ClutterStageClass *klass) obj_props[PROP_KEY_FOCUS] = g_param_spec_object ("key-focus", NULL, NULL, CLUTTER_TYPE_ACTOR, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); /** @@ -1421,7 +1424,8 @@ clutter_stage_class_init (ClutterStageClass *klass) obj_props[PROP_IS_GRABBED] = g_param_spec_boolean ("is-grabbed", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE | + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); g_object_class_install_properties (gobject_class, PROP_LAST, obj_props); diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/clutter-text.c index c8be06ccc..b6b00a478 100644 --- a/clutter/clutter/clutter-text.c +++ b/clutter/clutter/clutter-text.c @@ -3794,7 +3794,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_object ("buffer", NULL, NULL, CLUTTER_TYPE_TEXT_BUFFER, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_BUFFER] = pspec; g_object_class_install_property (gobject_class, PROP_BUFFER, pspec); @@ -3808,7 +3809,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_string ("font-name", NULL, NULL, NULL, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_FONT_NAME] = pspec; g_object_class_install_property (gobject_class, PROP_FONT_NAME, pspec); @@ -3822,7 +3824,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_boxed ("font-description", NULL, NULL, PANGO_TYPE_FONT_DESCRIPTION, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_FONT_DESCRIPTION] = pspec; g_object_class_install_property (gobject_class, PROP_FONT_DESCRIPTION, @@ -3835,7 +3838,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_string ("text", NULL, NULL, "", - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_TEXT] = pspec; g_object_class_install_property (gobject_class, PROP_TEXT, pspec); @@ -3846,7 +3850,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = clutter_param_spec_color ("color", NULL, NULL, &default_text_color, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | CLUTTER_PARAM_ANIMATABLE); obj_props[PROP_COLOR] = pspec; g_object_class_install_property (gobject_class, PROP_COLOR, pspec); @@ -3899,7 +3904,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_boolean ("cursor-visible", NULL, NULL, TRUE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_CURSOR_VISIBLE] = pspec; g_object_class_install_property (gobject_class, PROP_CURSOR_VISIBLE, pspec); @@ -3910,7 +3916,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = clutter_param_spec_color ("cursor-color", NULL, NULL, &default_cursor_color, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | CLUTTER_PARAM_ANIMATABLE); obj_props[PROP_CURSOR_COLOR] = pspec; g_object_class_install_property (gobject_class, PROP_CURSOR_COLOR, pspec); @@ -3922,7 +3929,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_boolean ("cursor-color-set", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_CURSOR_COLOR_SET] = pspec; g_object_class_install_property (gobject_class, PROP_CURSOR_COLOR_SET, pspec); @@ -3934,7 +3942,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_int ("cursor-size", NULL, NULL, -1, G_MAXINT, DEFAULT_CURSOR_SIZE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_CURSOR_SIZE] = pspec; g_object_class_install_property (gobject_class, PROP_CURSOR_SIZE, pspec); @@ -3946,7 +3955,8 @@ clutter_text_class_init (ClutterTextClass *klass) pspec = g_param_spec_int ("cursor-position", NULL, NULL, -1, G_MAXINT, -1, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_CURSOR_POSITION] = pspec; g_object_class_install_property (gobject_class, PROP_CURSOR_POSITION, pspec); @@ -3958,7 +3968,8 @@ clutter_text_class_init (ClutterTextClass *klass) pspec = g_param_spec_int ("selection-bound", NULL, NULL, -1, G_MAXINT, -1, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_SELECTION_BOUND] = pspec; g_object_class_install_property (gobject_class, PROP_SELECTION_BOUND, pspec); @@ -3969,7 +3980,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = clutter_param_spec_color ("selection-color", NULL, NULL, &default_selection_color, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | CLUTTER_PARAM_ANIMATABLE); obj_props[PROP_SELECTION_COLOR] = pspec; g_object_class_install_property (gobject_class, PROP_SELECTION_COLOR, pspec); @@ -3981,7 +3993,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_boolean ("selection-color-set", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_SELECTION_COLOR_SET] = pspec; g_object_class_install_property (gobject_class, PROP_SELECTION_COLOR_SET, pspec); @@ -3993,7 +4006,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_boxed ("attributes", NULL, NULL, PANGO_TYPE_ATTR_LIST, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_ATTRIBUTES] = pspec; g_object_class_install_property (gobject_class, PROP_ATTRIBUTES, pspec); @@ -4012,7 +4026,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_boolean ("use-markup", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_USE_MARKUP] = pspec; g_object_class_install_property (gobject_class, PROP_USE_MARKUP, pspec); @@ -4025,7 +4040,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_boolean ("line-wrap", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_LINE_WRAP] = pspec; g_object_class_install_property (gobject_class, PROP_LINE_WRAP, pspec); @@ -4038,7 +4054,8 @@ clutter_text_class_init (ClutterTextClass *klass) pspec = g_param_spec_enum ("line-wrap-mode", NULL, NULL, PANGO_TYPE_WRAP_MODE, PANGO_WRAP_WORD, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_LINE_WRAP_MODE] = pspec; g_object_class_install_property (gobject_class, PROP_LINE_WRAP_MODE, pspec); @@ -4050,7 +4067,8 @@ clutter_text_class_init (ClutterTextClass *klass) pspec = g_param_spec_enum ("ellipsize", NULL, NULL, PANGO_TYPE_ELLIPSIZE_MODE, PANGO_ELLIPSIZE_NONE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_ELLIPSIZE] = pspec; g_object_class_install_property (gobject_class, PROP_ELLIPSIZE, pspec); @@ -4063,7 +4081,8 @@ clutter_text_class_init (ClutterTextClass *klass) pspec = g_param_spec_enum ("line-alignment", NULL, NULL, PANGO_TYPE_ALIGNMENT, PANGO_ALIGN_LEFT, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_LINE_ALIGNMENT] = pspec; g_object_class_install_property (gobject_class, PROP_LINE_ALIGNMENT, pspec); @@ -4075,7 +4094,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_boolean ("justify", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_JUSTIFY] = pspec; g_object_class_install_property (gobject_class, PROP_JUSTIFY, pspec); @@ -4087,7 +4107,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_unichar ("password-char", NULL, NULL, 0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_PASSWORD_CHAR] = pspec; g_object_class_install_property (gobject_class, PROP_PASSWORD_CHAR, pspec); @@ -4098,7 +4119,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_int ("max-length", NULL, NULL, -1, G_MAXINT, 0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_MAX_LENGTH] = pspec; g_object_class_install_property (gobject_class, PROP_MAX_LENGTH, pspec); @@ -4118,7 +4140,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_boolean ("single-line-mode", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_SINGLE_LINE_MODE] = pspec; g_object_class_install_property (gobject_class, PROP_SINGLE_LINE_MODE, pspec); @@ -4129,7 +4152,8 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = clutter_param_spec_color ("selected-text-color", NULL, NULL, &default_selected_text_color, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | CLUTTER_PARAM_ANIMATABLE); obj_props[PROP_SELECTED_TEXT_COLOR] = pspec; g_object_class_install_property (gobject_class, PROP_SELECTED_TEXT_COLOR, pspec); @@ -4141,19 +4165,24 @@ clutter_text_class_init (ClutterTextClass *klass) */ pspec = g_param_spec_boolean ("selected-text-color-set", NULL, NULL, FALSE, - CLUTTER_PARAM_READABLE); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_SELECTED_TEXT_COLOR_SET] = pspec; g_object_class_install_property (gobject_class, PROP_SELECTED_TEXT_COLOR_SET, pspec); pspec = g_param_spec_flags ("input-hints", NULL, NULL, CLUTTER_TYPE_INPUT_CONTENT_HINT_FLAGS, - 0, CLUTTER_PARAM_READWRITE); + 0, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_INPUT_HINTS] = pspec; g_object_class_install_property (gobject_class, PROP_INPUT_HINTS, pspec); pspec = g_param_spec_enum ("input-purpose", NULL, NULL, CLUTTER_TYPE_INPUT_CONTENT_PURPOSE, - 0, CLUTTER_PARAM_READWRITE); + 0, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_INPUT_PURPOSE] = pspec; g_object_class_install_property (gobject_class, PROP_INPUT_PURPOSE, pspec); diff --git a/clutter/clutter/clutter-timeline.c b/clutter/clutter/clutter-timeline.c index 9c756b110..f3b2fef4d 100644 --- a/clutter/clutter/clutter-timeline.c +++ b/clutter/clutter/clutter-timeline.c @@ -646,7 +646,9 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) obj_props[PROP_ACTOR] = g_param_spec_object ("actor", NULL, NULL, CLUTTER_TYPE_ACTOR, - G_PARAM_CONSTRUCT | CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); /** * ClutterTimeline:delay: * @@ -657,7 +659,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) g_param_spec_uint ("delay", NULL, NULL, 0, G_MAXUINT, 0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterTimeline:duration: @@ -669,7 +672,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) g_param_spec_uint ("duration", NULL, NULL, 0, G_MAXUINT, 1000, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterTimeline:direction: @@ -681,7 +685,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) g_param_spec_enum ("direction", NULL, NULL, CLUTTER_TYPE_TIMELINE_DIRECTION, CLUTTER_TIMELINE_FORWARD, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterTimeline:auto-reverse: @@ -692,7 +697,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) obj_props[PROP_AUTO_REVERSE] = g_param_spec_boolean ("auto-reverse", NULL, NULL, FALSE, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterTimeline:repeat-count: @@ -708,7 +714,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) g_param_spec_int ("repeat-count", NULL, NULL, -1, G_MAXINT, 0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterTimeline:progress-mode: @@ -719,7 +726,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) g_param_spec_enum ("progress-mode", NULL, NULL, CLUTTER_TYPE_ANIMATION_MODE, CLUTTER_LINEAR, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); /** * ClutterTimeline:frame-clock: @@ -729,7 +737,9 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) obj_props[PROP_FRAME_CLOCK] = g_param_spec_object ("frame-clock", NULL, NULL, CLUTTER_TYPE_FRAME_CLOCK, - G_PARAM_CONSTRUCT | CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT); object_class->dispose = clutter_timeline_dispose; object_class->finalize = clutter_timeline_finalize; diff --git a/clutter/clutter/clutter-virtual-input-device.c b/clutter/clutter/clutter-virtual-input-device.c index 7e2bf36ee..4ebefff93 100644 --- a/clutter/clutter/clutter-virtual-input-device.c +++ b/clutter/clutter/clutter-virtual-input-device.c @@ -282,12 +282,16 @@ clutter_virtual_input_device_class_init (ClutterVirtualInputDeviceClass *klass) obj_props[PROP_SEAT] = g_param_spec_object ("seat", NULL, NULL, CLUTTER_TYPE_SEAT, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); obj_props[PROP_DEVICE_TYPE] = g_param_spec_enum ("device-type", NULL, NULL, CLUTTER_TYPE_INPUT_DEVICE_TYPE, CLUTTER_POINTER_DEVICE, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT_ONLY); g_object_class_install_properties (object_class, PROP_LAST, obj_props); } diff --git a/src/backends/native/meta-input-device-native.c b/src/backends/native/meta-input-device-native.c index 3e3fe4c64..7dcaabe40 100644 --- a/src/backends/native/meta-input-device-native.c +++ b/src/backends/native/meta-input-device-native.c @@ -1341,11 +1341,13 @@ meta_input_device_native_class_init (MetaInputDeviceNativeClass *klass) obj_props[PROP_DEVICE_MATRIX] = g_param_spec_boxed ("device-matrix", NULL, NULL, GRAPHENE_TYPE_MATRIX, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); obj_props[PROP_OUTPUT_ASPECT_RATIO] = g_param_spec_double ("output-aspect-ratio", NULL, NULL, 0, G_MAXDOUBLE, 0, - CLUTTER_PARAM_READWRITE); + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, N_PROPS, obj_props); } diff --git a/src/backends/native/meta-input-settings-native.c b/src/backends/native/meta-input-settings-native.c index 7e3813fa7..9d007ed53 100644 --- a/src/backends/native/meta-input-settings-native.c +++ b/src/backends/native/meta-input-settings-native.c @@ -845,7 +845,8 @@ meta_input_settings_native_class_init (MetaInputSettingsNativeClass *klass) props[PROP_SEAT_IMPL] = g_param_spec_object ("seat-impl", NULL, NULL, META_TYPE_SEAT_IMPL, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_properties (object_class, N_PROPS, props); diff --git a/src/backends/native/meta-virtual-input-device-native.c b/src/backends/native/meta-virtual-input-device-native.c index f02a47d8a..cd15e6b11 100644 --- a/src/backends/native/meta-virtual-input-device-native.c +++ b/src/backends/native/meta-virtual-input-device-native.c @@ -1095,11 +1095,13 @@ meta_virtual_input_device_native_class_init (MetaVirtualInputDeviceNativeClass * virtual_input_device_class->notify_touch_up = meta_virtual_input_device_native_notify_touch_up; obj_props[PROP_SEAT] = g_param_spec_pointer ("seat", NULL, NULL, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); obj_props[PROP_SLOT_BASE] = g_param_spec_uint ("slot-base", NULL, NULL, 0, G_MAXUINT, 0, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_properties (object_class, PROP_LAST, obj_props); } diff --git a/src/backends/x11/meta-input-device-x11.c b/src/backends/x11/meta-input-device-x11.c index 81cda767f..6f4d3bb4f 100644 --- a/src/backends/x11/meta-input-device-x11.c +++ b/src/backends/x11/meta-input-device-x11.c @@ -369,7 +369,8 @@ meta_input_device_x11_class_init (MetaInputDeviceX11Class *klass) g_param_spec_int ("id", NULL, NULL, -1, G_MAXINT, 0, - CLUTTER_PARAM_READWRITE | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_properties (gobject_class, N_PROPS, props);