mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-03 14:50:30 +01:00
device: rename internal device factories
Instead of NMBondFactory, call it NMBondDeviceFactory.
This commit is contained in:
Thomas Haller
parent
18660604aa
commit
92b7cb2161
11 changed files with 27 additions and 27 deletions
|
|
@ -523,8 +523,8 @@ nm_device_bond_class_init (NMDeviceBondClass *klass)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define NM_TYPE_BOND_FACTORY (nm_bond_factory_get_type ())
|
||||
#define NM_BOND_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BOND_FACTORY, NMBondFactory))
|
||||
#define NM_TYPE_BOND_DEVICE_FACTORY (nm_bond_device_factory_get_type ())
|
||||
#define NM_BOND_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BOND_DEVICE_FACTORY, NMBondDeviceFactory))
|
||||
|
||||
static NMDevice *
|
||||
create_device (NMDeviceFactory *factory,
|
||||
|
|
|
|||
|
|
@ -451,8 +451,8 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *klass)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define NM_TYPE_BRIDGE_FACTORY (nm_bridge_factory_get_type ())
|
||||
#define NM_BRIDGE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BRIDGE_FACTORY, NMBridgeFactory))
|
||||
#define NM_TYPE_BRIDGE_DEVICE_FACTORY (nm_bridge_device_factory_get_type ())
|
||||
#define NM_BRIDGE_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BRIDGE_DEVICE_FACTORY, NMBridgeDeviceFactory))
|
||||
|
||||
static NMDevice *
|
||||
create_device (NMDeviceFactory *factory,
|
||||
|
|
|
|||
|
|
@ -1677,8 +1677,8 @@ nm_device_ethernet_class_init (NMDeviceEthernetClass *klass)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define NM_TYPE_ETHERNET_FACTORY (nm_ethernet_factory_get_type ())
|
||||
#define NM_ETHERNET_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ETHERNET_FACTORY, NMEthernetFactory))
|
||||
#define NM_TYPE_ETHERNET_DEVICE_FACTORY (nm_ethernet_device_factory_get_type ())
|
||||
#define NM_ETHERNET_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ETHERNET_DEVICE_FACTORY, NMEthernetDeviceFactory))
|
||||
|
||||
static NMDevice *
|
||||
create_device (NMDeviceFactory *factory,
|
||||
|
|
|
|||
|
|
@ -228,14 +228,14 @@ extern const char *_nm_device_factory_no_default_settings[];
|
|||
#define NM_DEVICE_FACTORY_DEFINE_INTERNAL(upper, mixed, lower, st_code, dfi_code) \
|
||||
typedef struct { \
|
||||
NMDeviceFactory parent; \
|
||||
} NM##mixed##Factory; \
|
||||
} NM##mixed##DeviceFactory; \
|
||||
typedef struct { \
|
||||
NMDeviceFactoryClass parent; \
|
||||
} NM##mixed##FactoryClass; \
|
||||
} NM##mixed##DeviceFactoryClass; \
|
||||
\
|
||||
static GType nm_##lower##_factory_get_type (void); \
|
||||
static GType nm_##lower##_device_factory_get_type (void); \
|
||||
\
|
||||
G_DEFINE_TYPE_WITH_CODE (NM##mixed##Factory, nm_##lower##_factory, NM_TYPE_DEVICE_FACTORY, \
|
||||
G_DEFINE_TYPE_WITH_CODE (NM##mixed##DeviceFactory, nm_##lower##_device_factory, NM_TYPE_DEVICE_FACTORY, \
|
||||
_nm_device_factory_internal_register_type (g_define_type_id);) \
|
||||
\
|
||||
/* Use a module constructor to register the factory's GType at load \
|
||||
|
|
@ -246,18 +246,18 @@ extern const char *_nm_device_factory_no_default_settings[];
|
|||
register_device_factory_internal_##lower (void) \
|
||||
{ \
|
||||
nm_g_type_init (); \
|
||||
g_type_ensure (NM_TYPE_##upper##_FACTORY); \
|
||||
g_type_ensure (NM_TYPE_##upper##_DEVICE_FACTORY); \
|
||||
} \
|
||||
\
|
||||
NM_DEVICE_FACTORY_DECLARE_TYPES(st_code) \
|
||||
\
|
||||
static void \
|
||||
nm_##lower##_factory_init (NM##mixed##Factory *self) \
|
||||
nm_##lower##_device_factory_init (NM##mixed##DeviceFactory *self) \
|
||||
{ \
|
||||
} \
|
||||
\
|
||||
static void \
|
||||
nm_##lower##_factory_class_init (NM##mixed##FactoryClass *klass) \
|
||||
nm_##lower##_device_factory_class_init (NM##mixed##DeviceFactoryClass *klass) \
|
||||
{ \
|
||||
NMDeviceFactoryClass *factory_class = NM_DEVICE_FACTORY_CLASS (klass); \
|
||||
\
|
||||
|
|
|
|||
|
|
@ -402,8 +402,8 @@ nm_device_infiniband_class_init (NMDeviceInfinibandClass *klass)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define NM_TYPE_INFINIBAND_FACTORY (nm_infiniband_factory_get_type ())
|
||||
#define NM_INFINIBAND_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_INFINIBAND_FACTORY, NMInfinibandFactory))
|
||||
#define NM_TYPE_INFINIBAND_DEVICE_FACTORY (nm_infiniband_device_factory_get_type ())
|
||||
#define NM_INFINIBAND_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_INFINIBAND_DEVICE_FACTORY, NMInfinibandDeviceFactory))
|
||||
|
||||
static NMDevice *
|
||||
create_device (NMDeviceFactory *factory,
|
||||
|
|
|
|||
|
|
@ -981,8 +981,8 @@ nm_device_ip_tunnel_class_init (NMDeviceIPTunnelClass *klass)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define NM_TYPE_IP_TUNNEL_FACTORY (nm_ip_tunnel_factory_get_type ())
|
||||
#define NM_IP_TUNNEL_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IP_TUNNEL_FACTORY, NMIPTunnelFactory))
|
||||
#define NM_TYPE_IP_TUNNEL_DEVICE_FACTORY (nm_ip_tunnel_device_factory_get_type ())
|
||||
#define NM_IP_TUNNEL_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IP_TUNNEL_DEVICE_FACTORY, NMIPTunnelDeviceFactory))
|
||||
|
||||
static NMDevice *
|
||||
create_device (NMDeviceFactory *factory,
|
||||
|
|
|
|||
|
|
@ -658,8 +658,8 @@ nm_device_macvlan_class_init (NMDeviceMacvlanClass *klass)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define NM_TYPE_MACVLAN_FACTORY (nm_macvlan_factory_get_type ())
|
||||
#define NM_MACVLAN_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MACVLAN_FACTORY, NMMacvlanFactory))
|
||||
#define NM_TYPE_MACVLAN_DEVICE_FACTORY (nm_macvlan_device_factory_get_type ())
|
||||
#define NM_MACVLAN_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MACVLAN_DEVICE_FACTORY, NMMacvlanDeviceFactory))
|
||||
|
||||
static NMDevice *
|
||||
create_device (NMDeviceFactory *factory,
|
||||
|
|
|
|||
|
|
@ -485,8 +485,8 @@ nm_device_tun_class_init (NMDeviceTunClass *klass)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define NM_TYPE_TUN_FACTORY (nm_tun_factory_get_type ())
|
||||
#define NM_TUN_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_TUN_FACTORY, NMTunFactory))
|
||||
#define NM_TYPE_TUN_DEVICE_FACTORY (nm_tun_device_factory_get_type ())
|
||||
#define NM_TUN_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_TUN_DEVICE_FACTORY, NMTunDeviceFactory))
|
||||
|
||||
static NMDevice *
|
||||
create_device (NMDeviceFactory *factory,
|
||||
|
|
|
|||
|
|
@ -182,8 +182,8 @@ nm_device_veth_class_init (NMDeviceVethClass *klass)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define NM_TYPE_VETH_FACTORY (nm_veth_factory_get_type ())
|
||||
#define NM_VETH_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VETH_FACTORY, NMVethFactory))
|
||||
#define NM_TYPE_VETH_DEVICE_FACTORY (nm_veth_device_factory_get_type ())
|
||||
#define NM_VETH_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VETH_DEVICE_FACTORY, NMVethDeviceFactory))
|
||||
|
||||
static NMDevice *
|
||||
create_device (NMDeviceFactory *factory,
|
||||
|
|
|
|||
|
|
@ -688,8 +688,8 @@ nm_device_vlan_class_init (NMDeviceVlanClass *klass)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define NM_TYPE_VLAN_FACTORY (nm_vlan_factory_get_type ())
|
||||
#define NM_VLAN_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VLAN_FACTORY, NMVlanFactory))
|
||||
#define NM_TYPE_VLAN_DEVICE_FACTORY (nm_vlan_device_factory_get_type ())
|
||||
#define NM_VLAN_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VLAN_DEVICE_FACTORY, NMVlanDeviceFactory))
|
||||
|
||||
static NMDevice *
|
||||
create_device (NMDeviceFactory *factory,
|
||||
|
|
|
|||
|
|
@ -763,8 +763,8 @@ nm_device_vxlan_class_init (NMDeviceVxlanClass *klass)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define NM_TYPE_VXLAN_FACTORY (nm_vxlan_factory_get_type ())
|
||||
#define NM_VXLAN_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VXLAN_FACTORY, NMVxlanFactory))
|
||||
#define NM_TYPE_VXLAN_DEVICE_FACTORY (nm_vxlan_device_factory_get_type ())
|
||||
#define NM_VXLAN_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VXLAN_DEVICE_FACTORY, NMVxlanDeviceFactory))
|
||||
|
||||
static NMDevice *
|
||||
create_device (NMDeviceFactory *factory,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue