From d7c9e70c31c6673586560e877e0f51eaade48796 Mon Sep 17 00:00:00 2001 From: Florian Brosch Date: Thu, 12 Oct 2017 23:51:57 +0200 Subject: [PATCH] weather: Simplify and inline property param flags --- src/gcal-weather-info.c | 28 +++++++++++++++++----------- src/gcal-weather-service.c | 25 +++++++++++++------------ 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/gcal-weather-info.c b/src/gcal-weather-info.c index 08efa372..2db9bc1d 100644 --- a/src/gcal-weather-info.c +++ b/src/gcal-weather-info.c @@ -148,33 +148,39 @@ gcal_weather_info_class_init (GcalWeatherInfoClass *klass) object_class->get_property = gcal_weather_info_get_property; object_class->set_property = gcal_weather_info_set_property; - const gint pflags_rwc = G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT; /** * GcalWeatherInfo:date: * * The non-nullable date weather information belongs to. */ - g_object_class_install_property (object_class, - PROP_DATE, - g_param_spec_boxed ("date", "date", "date", G_TYPE_DATE, pflags_rwc)); + g_object_class_install_property + (object_class, + PROP_DATE, + g_param_spec_boxed ("date", "date", "date", G_TYPE_DATE, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + /** * GcalWeatherInfo:icon-name: * * Non-nullable Icon name representing the weather. */ - g_object_class_install_property (object_class, - PROP_ICON_NAME, - g_param_spec_string ("icon-name", "icon-name", "icon-name", NULL, pflags_rwc)); + g_object_class_install_property + (object_class, + PROP_ICON_NAME, + g_param_spec_string ("icon-name", "icon-name", "icon-name", NULL, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + /** * GcalWeatherInfo:temperature: * * The temperature as string or %NULL. */ - g_object_class_install_property (object_class, - PROP_TEMPERATURE, - g_param_spec_string ("temperature", "temperature", "temperature", NULL, pflags_rwc)); + g_object_class_install_property + (object_class, + PROP_TEMPERATURE, + g_param_spec_string ("temperature", "temperature", "temperature", NULL, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); } diff --git a/src/gcal-weather-service.c b/src/gcal-weather-service.c index 4d6d18c2..8ce69d14 100644 --- a/src/gcal-weather-service.c +++ b/src/gcal-weather-service.c @@ -216,29 +216,30 @@ gcal_weather_service_class_init (GcalWeatherServiceClass *klass) object_class->get_property = gcal_weather_service_get_property; object_class->set_property = gcal_weather_service_set_property; - const gint prop_flags = G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB | G_PARAM_READABLE | - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT; - /** * GcalWeatherServiceClass:max-days: * * Maximal number of days to fetch forecasts for. */ - g_object_class_install_property (G_OBJECT_CLASS (klass), - PROP_MAX_DAYS, - g_param_spec_uint ("max-days", "max-days", "max-days", - 1, G_MAXUINT, 3, prop_flags)); + g_object_class_install_property + (G_OBJECT_CLASS (klass), + PROP_MAX_DAYS, + g_param_spec_uint ("max-days", "max-days", "max-days", + 1, G_MAXUINT, 3, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + /** * GcalWeatherServiceClass:check-interval: * * Amount of seconds to wait before re-fetching weather infos. * Use %0 to disable timers. */ - g_object_class_install_property (G_OBJECT_CLASS (klass), - PROP_CHECK_INTERVAL, - g_param_spec_uint ("check-interval", "check-interval", "check-interval", - 0, G_MAXUINT, 0, prop_flags)); + g_object_class_install_property + (G_OBJECT_CLASS (klass), + PROP_CHECK_INTERVAL, + g_param_spec_uint ("check-interval", "check-interval", "check-interval", + 0, G_MAXUINT, 0, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); /** * GcalWeatherService::weather-changed: