mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
util: convert virIdentity class to use GObject
Converting from virObject to GObject is reasonably straightforward,
as illustrated by this patch for virIdentity
In the header file
- Remove
typedef struct _virIdentity virIdentity
- Add
#define VIR_TYPE_IDENTITY virIdentity_get_type ()
G_DECLARE_FINAL_TYPE (virIdentity, vir_identity, VIR, IDENTITY, GObject);
Which provides the typedef we just removed, and class
declaration boilerplate and various other constants/macros.
In the source file
- Change 'virObject parent' to 'GObject parent' in the struct
- Remove the virClass variable and its initializing call
- Add
G_DEFINE_TYPE(virIdentity, vir_identity, G_TYPE_OBJECT)
which declares the instance & class constructor functions
- Add an impl of the instance & class constructors
wiring up the finalize method to point to our dispose impl
In all files
- Replace VIR_AUTOUNREF(virIdentityPtr) with g_autoptr(virIdentity)
- Replace virObjectRef/Unref with g_object_ref/unref. Note
the latter functions do *NOT* accept a NULL object where as
libvirt's do. If you replace g_object_unref with g_clear_object
it is NULL safe, but also clears the pointer.
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
@@ -38,13 +38,10 @@ VIR_LOG_INIT("tests.identitytest");
|
||||
|
||||
static int testIdentityAttrs(const void *data ATTRIBUTE_UNUSED)
|
||||
{
|
||||
g_autoptr(virIdentity) ident = NULL;
|
||||
g_autoptr(virIdentity) ident = virIdentityNew();
|
||||
const char *val;
|
||||
int rc;
|
||||
|
||||
if (!(ident = virIdentityNew()))
|
||||
return -1;
|
||||
|
||||
if (virIdentitySetUserName(ident, "fred") < 0)
|
||||
return -1;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user