diff options
author | Dan Winship <danw@gnome.org> | 2014-06-26 13:44:36 -0400 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2014-08-01 14:34:06 -0400 |
commit | 3ac0f528780895c474a437bd75ab7e4baeaa83aa (patch) | |
tree | 29593182408053cc42b9f76f0245ff8a1b46634d /libnm/nm-dhcp6-config.h | |
parent | b4ae6eaec9cec10d68bdcce7151b07451e4de6a3 (diff) | |
download | NetworkManager-3ac0f528780895c474a437bd75ab7e4baeaa83aa.tar.gz |
libnm, core, cli, tui: fix the capitalization of various types
GLib/Gtk have mostly settled on the convention that two-letter
acronyms in type names remain all-caps (eg, "IO"), but longer acronyms
become initial-caps-only (eg, "Tcp").
NM was inconsistent, with most long acronyms using initial caps only
(Adsl, Cdma, Dcb, Gsm, Olpc, Vlan), but others using all caps (DHCP,
PPP, PPPOE, VPN). Fix libnm and src/ to use initial-caps only for all
three-or-more-letter-long acronyms (and update nmcli and nmtui for the
libnm changes).
Diffstat (limited to 'libnm/nm-dhcp6-config.h')
-rw-r--r-- | libnm/nm-dhcp6-config.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libnm/nm-dhcp6-config.h b/libnm/nm-dhcp6-config.h index 939b3fdbe4..2f21eed2d9 100644 --- a/libnm/nm-dhcp6-config.h +++ b/libnm/nm-dhcp6-config.h @@ -30,14 +30,14 @@ G_BEGIN_DECLS #define NM_TYPE_DHCP6_CONFIG (nm_dhcp6_config_get_type ()) -#define NM_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP6_CONFIG, NMDHCP6Config)) -#define NM_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP6_CONFIG, NMDHCP6ConfigClass)) +#define NM_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP6_CONFIG, NMDhcp6Config)) +#define NM_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP6_CONFIG, NMDhcp6ConfigClass)) #define NM_IS_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP6_CONFIG)) #define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP6_CONFIG)) typedef struct { NMObject parent; -} NMDHCP6Config; +} NMDhcp6Config; typedef struct { NMObjectClass parent; @@ -49,7 +49,7 @@ typedef struct { void (*_reserved4) (void); void (*_reserved5) (void); void (*_reserved6) (void); -} NMDHCP6ConfigClass; +} NMDhcp6ConfigClass; #define NM_DHCP6_CONFIG_OPTIONS "options" @@ -57,9 +57,9 @@ GType nm_dhcp6_config_get_type (void); GObject *nm_dhcp6_config_new (DBusGConnection *connection, const char *object_path); -GHashTable * nm_dhcp6_config_get_options (NMDHCP6Config *config); +GHashTable * nm_dhcp6_config_get_options (NMDhcp6Config *config); -const char * nm_dhcp6_config_get_one_option (NMDHCP6Config *config, const char *option); +const char * nm_dhcp6_config_get_one_option (NMDhcp6Config *config, const char *option); G_END_DECLS |