diff options
author | Thomas Haller <thaller@redhat.com> | 2017-03-08 13:43:56 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2017-03-08 13:47:00 +0100 |
commit | ab6e37019552c9ff0ab4cd3d0e4047bca97a6211 (patch) | |
tree | 02072f53aeca51c2a1624045dc2358490073694e | |
parent | 556b7c3b4597405242e5fe2a557a9dc480858dae (diff) | |
download | NetworkManager-ab6e37019552c9ff0ab4cd3d0e4047bca97a6211.tar.gz |
all/trivial: unify construct-only property comments
Unify marking GObject properties that are G_PARAM_CONSTRUCT_ONLY
with a comment
/* construct-only */
-rw-r--r-- | libnm-glib/nm-device.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-object.c | 4 | ||||
-rw-r--r-- | libnm-glib/nm-remote-connection.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-remote-settings.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-vpn-plugin.c | 2 | ||||
-rw-r--r-- | libnm/nm-object.c | 4 | ||||
-rw-r--r-- | libnm/nm-vpn-plugin-old.c | 2 | ||||
-rw-r--r-- | libnm/nm-vpn-service-plugin.c | 4 | ||||
-rw-r--r-- | src/devices/bluetooth/nm-device-bt.c | 6 | ||||
-rw-r--r-- | src/devices/wwan/nm-modem.c | 8 | ||||
-rw-r--r-- | src/nm-auth-subject.c | 6 | ||||
-rw-r--r-- | src/nm-config-data.c | 6 |
12 files changed, 27 insertions, 21 deletions
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 48ad8897be..b5575e3908 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -519,7 +519,7 @@ set_property (GObject *object, switch (prop_id) { case PROP_DEVICE_TYPE: - /* Construct only */ + /* construct-only */ priv->device_type = g_value_get_uint (value); break; case PROP_MANAGED: diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c index 4d77a86cfb..2e07ff6d1f 100644 --- a/libnm-glib/nm-object.c +++ b/libnm-glib/nm-object.c @@ -369,11 +369,11 @@ set_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_DBUS_CONNECTION: - /* Construct only */ + /* construct-only */ priv->connection = g_value_dup_boxed (value); break; case PROP_DBUS_PATH: - /* Construct only */ + /* construct-only */ priv->path = g_value_dup_string (value); break; default: diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index 5c07f0ecec..d147365b79 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -796,7 +796,7 @@ set_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_BUS: case PROP_DBUS_CONNECTION: - /* Construct only */ + /* construct-only */ /* priv->bus is set from either of two properties so that it (a) remains * backwards compatible with the previous "bus" property, and that (b) * it can be created just like an NMObject using the "dbus-connection", diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c index 6e90db1958..3f2c50f24b 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -1429,7 +1429,7 @@ set_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_BUS: - /* Construct only */ + /* construct-only */ priv->bus = g_value_dup_boxed (value); if (!priv->bus) priv->bus = _nm_dbus_new_connection (NULL); diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index 0ea30b58a3..4c4c3161c9 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -799,7 +799,7 @@ set_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_DBUS_SERVICE_NAME: - /* Construct-only */ + /* construct-only */ priv->dbus_service_name = g_value_dup_string (value); break; case PROP_STATE: diff --git a/libnm/nm-object.c b/libnm/nm-object.c index 01c7b936b6..048905fd69 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -1200,13 +1200,13 @@ set_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_DBUS_OBJECT: - /* Construct only */ + /* construct-only */ priv->object = g_value_dup_object (value); if (!priv->object) g_return_if_reached (); break; case PROP_DBUS_OBJECT_MANAGER: - /* Construct only */ + /* construct-only */ priv->object_manager = g_value_dup_object (value); break; default: diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index aff23b2007..2b5922b925 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -1025,7 +1025,7 @@ set_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_DBUS_SERVICE_NAME: - /* Construct-only */ + /* construct-only */ priv->dbus_service_name = g_value_dup_string (value); break; case PROP_STATE: diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 0b47bf5373..31e1295488 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -1047,11 +1047,11 @@ set_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_DBUS_SERVICE_NAME: - /* Construct-only */ + /* construct-only */ priv->dbus_service_name = g_value_dup_string (value); break; case PROP_DBUS_WATCH_PEER: - /* Construct-only */ + /* construct-only */ priv->dbus_watch_peer = g_value_get_boolean (value); break; case PROP_STATE: diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index 3bc67a559b..1f040d5294 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -1029,15 +1029,15 @@ set_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_BT_NAME: - /* Construct only */ + /* construct-only */ priv->name = g_value_dup_string (value); break; case PROP_BT_CAPABILITIES: - /* Construct only */ + /* construct-only */ priv->capabilities = g_value_get_uint (value); break; case PROP_BT_DEVICE: - /* Construct only */ + /* construct-only */ priv->bt_device = g_value_dup_object (value); g_signal_connect (priv->bt_device, "removed", G_CALLBACK (bluez_device_removed), object); break; diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index f805bbfed3..c292b635ea 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -1447,15 +1447,15 @@ set_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_PATH: - /* Construct only */ + /* construct-only */ priv->path = g_value_dup_string (value); break; case PROP_DRIVER: - /* Construct only */ + /* construct-only */ priv->driver = g_value_dup_string (value); break; case PROP_CONTROL_PORT: - /* Construct only */ + /* construct-only */ priv->control_port = g_value_dup_string (value); break; case PROP_DATA_PORT: @@ -1463,7 +1463,7 @@ set_property (GObject *object, guint prop_id, priv->data_port = g_value_dup_string (value); break; case PROP_UID: - /* Construct only */ + /* construct-only */ priv->uid = g_value_dup_string (value); break; case PROP_IP4_METHOD: diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c index 9819ca700c..ac7b31cc12 100644 --- a/src/nm-auth-subject.c +++ b/src/nm-auth-subject.c @@ -290,9 +290,9 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *p const char *str; gulong id; - /* all properties are construct-only */ switch (prop_id) { case PROP_SUBJECT_TYPE: + /* construct-only */ i = g_value_get_int (value); g_return_if_fail (NM_IN_SET (i, (int) NM_AUTH_SUBJECT_TYPE_INTERNAL, (int) NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS)); subject_type = i; @@ -300,6 +300,7 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *p g_return_if_fail (priv->subject_type == subject_type); break; case PROP_UNIX_PROCESS_DBUS_SENDER: + /* construct-only */ if ((str = g_value_get_string (value))) { priv->subject_type |= NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS; g_return_if_fail (priv->subject_type == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS); @@ -307,6 +308,7 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *p } break; case PROP_UNIX_PROCESS_PID: + /* construct-only */ if ((id = g_value_get_ulong (value)) != G_MAXULONG) { priv->subject_type |= NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS; g_return_if_fail (priv->subject_type == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS); @@ -314,6 +316,7 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *p } break; case PROP_UNIX_PROCESS_UID: + /* construct-only */ if ((id = g_value_get_ulong (value)) != G_MAXULONG) { priv->subject_type |= NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS; g_return_if_fail (priv->subject_type == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS); @@ -407,7 +410,6 @@ nm_auth_subject_class_init (NMAuthSubjectClass *config_class) { GObjectClass *object_class = G_OBJECT_CLASS (config_class); - /* virtual methods */ object_class->get_property = get_property; object_class->set_property = set_property; object_class->constructed = constructed; diff --git a/src/nm-config-data.c b/src/nm-config-data.c index d2fd1ff311..a49a3bad97 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -1437,15 +1437,17 @@ set_property (GObject *object, NMConfigData *self = NM_CONFIG_DATA (object); NMConfigDataPrivate *priv = NM_CONFIG_DATA_GET_PRIVATE (self); - /* This type is immutable. All properties are construct only. */ switch (prop_id) { case PROP_CONFIG_MAIN_FILE: + /* construct-only */ priv->config_main_file = g_value_dup_string (value); break; case PROP_CONFIG_DESCRIPTION: + /* construct-only */ priv->config_description = g_value_dup_string (value); break; case PROP_KEYFILE_USER: + /* construct-only */ priv->keyfile_user = g_value_dup_boxed (value); if ( priv->keyfile_user && !_nm_keyfile_has_values (priv->keyfile_user)) { @@ -1454,6 +1456,7 @@ set_property (GObject *object, } break; case PROP_KEYFILE_INTERN: + /* construct-only */ priv->keyfile_intern = g_value_dup_boxed (value); if ( priv->keyfile_intern && !_nm_keyfile_has_values (priv->keyfile_intern)) { @@ -1462,6 +1465,7 @@ set_property (GObject *object, } break; case PROP_NO_AUTO_DEFAULT: + /* construct-only */ { char **value_arr = g_value_get_boxed (value); guint i, j = 0; |