Commit d506d804 authored by Pierre Wieser's avatar Pierre Wieser

Public API: rename GType macros according to GObject usages

parent 66b5d888
2012-01-13 Pierre Wieser <pwieser@trychlos.org>
* src/api/na-boxed.h:
* src/core/na-boxed.c:
NA_BOXED_TYPE GType macro renamed as NA_TYPE_BOXED.
* src/api/na-data-boxed.h:
* src/core/na-data-boxed.c:
NA_DATA_BOXED_TYPE GType macro renamed as NA_TYPE_DATA_BOXED.
* src/api/na-icontext.h:
NA_ICONTEXT_TYPE GType macro renamed as NA_TYPE_ICONTEXT.
* src/api/na-iduplicable.h:
NA_IDUPLICABLE_TYPE GType macro renamed as NA_TYPE_IDUPLICABLE.
* src/api/na-iexporter.h:
* src/core/na-exporter.c:
NA_IEXPORTER_TYPE GType macro renamed as NA_TYPE_IEXPORTER.
* src/api/na-ifactory-object.h:
NA_IFACTORY_OBJECT_TYPE GType macro renamed as NA_TYPE_IFACTORY_OBJECT.
* src/api/na-ifactory-provider.h:
NA_IFACTORY_PROVIDER_TYPE GType macro renamed as NA_TYPE_IFACTORY_PROVIDER.
* src/api/na-iimporter.h:
* src/core/na-importer.c:
NA_IIMPORTER_TYPE GType macro renamed as NA_TYPE_IIMPORTER.
* src/api/na-iio-provider.h:
* src/core/na-iio-provider.c:
* src/core/na-io-provider.c:
NA_IIO_PROVIDER_TYPE GType macro renamed as NA_TYPE_IIO_PROVIDER.
* src/api/na-object-action.h:
* src/core/na-object-action.c:
NA_OBJECT_ACTION_TYPE GType macro renamed as NA_TYPE_OBJECT_ACTION.
* src/api/na-object-id.h:
* src/core/na-object-id.c:
NA_OBJECT_ID_TYPE GType macro renamed as NA_TYPE_OBJECT_ID.
* src/api/na-object-item.h:
* src/core/na-object-item.c:
NA_OBJECT_ITEM_TYPE GType macro renamed as NA_TYPE_OBJECT_ITEM.
* src/api/na-object-menu.h:
* src/core/na-object-menu.c:
NA_OBJECT_MENU_TYPE GType macro renamed as NA_TYPE_OBJECT_MENU.
* src/api/na-object-profile.h:
* src/core/na-object-profile.c:
NA_OBJECT_PROFILE_TYPE GType macro renamed as NA_TYPE_OBJECT_PROFILE.
* src/api/na-object.h:
* src/core/na-object.c:
NA_OBJECT_TYPE GType macro renamed as NA_TYPE_OBJECT.
* src/core/na-pivot.c:
* src/api/na-extension.h:
* src/io-desktop/nadp-desktop-provider.c:
* src/io-gconf/nagp-gconf-provider.c:
* src/io-xml/naxml-provider.c:
* src/nact/nact-tree-model.c:
* src/test/test-module-plugin.c: Updated accordingly.
Get ride of GQuark as internal identifier of export format.
* src/api/na-iexporter.h:
......
......@@ -47,12 +47,12 @@
G_BEGIN_DECLS
#define NA_BOXED_TYPE ( na_boxed_get_type())
#define NA_BOXED( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_BOXED_TYPE, NABoxed ))
#define NA_BOXED_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_BOXED_TYPE, NABoxedClass ))
#define NA_IS_BOXED( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_BOXED_TYPE ))
#define NA_IS_BOXED_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_BOXED_TYPE ))
#define NA_BOXED_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_BOXED_TYPE, NABoxedClass ))
#define NA_TYPE_BOXED ( na_boxed_get_type())
#define NA_BOXED( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_BOXED, NABoxed ))
#define NA_BOXED_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_BOXED, NABoxedClass ))
#define NA_IS_BOXED( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_BOXED ))
#define NA_IS_BOXED_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_BOXED ))
#define NA_BOXED_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_BOXED, NABoxedClass ))
typedef struct _NABoxedPrivate NABoxedPrivate;
......
......@@ -57,12 +57,12 @@
G_BEGIN_DECLS
#define NA_DATA_BOXED_TYPE ( na_data_boxed_get_type())
#define NA_DATA_BOXED( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_DATA_BOXED_TYPE, NADataBoxed ))
#define NA_DATA_BOXED_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_DATA_BOXED_TYPE, NADataBoxedClass ))
#define NA_IS_DATA_BOXED( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_DATA_BOXED_TYPE ))
#define NA_IS_DATA_BOXED_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_DATA_BOXED_TYPE ))
#define NA_DATA_BOXED_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_DATA_BOXED_TYPE, NADataBoxedClass ))
#define NA_TYPE_DATA_BOXED ( na_data_boxed_get_type())
#define NA_DATA_BOXED( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_DATA_BOXED, NADataBoxed ))
#define NA_DATA_BOXED_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_DATA_BOXED, NADataBoxedClass ))
#define NA_IS_DATA_BOXED( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_DATA_BOXED ))
#define NA_IS_DATA_BOXED_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_DATA_BOXED ))
#define NA_DATA_BOXED_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_DATA_BOXED, NADataBoxedClass ))
typedef struct _NADataBoxedPrivate NADataBoxedPrivate;
......
......@@ -191,7 +191,7 @@ G_BEGIN_DECLS
*
* st_module_type = g_type_module_register_type( plugin, G_TYPE_OBJECT, "NadpDesktopProvider", &amp;info, 0 );
*
* g_type_module_add_interface( plugin, st_module_type, NA_IIO_PROVIDER_TYPE, &amp;iio_provider_iface_info );
* g_type_module_add_interface( plugin, st_module_type, NA_TYPE_IIO_PROVIDER, &amp;iio_provider_iface_info );
*
* return( TRUE );
* }
......
......@@ -50,10 +50,10 @@
G_BEGIN_DECLS
#define NA_ICONTEXT_TYPE ( na_icontext_get_type())
#define NA_ICONTEXT( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_ICONTEXT_TYPE, NAIContext ))
#define NA_IS_ICONTEXT( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_ICONTEXT_TYPE ))
#define NA_ICONTEXT_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_ICONTEXT_TYPE, NAIContextInterface ))
#define NA_TYPE_ICONTEXT ( na_icontext_get_type())
#define NA_ICONTEXT( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_TYPE_ICONTEXT, NAIContext ))
#define NA_IS_ICONTEXT( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_TYPE_ICONTEXT ))
#define NA_ICONTEXT_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_TYPE_ICONTEXT, NAIContextInterface ))
typedef struct _NAIContext NAIContext;
typedef struct _NAIContextInterfacePrivate NAIContextInterfacePrivate;
......
......@@ -106,10 +106,10 @@
G_BEGIN_DECLS
#define NA_IDUPLICABLE_TYPE ( na_iduplicable_get_type())
#define NA_IDUPLICABLE( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_IDUPLICABLE_TYPE, NAIDuplicable ))
#define NA_IS_IDUPLICABLE( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_IDUPLICABLE_TYPE ))
#define NA_IDUPLICABLE_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IDUPLICABLE_TYPE, NAIDuplicableInterface ))
#define NA_TYPE_IDUPLICABLE ( na_iduplicable_get_type())
#define NA_IDUPLICABLE( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_TYPE_IDUPLICABLE, NAIDuplicable ))
#define NA_IS_IDUPLICABLE( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_TYPE_IDUPLICABLE ))
#define NA_IDUPLICABLE_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_TYPE_IDUPLICABLE, NAIDuplicableInterface ))
typedef struct _NAIDuplicable NAIDuplicable;
typedef struct _NAIDuplicableInterfacePrivate NAIDuplicableInterfacePrivate;
......
......@@ -80,10 +80,10 @@
G_BEGIN_DECLS
#define NA_IEXPORTER_TYPE ( na_iexporter_get_type())
#define NA_IEXPORTER( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_IEXPORTER_TYPE, NAIExporter ))
#define NA_IS_IEXPORTER( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_IEXPORTER_TYPE ))
#define NA_IEXPORTER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IEXPORTER_TYPE, NAIExporterInterface ))
#define NA_TYPE_IEXPORTER ( na_iexporter_get_type())
#define NA_IEXPORTER( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_TYPE_IEXPORTER, NAIExporter ))
#define NA_IS_IEXPORTER( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_TYPE_IEXPORTER ))
#define NA_IEXPORTER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_TYPE_IEXPORTER, NAIExporterInterface ))
typedef struct _NAIExporter NAIExporter;
typedef struct _NAIExporterInterfacePrivate NAIExporterInterfacePrivate;
......
......@@ -83,10 +83,10 @@
G_BEGIN_DECLS
#define NA_IFACTORY_OBJECT_TYPE ( na_ifactory_object_get_type())
#define NA_IFACTORY_OBJECT( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_IFACTORY_OBJECT_TYPE, NAIFactoryObject ))
#define NA_IS_IFACTORY_OBJECT( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_IFACTORY_OBJECT_TYPE ))
#define NA_IFACTORY_OBJECT_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IFACTORY_OBJECT_TYPE, NAIFactoryObjectInterface ))
#define NA_TYPE_IFACTORY_OBJECT ( na_ifactory_object_get_type())
#define NA_IFACTORY_OBJECT( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_TYPE_IFACTORY_OBJECT, NAIFactoryObject ))
#define NA_IS_IFACTORY_OBJECT( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_TYPE_IFACTORY_OBJECT ))
#define NA_IFACTORY_OBJECT_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_TYPE_IFACTORY_OBJECT, NAIFactoryObjectInterface ))
typedef struct _NAIFactoryObject NAIFactoryObject;
typedef struct _NAIFactoryObjectInterfacePrivate NAIFactoryObjectInterfacePrivate;
......
......@@ -141,10 +141,10 @@
G_BEGIN_DECLS
#define NA_IFACTORY_PROVIDER_TYPE ( na_ifactory_provider_get_type())
#define NA_IFACTORY_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_IFACTORY_PROVIDER_TYPE, NAIFactoryProvider ))
#define NA_IS_IFACTORY_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_IFACTORY_PROVIDER_TYPE ))
#define NA_IFACTORY_PROVIDER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IFACTORY_PROVIDER_TYPE, NAIFactoryProviderInterface ))
#define NA_TYPE_IFACTORY_PROVIDER ( na_ifactory_provider_get_type())
#define NA_IFACTORY_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_TYPE_IFACTORY_PROVIDER, NAIFactoryProvider ))
#define NA_IS_IFACTORY_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_TYPE_IFACTORY_PROVIDER ))
#define NA_IFACTORY_PROVIDER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_TYPE_IFACTORY_PROVIDER, NAIFactoryProviderInterface ))
typedef struct _NAIFactoryProviderInterfacePrivate NAIFactoryProviderInterfacePrivate;
......
......@@ -93,10 +93,10 @@
G_BEGIN_DECLS
#define NA_IIMPORTER_TYPE ( na_iimporter_get_type())
#define NA_IIMPORTER( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_IIMPORTER_TYPE, NAIImporter ))
#define NA_IS_IIMPORTER( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_IIMPORTER_TYPE ))
#define NA_IIMPORTER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IIMPORTER_TYPE, NAIImporterInterface ))
#define NA_TYPE_IIMPORTER ( na_iimporter_get_type())
#define NA_IIMPORTER( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_TYPE_IIMPORTER, NAIImporter ))
#define NA_IS_IIMPORTER( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_TYPE_IIMPORTER ))
#define NA_IIMPORTER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_TYPE_IIMPORTER, NAIImporterInterface ))
typedef struct _NAIImporter NAIImporter;
typedef struct _NAIImporterInterfacePrivate NAIImporterInterfacePrivate;
......
......@@ -104,10 +104,10 @@
G_BEGIN_DECLS
#define NA_IIO_PROVIDER_TYPE ( na_iio_provider_get_type())
#define NA_IIO_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_IIO_PROVIDER_TYPE, NAIIOProvider ))
#define NA_IS_IIO_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_IIO_PROVIDER_TYPE ))
#define NA_IIO_PROVIDER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IIO_PROVIDER_TYPE, NAIIOProviderInterface ))
#define NA_TYPE_IIO_PROVIDER ( na_iio_provider_get_type())
#define NA_IIO_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_TYPE_IIO_PROVIDER, NAIIOProvider ))
#define NA_IS_IIO_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_TYPE_IIO_PROVIDER ))
#define NA_IIO_PROVIDER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_TYPE_IIO_PROVIDER, NAIIOProviderInterface ))
typedef struct _NAIIOProvider NAIIOProvider;
typedef struct _NAIIOProviderInterfacePrivate NAIIOProviderInterfacePrivate;
......
......@@ -58,12 +58,12 @@
G_BEGIN_DECLS
#define NA_OBJECT_ACTION_TYPE ( na_object_action_get_type())
#define NA_OBJECT_ACTION( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_OBJECT_ACTION_TYPE, NAObjectAction ))
#define NA_OBJECT_ACTION_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_OBJECT_ACTION_TYPE, NAObjectActionClass ))
#define NA_IS_OBJECT_ACTION( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_OBJECT_ACTION_TYPE ))
#define NA_IS_OBJECT_ACTION_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_OBJECT_ACTION_TYPE ))
#define NA_OBJECT_ACTION_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_OBJECT_ACTION_TYPE, NAObjectActionClass ))
#define NA_TYPE_OBJECT_ACTION ( na_object_action_get_type())
#define NA_OBJECT_ACTION( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_OBJECT_ACTION, NAObjectAction ))
#define NA_OBJECT_ACTION_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_OBJECT_ACTION, NAObjectActionClass ))
#define NA_IS_OBJECT_ACTION( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_OBJECT_ACTION ))
#define NA_IS_OBJECT_ACTION_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_OBJECT_ACTION ))
#define NA_OBJECT_ACTION_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_OBJECT_ACTION, NAObjectActionClass ))
typedef struct _NAObjectActionPrivate NAObjectActionPrivate;
......
......@@ -46,12 +46,12 @@
G_BEGIN_DECLS
#define NA_OBJECT_ID_TYPE ( na_object_id_get_type())
#define NA_OBJECT_ID( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_OBJECT_ID_TYPE, NAObjectId ))
#define NA_OBJECT_ID_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_OBJECT_ID_TYPE, NAObjectIdClass ))
#define NA_IS_OBJECT_ID( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_OBJECT_ID_TYPE ))
#define NA_IS_OBJECT_ID_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_OBJECT_ID_TYPE ))
#define NA_OBJECT_ID_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_OBJECT_ID_TYPE, NAObjectIdClass ))
#define NA_TYPE_OBJECT_ID ( na_object_id_get_type())
#define NA_OBJECT_ID( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_OBJECT_ID, NAObjectId ))
#define NA_OBJECT_ID_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_OBJECT_ID, NAObjectIdClass ))
#define NA_IS_OBJECT_ID( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_OBJECT_ID ))
#define NA_IS_OBJECT_ID_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_OBJECT_ID ))
#define NA_OBJECT_ID_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_OBJECT_ID, NAObjectIdClass ))
typedef struct _NAObjectIdPrivate NAObjectIdPrivate;
......
......@@ -45,12 +45,12 @@
G_BEGIN_DECLS
#define NA_OBJECT_ITEM_TYPE ( na_object_item_get_type())
#define NA_OBJECT_ITEM( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_OBJECT_ITEM_TYPE, NAObjectItem ))
#define NA_OBJECT_ITEM_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_OBJECT_ITEM_TYPE, NAObjectItemClass ))
#define NA_IS_OBJECT_ITEM( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_OBJECT_ITEM_TYPE ))
#define NA_IS_OBJECT_ITEM_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_OBJECT_ITEM_TYPE ))
#define NA_OBJECT_ITEM_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_OBJECT_ITEM_TYPE, NAObjectItemClass ))
#define NA_TYPE_OBJECT_ITEM ( na_object_item_get_type())
#define NA_OBJECT_ITEM( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_OBJECT_ITEM, NAObjectItem ))
#define NA_OBJECT_ITEM_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_OBJECT_ITEM, NAObjectItemClass ))
#define NA_IS_OBJECT_ITEM( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_OBJECT_ITEM ))
#define NA_IS_OBJECT_ITEM_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_OBJECT_ITEM ))
#define NA_OBJECT_ITEM_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_OBJECT_ITEM, NAObjectItemClass ))
typedef struct _NAObjectItemPrivate NAObjectItemPrivate;
......
......@@ -42,12 +42,12 @@
G_BEGIN_DECLS
#define NA_OBJECT_MENU_TYPE ( na_object_menu_get_type())
#define NA_OBJECT_MENU( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_OBJECT_MENU_TYPE, NAObjectMenu ))
#define NA_OBJECT_MENU_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_OBJECT_MENU_TYPE, NAObjectMenuClass ))
#define NA_IS_OBJECT_MENU( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_OBJECT_MENU_TYPE ))
#define NA_IS_OBJECT_MENU_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_OBJECT_MENU_TYPE ))
#define NA_OBJECT_MENU_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_OBJECT_MENU_TYPE, NAObjectMenuClass ))
#define NA_TYPE_OBJECT_MENU ( na_object_menu_get_type())
#define NA_OBJECT_MENU( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_OBJECT_MENU, NAObjectMenu ))
#define NA_OBJECT_MENU_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_OBJECT_MENU, NAObjectMenuClass ))
#define NA_IS_OBJECT_MENU( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_OBJECT_MENU ))
#define NA_IS_OBJECT_MENU_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_OBJECT_MENU ))
#define NA_OBJECT_MENU_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_OBJECT_MENU, NAObjectMenuClass ))
typedef struct _NAObjectMenuPrivate NAObjectMenuPrivate;
......
......@@ -42,12 +42,12 @@
G_BEGIN_DECLS
#define NA_OBJECT_PROFILE_TYPE ( na_object_profile_get_type())
#define NA_OBJECT_PROFILE( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_OBJECT_PROFILE_TYPE, NAObjectProfile ))
#define NA_OBJECT_PROFILE_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_OBJECT_PROFILE_TYPE, NAObjectProfileClass ))
#define NA_IS_OBJECT_PROFILE( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_OBJECT_PROFILE_TYPE ))
#define NA_IS_OBJECT_PROFILE_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_OBJECT_PROFILE_TYPE ))
#define NA_OBJECT_PROFILE_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_OBJECT_PROFILE_TYPE, NAObjectProfileClass ))
#define NA_TYPE_OBJECT_PROFILE ( na_object_profile_get_type())
#define NA_OBJECT_PROFILE( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_OBJECT_PROFILE, NAObjectProfile ))
#define NA_OBJECT_PROFILE_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_OBJECT_PROFILE, NAObjectProfileClass ))
#define NA_IS_OBJECT_PROFILE( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_OBJECT_PROFILE ))
#define NA_IS_OBJECT_PROFILE_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_OBJECT_PROFILE ))
#define NA_OBJECT_PROFILE_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_OBJECT_PROFILE, NAObjectProfileClass ))
typedef struct _NAObjectProfilePrivate NAObjectProfilePrivate;
......
......@@ -49,12 +49,12 @@
G_BEGIN_DECLS
#define NA_OBJECT_TYPE ( na_object_object_get_type())
#define NA_OBJECT( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_OBJECT_TYPE, NAObject ))
#define NA_OBJECT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_OBJECT_TYPE, NAObjectClass ))
#define NA_IS_OBJECT( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_OBJECT_TYPE ))
#define NA_IS_OBJECT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_OBJECT_TYPE ))
#define NA_OBJECT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_OBJECT_TYPE, NAObjectClass ))
#define NA_TYPE_OBJECT ( na_object_object_get_type())
#define NA_OBJECT( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_OBJECT, NAObject ))
#define NA_OBJECT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_OBJECT, NAObjectClass ))
#define NA_IS_OBJECT( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_OBJECT ))
#define NA_IS_OBJECT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_OBJECT ))
#define NA_OBJECT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_OBJECT, NAObjectClass ))
typedef struct _NAObjectPrivate NAObjectPrivate;
......
......@@ -419,7 +419,7 @@ boxed_new( const BoxedDef *def )
{
NABoxed *boxed;
boxed = g_object_new( NA_BOXED_TYPE, NULL );
boxed = g_object_new( NA_TYPE_BOXED, NULL );
boxed->private->def = def;
return( boxed );
......
......@@ -175,7 +175,7 @@ register_type( void )
g_debug( "%s", thisfn );
type = g_type_register_static( NA_BOXED_TYPE, "NADataBoxed", &info, 0 );
type = g_type_register_static( NA_TYPE_BOXED, "NADataBoxed", &info, 0 );
return( type );
}
......@@ -291,7 +291,7 @@ na_data_boxed_new( const NADataDef *def )
g_return_val_if_fail( def != NULL, NULL );
boxed = g_object_new( NA_DATA_BOXED_TYPE, NULL );
boxed = g_object_new( NA_TYPE_DATA_BOXED, NULL );
na_boxed_set_type( NA_BOXED( boxed ), def->type );
boxed->private->data_def = def;
boxed->private->boxed_def = get_data_boxed_def( def->type );
......
......@@ -86,7 +86,7 @@ na_exporter_get_formats( const NAPivot *pivot )
g_return_val_if_fail( NA_IS_PIVOT( pivot ), NULL );
formats = NULL;
iexporters = na_pivot_get_providers( pivot, NA_IEXPORTER_TYPE );
iexporters = na_pivot_get_providers( pivot, NA_TYPE_IEXPORTER );
for( imod = iexporters ; imod ; imod = imod->next ){
str_list = exporter_get_formats( NA_IEXPORTER( imod->data ));
......
......@@ -142,7 +142,7 @@ interface_base_init( NAIIOProviderInterface *klass )
*/
st_signals[ ITEM_CHANGED ] = g_signal_new(
IO_PROVIDER_SIGNAL_ITEM_CHANGED,
NA_IIO_PROVIDER_TYPE,
NA_TYPE_IIO_PROVIDER,
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0, /* class offset */
NULL, /* accumulator */
......
......@@ -146,7 +146,7 @@ na_importer_import_from_uris( const NAPivot *pivot, NAImporterParms *parms )
/* first phase: just try to import the uris into memory
*/
modules = na_pivot_get_providers( pivot, NA_IIMPORTER_TYPE );
modules = na_pivot_get_providers( pivot, NA_TYPE_IIMPORTER );
for( uri = parms->uris ; uri ; uri = uri->next ){
import_result = import_from_uri( pivot, modules, ( const gchar * ) uri->data );
......
......@@ -756,7 +756,7 @@ io_providers_list_add_from_plugins( const NAPivot *pivot, GList *objects_list )
NAIIOProvider *provider_module;
merged = objects_list;
modules_list = na_pivot_get_providers( pivot, NA_IIO_PROVIDER_TYPE );
modules_list = na_pivot_get_providers( pivot, NA_TYPE_IIO_PROVIDER );
for( im = modules_list ; im ; im = im->next ){
......
......@@ -139,11 +139,11 @@ register_type( void )
g_debug( "%s", thisfn );
type = g_type_register_static( NA_OBJECT_ITEM_TYPE, "NAObjectAction", &info, 0 );
type = g_type_register_static( NA_TYPE_OBJECT_ITEM, "NAObjectAction", &info, 0 );
g_type_add_interface_static( type, NA_ICONTEXT_TYPE, &icontext_iface_info );
g_type_add_interface_static( type, NA_TYPE_ICONTEXT, &icontext_iface_info );
g_type_add_interface_static( type, NA_IFACTORY_OBJECT_TYPE, &ifactory_object_iface_info );
g_type_add_interface_static( type, NA_TYPE_IFACTORY_OBJECT, &ifactory_object_iface_info );
return( type );
}
......@@ -609,7 +609,7 @@ na_object_action_new( void )
{
NAObjectAction *action;
action = g_object_new( NA_OBJECT_ACTION_TYPE, NULL );
action = g_object_new( NA_TYPE_OBJECT_ACTION, NULL );
return( action );
}
......
......@@ -91,7 +91,7 @@ register_type( void )
g_debug( "%s", thisfn );
type = g_type_register_static( NA_OBJECT_TYPE, "NAObjectId", &info, 0 );
type = g_type_register_static( NA_TYPE_OBJECT, "NAObjectId", &info, 0 );
return( type );
}
......
......@@ -111,7 +111,7 @@ register_type( void )
g_debug( "%s", thisfn );
type = g_type_register_static( NA_OBJECT_ID_TYPE, "NAObjectItem", &info, 0 );
type = g_type_register_static( NA_TYPE_OBJECT_ID, "NAObjectItem", &info, 0 );
return( type );
}
......
......@@ -126,11 +126,11 @@ register_type( void )
g_debug( "%s", thisfn );
type = g_type_register_static( NA_OBJECT_ITEM_TYPE, "NAObjectMenu", &info, 0 );
type = g_type_register_static( NA_TYPE_OBJECT_ITEM, "NAObjectMenu", &info, 0 );
g_type_add_interface_static( type, NA_ICONTEXT_TYPE, &icontext_iface_info );
g_type_add_interface_static( type, NA_TYPE_ICONTEXT, &icontext_iface_info );
g_type_add_interface_static( type, NA_IFACTORY_OBJECT_TYPE, &ifactory_object_iface_info );
g_type_add_interface_static( type, NA_TYPE_IFACTORY_OBJECT, &ifactory_object_iface_info );
return( type );
}
......@@ -354,7 +354,7 @@ na_object_menu_new( void )
{
NAObjectMenu *menu;
menu = g_object_new( NA_OBJECT_MENU_TYPE, NULL );
menu = g_object_new( NA_TYPE_OBJECT_MENU, NULL );
return( menu );
}
......
......@@ -143,11 +143,11 @@ register_type( void )
g_debug( "%s", thisfn );
type = g_type_register_static( NA_OBJECT_ID_TYPE, "NAObjectProfile", &info, 0 );
type = g_type_register_static( NA_TYPE_OBJECT_ID, "NAObjectProfile", &info, 0 );
g_type_add_interface_static( type, NA_ICONTEXT_TYPE, &icontext_iface_info );
g_type_add_interface_static( type, NA_TYPE_ICONTEXT, &icontext_iface_info );
g_type_add_interface_static( type, NA_IFACTORY_OBJECT_TYPE, &ifactory_object_iface_info );
g_type_add_interface_static( type, NA_TYPE_IFACTORY_OBJECT, &ifactory_object_iface_info );
return( type );
}
......@@ -748,7 +748,7 @@ na_object_profile_new( void )
{
NAObjectProfile *profile;
profile = g_object_new( NA_OBJECT_PROFILE_TYPE, NULL );
profile = g_object_new( NA_TYPE_OBJECT_PROFILE, NULL );
return( profile );
}
......
......@@ -110,7 +110,7 @@ register_type( void )
type = g_type_register_static( G_TYPE_OBJECT, "NAObject", &info, 0 );
g_type_add_interface_static( type, NA_IDUPLICABLE_TYPE, &iduplicable_iface_info );
g_type_add_interface_static( type, NA_TYPE_IDUPLICABLE, &iduplicable_iface_info );
return( type );
}
......@@ -679,7 +679,7 @@ build_class_hierarchy( const NAObject *object )
hierarchy = NULL;
class = G_OBJECT_GET_CLASS( object );
while( G_OBJECT_CLASS_TYPE( class ) != NA_OBJECT_TYPE ){
while( G_OBJECT_CLASS_TYPE( class ) != NA_TYPE_OBJECT ){
hierarchy = g_list_prepend( hierarchy, class );
class = g_type_class_peek_parent( class );
......
......@@ -427,7 +427,7 @@ na_pivot_dump( const NAPivot *pivot )
* na_pivot_get_providers:
* @pivot: this #NAPivot instance.
* @type: the type of searched interface.
* For now, we only have NA_IIO_PROVIDER_TYPE interfaces.
* For now, we only have NA_TYPE_IIO_PROVIDER interfaces.
*
* Returns: a newly allocated list of providers of the required interface.
*
......
......@@ -130,13 +130,13 @@ nadp_desktop_provider_register_type( GTypeModule *module )
st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "NadpDesktopProvider", &info, 0 );
g_type_module_add_interface( module, st_module_type, NA_IIO_PROVIDER_TYPE, &iio_provider_iface_info );
g_type_module_add_interface( module, st_module_type, NA_TYPE_IIO_PROVIDER, &iio_provider_iface_info );
g_type_module_add_interface( module, st_module_type, NA_IFACTORY_PROVIDER_TYPE, &ifactory_provider_iface_info );
g_type_module_add_interface( module, st_module_type, NA_TYPE_IFACTORY_PROVIDER, &ifactory_provider_iface_info );
g_type_module_add_interface( module, st_module_type, NA_IIMPORTER_TYPE, &iimporter_iface_info );
g_type_module_add_interface( module, st_module_type, NA_TYPE_IIMPORTER, &iimporter_iface_info );
g_type_module_add_interface( module, st_module_type, NA_IEXPORTER_TYPE, &iexporter_iface_info );
g_type_module_add_interface( module, st_module_type, NA_TYPE_IEXPORTER, &iexporter_iface_info );
}
static void
......
......@@ -116,9 +116,9 @@ nagp_gconf_provider_register_type( GTypeModule *module )
st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "NagpGConfProvider", &info, 0 );
g_type_module_add_interface( module, st_module_type, NA_IIO_PROVIDER_TYPE, &iio_provider_iface_info );
g_type_module_add_interface( module, st_module_type, NA_TYPE_IIO_PROVIDER, &iio_provider_iface_info );
g_type_module_add_interface( module, st_module_type, NA_IFACTORY_PROVIDER_TYPE, &ifactory_provider_iface_info );
g_type_module_add_interface( module, st_module_type, NA_TYPE_IFACTORY_PROVIDER, &ifactory_provider_iface_info );
}
static void
......
......@@ -118,11 +118,11 @@ naxml_provider_register_type( GTypeModule *module )
st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "NAXMLProvider", &info, 0 );
g_type_module_add_interface( module, st_module_type, NA_IIMPORTER_TYPE, &iimporter_iface_info );
g_type_module_add_interface( module, st_module_type, NA_TYPE_IIMPORTER, &iimporter_iface_info );
g_type_module_add_interface( module, st_module_type, NA_IEXPORTER_TYPE, &iexporter_iface_info );
g_type_module_add_interface( module, st_module_type, NA_TYPE_IEXPORTER, &iexporter_iface_info );
g_type_module_add_interface( module, st_module_type, NA_IFACTORY_PROVIDER_TYPE, &ifactory_provider_iface_info );
g_type_module_add_interface( module, st_module_type, NA_TYPE_IFACTORY_PROVIDER, &ifactory_provider_iface_info );
}
static void
......
......@@ -315,7 +315,7 @@ nact_tree_model_new( BaseWindow *window, GtkTreeView *treeview, NactTreeMode mod
g_debug( "%s: window=%p, treeview=%p, mode=%u", thisfn, ( void * ) window, ( void * ) treeview, mode );
ts_model = gtk_tree_store_new(
TREE_N_COLUMN, GDK_TYPE_PIXBUF, G_TYPE_STRING, NA_OBJECT_TYPE );
TREE_N_COLUMN, GDK_TYPE_PIXBUF, G_TYPE_STRING, NA_TYPE_OBJECT );
/* create the filter model
*/
......
......@@ -168,7 +168,7 @@ na_module_plugin_register_type( GTypeModule *module )
st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "NAModulePlugin", &info, 0 );
/*g_type_module_add_interface( module, st_module_type, NA_IIO_PROVIDER_TYPE, &iio_provider_iface_info );*/
/*g_type_module_add_interface( module, st_module_type, NA_TYPE_IIO_PROVIDER, &iio_provider_iface_info );*/
}
static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment