G_DEFINE_TYPE_WITH_PRIVATE() macro, or use the G_ADD_PRIVATE()
macro with the G_DEFINE_TYPE_WITH_CODE() or the G_DEFINE_TYPE_EXTENDED()
macros. The private structure is then defined in the .c file,
- and can be accessed using the <function>get_private()</function>
+ and can be accessed using the <function>get_instance_private()</function>
function generated by the G_DEFINE_TYPE_* macros.
<programlisting>
struct _MamanBarPrivate
static void
maman_bar_init (MamanBar *self)
{
- /* maman_bar_get_private() is generated by G_DEFINE_TYPE_WITH_PRIVATE()
+ /* maman_bar_get_instance_private() is generated by G_DEFINE_TYPE_WITH_PRIVATE()
* above, and it's local to the current compilation unit.
*/
- MamanBarPrivate *priv = maman_bar_get_private (self);
+ MamanBarPrivate *priv = maman_bar_get_instance_private (self);
priv->hsize = 42;
}
static void
maman_bar_init (MamanBar *self)
{
- self->priv = maman_bar_get_private (self);
+ self->priv = maman_bar_get_instance_private (self);
self->priv->hsize = 42;
}
</para></listitem>
static void
maman_bar_init (MamanBar *self)
{
- self->priv = maman_bar_get_private (self);
+ self->priv = maman_bar_get_instance_private (self);
/* initialize all public and private members to reasonable default values. */
}
static void
maman_bar_init (MamanBar *self);
{
- self->priv = maman_bar_get_private (self);
+ self->priv = maman_bar_get_instance_private (self);
self->priv->an_object = g_object_new (MAMAN_TYPE_BAZ, NULL);
self->priv->a_string = g_strdup ("Maman");
static void
g_app_launch_context_init (GAppLaunchContext *context)
{
- context->priv = g_app_launch_context_get_private (context);
+ context->priv = g_app_launch_context_get_instance_private (context);
}
/**
static void
g_application_init (GApplication *application)
{
- application->priv = g_application_get_private (application);
+ application->priv = g_application_get_instance_private (application);
application->priv->actions = g_application_exported_actions_new (application);
static void
g_application_command_line_init (GApplicationCommandLine *cmdline)
{
- cmdline->priv = g_application_command_line_get_private (cmdline);
+ cmdline->priv = g_application_command_line_get_instance_private (cmdline);
}
static void
static void
g_buffered_input_stream_init (GBufferedInputStream *stream)
{
- stream->priv = g_buffered_input_stream_get_private (stream);
+ stream->priv = g_buffered_input_stream_get_instance_private (stream);
}
static void
g_buffered_output_stream_init (GBufferedOutputStream *stream)
{
- stream->priv = g_buffered_output_stream_get_private (stream);
+ stream->priv = g_buffered_output_stream_get_instance_private (stream);
}
static void
static void
g_cancellable_init (GCancellable *cancellable)
{
- cancellable->priv = g_cancellable_get_private (cancellable);
+ cancellable->priv = g_cancellable_get_instance_private (cancellable);
}
/**
static void
g_converter_input_stream_init (GConverterInputStream *stream)
{
- stream->priv = g_converter_input_stream_get_private (stream);
+ stream->priv = g_converter_input_stream_get_instance_private (stream);
}
/**
static void
g_converter_output_stream_init (GConverterOutputStream *stream)
{
- stream->priv = g_converter_output_stream_get_private (stream);
+ stream->priv = g_converter_output_stream_get_instance_private (stream);
}
/**
static void
g_data_input_stream_init (GDataInputStream *stream)
{
- stream->priv = g_data_input_stream_get_private (stream);
+ stream->priv = g_data_input_stream_get_instance_private (stream);
stream->priv->byte_order = G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN;
stream->priv->newline_type = G_DATA_STREAM_NEWLINE_TYPE_LF;
}
static void
g_data_output_stream_init (GDataOutputStream *stream)
{
- stream->priv = g_data_output_stream_get_private (stream);
+ stream->priv = g_data_output_stream_get_instance_private (stream);
stream->priv->byte_order = G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN;
}
self.c.write('static void\n'
'%s_proxy_init (%sProxy *proxy)\n'
'{\n'
- ' proxy->priv = %s_proxy_get_private (proxy);\n'
+ ' proxy->priv = %s_proxy_get_instance_private (proxy);\n'
' g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), %s_interface_info ());\n'
'}\n'
'\n'
self.c.write('static void\n'
'%s_skeleton_init (%sSkeleton *skeleton)\n'
'{\n'
- ' skeleton->priv = %s_skeleton_get_private (skeleton);\n'
+ ' skeleton->priv = %s_skeleton_get_instance_private (skeleton);\n'
%(i.name_lower, i.camel_name,
i.name_lower))
self.c.write(' g_mutex_init (&skeleton->priv->lock);\n')
static void
_g_dbus_auth_init (GDBusAuth *auth)
{
- auth->priv = _g_dbus_auth_get_private (auth);
+ auth->priv = _g_dbus_auth_get_instance_private (auth);
}
static void
static void
_g_dbus_auth_mechanism_init (GDBusAuthMechanism *mechanism)
{
- mechanism->priv = _g_dbus_auth_mechanism_get_private (mechanism);
+ mechanism->priv = _g_dbus_auth_mechanism_get_instance_private (mechanism);
}
/* ---------------------------------------------------------------------------------------------------- */
static void
_g_dbus_auth_mechanism_anon_init (GDBusAuthMechanismAnon *mechanism)
{
- mechanism->priv = _g_dbus_auth_mechanism_anon_get_private (mechanism);
+ mechanism->priv = _g_dbus_auth_mechanism_anon_get_instance_private (mechanism);
}
/* ---------------------------------------------------------------------------------------------------- */
static void
_g_dbus_auth_mechanism_external_init (GDBusAuthMechanismExternal *mechanism)
{
- mechanism->priv = _g_dbus_auth_mechanism_external_get_private (mechanism);
+ mechanism->priv = _g_dbus_auth_mechanism_external_get_instance_private (mechanism);
}
/* ---------------------------------------------------------------------------------------------------- */
static void
_g_dbus_auth_mechanism_sha1_init (GDBusAuthMechanismSha1 *mechanism)
{
- mechanism->priv = _g_dbus_auth_mechanism_sha1_get_private (mechanism);
+ mechanism->priv = _g_dbus_auth_mechanism_sha1_get_instance_private (mechanism);
}
/* ---------------------------------------------------------------------------------------------------- */
static void
g_dbus_interface_skeleton_init (GDBusInterfaceSkeleton *interface)
{
- interface->priv = g_dbus_interface_skeleton_get_private (interface);
+ interface->priv = g_dbus_interface_skeleton_get_instance_private (interface);
g_mutex_init (&interface->priv->lock);
}
static void
g_dbus_object_manager_client_init (GDBusObjectManagerClient *manager)
{
- manager->priv = g_dbus_object_manager_client_get_private (manager);
+ manager->priv = g_dbus_object_manager_client_get_instance_private (manager);
g_mutex_init (&manager->priv->lock);
manager->priv->map_object_path_to_object_proxy = g_hash_table_new_full (g_str_hash,
g_str_equal,
static void
g_dbus_object_manager_server_init (GDBusObjectManagerServer *manager)
{
- manager->priv = g_dbus_object_manager_server_get_private (manager);
+ manager->priv = g_dbus_object_manager_server_get_instance_private (manager);
g_mutex_init (&manager->priv->lock);
manager->priv->map_object_path_to_data = g_hash_table_new_full (g_str_hash,
g_str_equal,
static void
g_dbus_object_proxy_init (GDBusObjectProxy *proxy)
{
- proxy->priv = g_dbus_object_proxy_get_private (proxy);
+ proxy->priv = g_dbus_object_proxy_get_instance_private (proxy);
g_mutex_init (&proxy->priv->lock);
proxy->priv->map_name_to_iface = g_hash_table_new_full (g_str_hash,
g_str_equal,
static void
g_dbus_object_skeleton_init (GDBusObjectSkeleton *object)
{
- object->priv = g_dbus_object_skeleton_get_private (object);
+ object->priv = g_dbus_object_skeleton_get_instance_private (object);
g_mutex_init (&object->priv->lock);
object->priv->map_name_to_iface = g_hash_table_new_full (g_str_hash,
g_str_equal,
static void
g_dbus_proxy_init (GDBusProxy *proxy)
{
- proxy->priv = g_dbus_proxy_get_private (proxy);
+ proxy->priv = g_dbus_proxy_get_instance_private (proxy);
proxy->priv->signal_subscription_data = g_slice_new0 (SignalSubscriptionData);
proxy->priv->signal_subscription_data->ref_count = 1;
proxy->priv->signal_subscription_data->proxy = proxy;
static void
g_delayed_settings_backend_init (GDelayedSettingsBackend *delayed)
{
- delayed->priv = g_delayed_settings_backend_get_private (delayed);
+ delayed->priv = g_delayed_settings_backend_get_instance_private (delayed);
delayed->priv->delayed = g_settings_backend_create_tree ();
g_mutex_init (&delayed->priv->lock);
}
static void
g_emblemed_icon_init (GEmblemedIcon *emblemed)
{
- emblemed->priv = g_emblemed_icon_get_private (emblemed);
+ emblemed->priv = g_emblemed_icon_get_instance_private (emblemed);
}
/**
static void
g_file_enumerator_init (GFileEnumerator *enumerator)
{
- enumerator->priv = g_file_enumerator_get_private (enumerator);
+ enumerator->priv = g_file_enumerator_get_instance_private (enumerator);
}
/**
static void
g_file_input_stream_init (GFileInputStream *stream)
{
- stream->priv = g_file_input_stream_get_private (stream);
+ stream->priv = g_file_input_stream_get_instance_private (stream);
}
/**
static void
g_file_io_stream_init (GFileIOStream *stream)
{
- stream->priv = g_file_io_stream_get_private (stream);
+ stream->priv = g_file_io_stream_get_instance_private (stream);
}
/**
static void
g_file_monitor_init (GFileMonitor *monitor)
{
- monitor->priv = g_file_monitor_get_private (monitor);
+ monitor->priv = g_file_monitor_get_instance_private (monitor);
monitor->priv->rate_limit_msec = DEFAULT_RATE_LIMIT_MSECS;
monitor->priv->rate_limiter = g_hash_table_new_full (g_file_hash, (GEqualFunc)g_file_equal,
NULL, (GDestroyNotify) rate_limiter_free);
static void
g_file_output_stream_init (GFileOutputStream *stream)
{
- stream->priv = g_file_output_stream_get_private (stream);
+ stream->priv = g_file_output_stream_get_instance_private (stream);
}
/**
GFilterInputStreamPrivate *priv;
filter_stream = G_FILTER_INPUT_STREAM (object);
- priv = g_filter_input_stream_get_private (filter_stream);
+ priv = g_filter_input_stream_get_instance_private (filter_stream);
switch (prop_id)
{
g_return_val_if_fail (G_IS_FILTER_INPUT_STREAM (stream), FALSE);
- priv = g_filter_input_stream_get_private (stream);
+ priv = g_filter_input_stream_get_instance_private (stream);
return priv->close_base;
}
close_base = !!close_base;
- priv = g_filter_input_stream_get_private (stream);
+ priv = g_filter_input_stream_get_instance_private (stream);
if (priv->close_base != close_base)
{
GError **error)
{
GFilterInputStream *filter_stream = G_FILTER_INPUT_STREAM (stream);
- GFilterInputStreamPrivate *priv = g_filter_input_stream_get_private (filter_stream);
+ GFilterInputStreamPrivate *priv = g_filter_input_stream_get_instance_private (filter_stream);
gboolean res = TRUE;
if (priv->close_base)
GFilterOutputStreamPrivate *priv;
filter_stream = G_FILTER_OUTPUT_STREAM (object);
- priv = g_filter_output_stream_get_private (filter_stream);
+ priv = g_filter_output_stream_get_instance_private (filter_stream);
switch (prop_id)
{
g_return_val_if_fail (G_IS_FILTER_OUTPUT_STREAM (stream), FALSE);
- priv = g_filter_output_stream_get_private (stream);
+ priv = g_filter_output_stream_get_instance_private (stream);
return priv->close_base;
}
close_base = !!close_base;
- priv = g_filter_output_stream_get_private (stream);
+ priv = g_filter_output_stream_get_instance_private (stream);
if (priv->close_base != close_base)
{
GError **error)
{
GFilterOutputStream *filter_stream = G_FILTER_OUTPUT_STREAM (stream);
- GFilterOutputStreamPrivate *priv = g_filter_output_stream_get_private (filter_stream);
+ GFilterOutputStreamPrivate *priv = g_filter_output_stream_get_instance_private (filter_stream);
gboolean res = TRUE;
if (priv->close_base)
static void
g_inet_address_init (GInetAddress *address)
{
- address->priv = g_inet_address_get_private (address);
+ address->priv = g_inet_address_get_instance_private (address);
}
/**
static void
g_inet_address_mask_init (GInetAddressMask *mask)
{
- mask->priv = g_inet_address_mask_get_private (mask);
+ mask->priv = g_inet_address_mask_get_instance_private (mask);
}
/**
static void
g_inet_socket_address_init (GInetSocketAddress *address)
{
- address->priv = g_inet_socket_address_get_private (address);
+ address->priv = g_inet_socket_address_get_instance_private (address);
}
/**
static void
g_input_stream_init (GInputStream *stream)
{
- stream->priv = g_input_stream_get_private (stream);
+ stream->priv = g_input_stream_get_instance_private (stream);
}
/**
static void
g_io_stream_init (GIOStream *stream)
{
- stream->priv = g_io_stream_get_private (stream);
+ stream->priv = g_io_stream_get_instance_private (stream);
}
static void
static void
g_local_file_input_stream_init (GLocalFileInputStream *info)
{
- info->priv = g_local_file_input_stream_get_private (info);
+ info->priv = g_local_file_input_stream_get_instance_private (info);
info->priv->do_close = TRUE;
}
static void
g_local_file_output_stream_init (GLocalFileOutputStream *stream)
{
- stream->priv = g_local_file_output_stream_get_private (stream);
+ stream->priv = g_local_file_output_stream_get_instance_private (stream);
stream->priv->do_close = TRUE;
}
static void
g_memory_input_stream_init (GMemoryInputStream *stream)
{
- stream->priv = g_memory_input_stream_get_private (stream);
+ stream->priv = g_memory_input_stream_get_instance_private (stream);
}
/**
static void
g_memory_output_stream_init (GMemoryOutputStream *stream)
{
- stream->priv = g_memory_output_stream_get_private (stream);
+ stream->priv = g_memory_output_stream_get_instance_private (stream);
stream->priv->pos = 0;
stream->priv->valid_len = 0;
}
static void
g_menu_attribute_iter_init (GMenuAttributeIter *iter)
{
- iter->priv = g_menu_attribute_iter_get_private (iter);
+ iter->priv = g_menu_attribute_iter_get_instance_private (iter);
}
static void
static void
g_menu_link_iter_init (GMenuLinkIter *iter)
{
- iter->priv = g_menu_link_iter_get_private (iter);
+ iter->priv = g_menu_link_iter_get_instance_private (iter);
}
static void
static void
g_mount_operation_init (GMountOperation *operation)
{
- operation->priv = g_mount_operation_get_private (operation);
+ operation->priv = g_mount_operation_get_instance_private (operation);
}
/**
static void
g_network_address_init (GNetworkAddress *addr)
{
- addr->priv = g_network_address_get_private (addr);
+ addr->priv = g_network_address_get_instance_private (addr);
}
static void
static void
g_network_monitor_base_init (GNetworkMonitorBase *monitor)
{
- monitor->priv = g_network_monitor_base_get_private (monitor);
+ monitor->priv = g_network_monitor_base_get_instance_private (monitor);
monitor->priv->networks = g_ptr_array_new_with_free_func (g_object_unref);
monitor->priv->context = g_main_context_get_thread_default ();
if (monitor->priv->context)
static void
g_network_monitor_netlink_init (GNetworkMonitorNetlink *nl)
{
- nl->priv = g_network_monitor_netlink_get_private (nl);
+ nl->priv = g_network_monitor_netlink_get_instance_private (nl);
}
static void
g_network_service_init (GNetworkService *srv)
{
- srv->priv = g_network_service_get_private (srv);
+ srv->priv = g_network_service_get_instance_private (srv);
}
static void
static void
g_output_stream_init (GOutputStream *stream)
{
- stream->priv = g_output_stream_get_private (stream);
+ stream->priv = g_output_stream_get_instance_private (stream);
}
/**
static void
g_permission_init (GPermission *permission)
{
- permission->priv = g_permission_get_private (permission);
+ permission->priv = g_permission_get_instance_private (permission);
}
static gboolean
static void
g_proxy_address_init (GProxyAddress *proxy)
{
- proxy->priv = g_proxy_address_get_private (proxy);
+ proxy->priv = g_proxy_address_get_instance_private (proxy);
proxy->priv->protocol = NULL;
proxy->priv->username = NULL;
proxy->priv->password = NULL;
static void
g_proxy_address_enumerator_init (GProxyAddressEnumerator *self)
{
- self->priv = g_proxy_address_enumerator_get_private (self);
+ self->priv = g_proxy_address_enumerator_get_instance_private (self);
}
static void
struct stat st;
#endif
- resolver->priv = g_resolver_get_private (resolver);
+ resolver->priv = g_resolver_get_instance_private (resolver);
#ifdef G_OS_UNIX
if (stat (_PATH_RESCONF, &st) == 0)
static void
g_settings_init (GSettings *settings)
{
- settings->priv = g_settings_get_private (settings);
+ settings->priv = g_settings_get_instance_private (settings);
settings->priv->main_context = g_main_context_ref_thread_default ();
}
static void
g_settings_backend_init (GSettingsBackend *backend)
{
- backend->priv = g_settings_backend_get_private (backend);
+ backend->priv = g_settings_backend_get_instance_private (backend);
g_mutex_init (&backend->priv->lock);
}
static void
g_simple_action_group_init (GSimpleActionGroup *simple)
{
- simple->priv = g_simple_action_group_get_private (simple);
+ simple->priv = g_simple_action_group_get_instance_private (simple);
simple->priv->table = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_object_unref);
}
static void
g_simple_proxy_resolver_init (GSimpleProxyResolver *resolver)
{
- resolver->priv = g_simple_proxy_resolver_get_private (resolver);
+ resolver->priv = g_simple_proxy_resolver_get_instance_private (resolver);
resolver->priv->uri_proxies = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_free);
}
static void
g_socket_init (GSocket *socket)
{
- socket->priv = g_socket_get_private (socket);
+ socket->priv = g_socket_get_instance_private (socket);
socket->priv->fd = -1;
socket->priv->blocking = TRUE;
static void
g_socket_client_init (GSocketClient *client)
{
- client->priv = g_socket_client_get_private (client);
+ client->priv = g_socket_client_get_instance_private (client);
client->priv->type = G_SOCKET_TYPE_STREAM;
client->priv->app_proxies = g_hash_table_new_full (g_str_hash,
g_str_equal,
static void
g_socket_connection_init (GSocketConnection *connection)
{
- connection->priv = g_socket_connection_get_private (connection);
+ connection->priv = g_socket_connection_get_instance_private (connection);
}
static gboolean
static void
g_socket_input_stream_init (GSocketInputStream *stream)
{
- stream->priv = g_socket_input_stream_get_private (stream);
+ stream->priv = g_socket_input_stream_get_instance_private (stream);
}
GSocketInputStream *
static void
g_socket_listener_init (GSocketListener *listener)
{
- listener->priv = g_socket_listener_get_private (listener);
+ listener->priv = g_socket_listener_get_instance_private (listener);
listener->priv->sockets =
g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
listener->priv->listen_backlog = 10;
static void
g_socket_output_stream_init (GSocketOutputStream *stream)
{
- stream->priv = g_socket_output_stream_get_private (stream);
+ stream->priv = g_socket_output_stream_get_instance_private (stream);
}
GSocketOutputStream *
static void
g_socket_service_init (GSocketService *service)
{
- service->priv = g_socket_service_get_private (service);
+ service->priv = g_socket_service_get_instance_private (service);
service->priv->cancellable = g_cancellable_new ();
service->priv->active = TRUE;
}
static void
g_tcp_connection_init (GTcpConnection *connection)
{
- connection->priv = g_tcp_connection_get_private (connection);
+ connection->priv = g_tcp_connection_get_instance_private (connection);
connection->priv->graceful_disconnect = FALSE;
}
static void
g_tcp_wrapper_connection_init (GTcpWrapperConnection *connection)
{
- connection->priv = g_tcp_wrapper_connection_get_private (connection);
+ connection->priv = g_tcp_wrapper_connection_get_instance_private (connection);
}
/**
static void
g_test_dbus_init (GTestDBus *self)
{
- self->priv = g_test_dbus_get_private (self);
+ self->priv = g_test_dbus_get_instance_private (self);
self->priv->service_dirs = g_ptr_array_new_with_free_func (g_free);
}
static void
g_threaded_socket_service_init (GThreadedSocketService *service)
{
- service->priv = g_threaded_socket_service_get_private (service);
+ service->priv = g_threaded_socket_service_get_instance_private (service);
service->priv->max_threads = 10;
}
static void
g_tls_interaction_init (GTlsInteraction *interaction)
{
- interaction->priv = g_tls_interaction_get_private (interaction);
+ interaction->priv = g_tls_interaction_get_instance_private (interaction);
interaction->priv->context = g_main_context_ref_thread_default ();
}
static void
g_tls_password_init (GTlsPassword *password)
{
- password->priv = g_tls_password_get_private (password);
+ password->priv = g_tls_password_get_instance_private (password);
}
static const guchar *
static void
g_unix_credentials_message_init (GUnixCredentialsMessage *message)
{
- message->priv = g_unix_credentials_message_get_private (message);
+ message->priv = g_unix_credentials_message_get_instance_private (message);
}
static void
static void
g_unix_fd_list_init (GUnixFDList *list)
{
- list->priv = g_unix_fd_list_get_private (list);
+ list->priv = g_unix_fd_list_get_instance_private (list);
}
static void
static void
g_unix_fd_message_init (GUnixFDMessage *message)
{
- message->priv = g_unix_fd_message_get_private (message);
+ message->priv = g_unix_fd_message_get_instance_private (message);
}
static void
static void
g_unix_input_stream_init (GUnixInputStream *unix_stream)
{
- unix_stream->priv = g_unix_input_stream_get_private (unix_stream);
+ unix_stream->priv = g_unix_input_stream_get_instance_private (unix_stream);
unix_stream->priv->fd = -1;
unix_stream->priv->close_fd = TRUE;
}
static void
g_unix_output_stream_init (GUnixOutputStream *unix_stream)
{
- unix_stream->priv = g_unix_output_stream_get_private (unix_stream);
+ unix_stream->priv = g_unix_output_stream_get_instance_private (unix_stream);
unix_stream->priv->fd = -1;
unix_stream->priv->close_fd = TRUE;
}
static void
g_unix_socket_address_init (GUnixSocketAddress *address)
{
- address->priv = g_unix_socket_address_get_private (address);
+ address->priv = g_unix_socket_address_get_instance_private (address);
memset (address->priv->path, 0, sizeof (address->priv->path));
address->priv->path_len = -1;
static void
g_win32_input_stream_init (GWin32InputStream *win32_stream)
{
- win32_stream->priv = g_win32_input_stream_get_private (win32_stream);
+ win32_stream->priv = g_win32_input_stream_get_instance_private (win32_stream);
win32_stream->priv->handle = NULL;
win32_stream->priv->close_handle = TRUE;
}
static void
g_win32_output_stream_init (GWin32OutputStream *win32_stream)
{
- win32_stream->priv = g_win32_output_stream_get_private (win32_stream);
+ win32_stream->priv = g_win32_output_stream_get_instance_private (win32_stream);
win32_stream->priv->handle = NULL;
win32_stream->priv->close_handle = TRUE;
}
* gint
* my_object_get_foo (MyObject *obj)
* {
- * MyObjectPrivate *priv = my_object_get_private (obj);
+ * MyObjectPrivate *priv = my_object_get_instance_private (obj);
*
* return priv->foo;
* }
* my_object_set_bar (MyObject *obj,
* gint bar)
* {
- * MyObjectPrivate *priv = my_object_get_private (obj);
+ * MyObjectPrivate *priv = my_object_get_instance_private (obj);
*
* if (priv->bar != bar)
* priv->bar = bar;
} \
\
static inline gpointer \
-type_name##_get_private (TypeName *self) \
+type_name##_get_instance_private (TypeName *self) \
{ \
return (G_STRUCT_MEMBER_P (self, TypeName##_private_offset)); \
} \
static void
test_object_init (TestObject *self)
{
- TestObjectPrivate *priv = test_object_get_private (self);
+ TestObjectPrivate *priv = test_object_get_instance_private (self);
if (g_test_verbose ())
g_print ("Offset of %sPrivate for type '%s': %d\n",
static int
test_object_get_dummy_0 (TestObject *self)
{
- TestObjectPrivate *priv = test_object_get_private (self);
+ TestObjectPrivate *priv = test_object_get_instance_private (self);
return priv->dummy_0;
}
static float
test_object_get_dummy_1 (TestObject *self)
{
- TestObjectPrivate *priv = test_object_get_private (self);
+ TestObjectPrivate *priv = test_object_get_instance_private (self);
return priv->dummy_1;
}
static void
test_derived_finalize (GObject *obj)
{
- TestDerivedPrivate *priv = test_derived_get_private ((TestDerived *) obj);
+ TestDerivedPrivate *priv = test_derived_get_instance_private ((TestDerived *) obj);
g_free (priv->dummy_2);
static void
test_derived_init (TestDerived *self)
{
- TestDerivedPrivate *priv = test_derived_get_private (self);
+ TestDerivedPrivate *priv = test_derived_get_instance_private (self);
if (g_test_verbose ())
g_print ("Offset of %sPrivate for type '%s': %d\n",
static const char *
test_derived_get_dummy_2 (TestDerived *self)
{
- TestDerivedPrivate *priv = test_derived_get_private (self);
+ TestDerivedPrivate *priv = test_derived_get_instance_private (self);
return priv->dummy_2;
}
static void
test_mixed_derived_init (TestMixedDerived *self)
{
- TestMixedDerivedPrivate *priv = test_mixed_derived_get_private (self);
+ TestMixedDerivedPrivate *priv = test_mixed_derived_get_instance_private (self);
if (g_test_verbose ())
g_print ("Offset of %sPrivate for type '%s': %d\n",
static gint64
test_mixed_derived_get_dummy_4 (TestMixedDerived *self)
{
- TestMixedDerivedPrivate *priv = test_mixed_derived_get_private (self);
+ TestMixedDerivedPrivate *priv = test_mixed_derived_get_instance_private (self);
return priv->dummy_4;
}