Commit fd1e4a9b authored by Pierre Wieser's avatar Pierre Wieser

NADataDef, NADataGroup and NADataTypes are renamed to FMADataDef, FMADataGroup...

NADataDef, NADataGroup and NADataTypes are renamed to FMADataDef, FMADataGroup and FMADataTypes (resp.)
parent 37d1739b
......@@ -40,8 +40,8 @@ api_include_HEADERS = \
fma-boxed.h \
fma-core-utils.h \
fma-data-boxed.h \
na-data-def.h \
na-data-types.h \
fma-data-def.h \
fma-data-types.h \
na-gconf-monitor.h \
na-gconf-utils.h \
na-icontext.h \
......
......@@ -40,9 +40,9 @@
* A #FMADataBoxed object has a type and a value.
*
* #FMADataBoxed class is derived from #FMABoxed one, and implements the same
* types that those defined in na-data-types.h.
* types that those defined in fma-data-types.h.
*
* Additionally, #FMADataBoxed class holds the #NADataDef data definition
* Additionally, #FMADataBoxed class holds the #FMADataDef data definition
* suitable for a NAFactoryObject object. It such provides default value
* and validity status.
*
......@@ -52,7 +52,7 @@
#include <glib-object.h>
#include "fma-boxed.h"
#include "na-data-def.h"
#include "fma-data-def.h"
G_BEGIN_DECLS
......@@ -83,12 +83,12 @@ typedef struct {
GType fma_data_boxed_get_type( void );
FMADataBoxed *fma_data_boxed_new ( const NADataDef *def );
FMADataBoxed *fma_data_boxed_new ( const FMADataDef *def );
const NADataDef *fma_data_boxed_get_data_def ( const FMADataBoxed *boxed );
void fma_data_boxed_set_data_def ( FMADataBoxed *boxed, const NADataDef *def );
const FMADataDef *fma_data_boxed_get_data_def ( const FMADataBoxed *boxed );
void fma_data_boxed_set_data_def ( FMADataBoxed *boxed, const FMADataDef *def );
GParamSpec *fma_data_boxed_get_param_spec ( const NADataDef *def );
GParamSpec *fma_data_boxed_get_param_spec ( const FMADataDef *def );
gboolean fma_data_boxed_is_default ( const FMADataBoxed *boxed );
gboolean fma_data_boxed_is_valid ( const FMADataBoxed *boxed );
......
......@@ -32,11 +32,11 @@
/**
* SECTION: data-def
* @title: NADataDef, NADataGroup
* @title: FMADataDef, FMADataGroup
* @short_description: The Data Factory Structure Definitions
* @include: file-manager-actions/na-data-def.h
* @include: file-manager-actions/fma-data-def.h
*
* #NADataDef and #NADataGroup are structures which handle the list of
* #FMADataDef and #FMADataGroup are structures which handle the list of
* elementary datas for each and every #NAObjectItem which happens to
* implement the #NAIFactoryObject interface.
*/
......@@ -46,7 +46,7 @@
G_BEGIN_DECLS
/**
* NADataDef:
* FMADataDef:
* @name: both the id and the canonical name.
* Used when getting/setting properties.
* Is defined in na-ifactory-object-data.h and must be globally unique.
......@@ -121,10 +121,10 @@ typedef struct {
gchar *option_label;
gchar *option_arg_label;
}
NADataDef;
FMADataDef;
/**
* NADataGroup:
* FMADataGroup:
* @group: the name of the group, as defined in na-ifactory-object-data.h.
* @def: the list of the corresponding data structures.
*
......@@ -133,12 +133,12 @@ typedef struct {
* these groups.
*/
typedef struct {
gchar *group;
NADataDef *def;
gchar *group;
FMADataDef *def;
}
NADataGroup;
FMADataGroup;
const NADataDef *na_data_def_get_data_def( const NADataGroup *group, const gchar *group_name, const gchar *name );
const FMADataDef *fma_data_def_get_data_def( const FMADataGroup *group, const gchar *group_name, const gchar *name );
G_END_DECLS
......
......@@ -32,9 +32,9 @@
/**
* SECTION: data-type
* @title: NADataType
* @title: FMADataType
* @short_description: The Data Factory Type Definitions
* @include: file-manager-actions/na-data-types.h
* @include: file-manager-actions/fma-data-types.h
*/
#include <glib.h>
......@@ -42,7 +42,7 @@
G_BEGIN_DECLS
/**
* NADataType:
* FMADataType:
* @NA_DATA_TYPE_BOOLEAN: a boolean
* can be initialized with "true" or "false" (case insensitive)
* @NA_DATA_TYPE_POINTER: a ( void * ) pointer
......@@ -85,9 +85,9 @@ typedef enum {
/* count of defined types */
NA_DATA_TYPE_N
}
NADataType;
FMADataType;
const gchar *na_data_types_get_gconf_dump_key( guint type );
const gchar *fma_data_types_get_gconf_dump_key( guint type );
G_END_DECLS
......
......@@ -38,7 +38,7 @@
*
* Each elementary data get its own name here.
*
* Through #NADataDef and #NADataGroup definitions, each #NAObjectItem
* Through #FMADataDef and #FMADataGroup definitions, each #NAObjectItem
* derived object which implement the #NAIFactoryObject interface will
* dynamically define a property for each attached elementary data.
*/
......
......@@ -76,7 +76,7 @@
* </refsect2>
*/
#include "na-data-def.h"
#include "fma-data-def.h"
#include "fma-data-boxed.h"
#include "na-ifactory-provider-provider.h"
......@@ -93,7 +93,7 @@ typedef struct _NAIFactoryObjectInterfacePrivate NAIFactoryObjectInterfacePr
/**
* NAIFactoryObjectInterface:
* @get_version: returns the version of this interface the NAObjectItem implements.
* @get_groups: returns a pointer to the NADataGroup which defines this object.
* @get_groups: returns a pointer to the FMADataGroup which defines this object.
* @copy: post copy callback.
* @are_equal: tests if two NAObjectItem are equals.
* @is_valid: tests if one NAObjectItem is valid.
......@@ -128,11 +128,11 @@ typedef struct {
* get_groups:
* @instance: this #NAIFactoryObject instance.
*
* Returns: a pointer to the NADataGroup which defines this object.
* Returns: a pointer to the FMADataGroup which defines this object.
*
* Since: 2.30
*/
NADataGroup * ( *get_groups ) ( const NAIFactoryObject *instance );
FMADataGroup * ( *get_groups ) ( const NAIFactoryObject *instance );
/**
* copy:
......@@ -239,7 +239,7 @@ typedef struct {
GType na_ifactory_object_get_type( void );
FMADataBoxed *na_ifactory_object_get_data_boxed ( const NAIFactoryObject *object, const gchar *name );
NADataGroup *na_ifactory_object_get_data_groups( const NAIFactoryObject *object );
FMADataGroup *na_ifactory_object_get_data_groups( const NAIFactoryObject *object );
void *na_ifactory_object_get_as_void ( const NAIFactoryObject *object, const gchar *name );
void na_ifactory_object_set_from_void ( NAIFactoryObject *object, const gchar *name, const void *data );
......
......@@ -198,7 +198,7 @@ typedef struct {
* @reader_data: the data associated to this instance, as provided
* when na_ifactory_provider_read_item() was called.
* @object: the #NAIFactoryobject being unserialized.
* @def: a #NADataDef structure which identifies the data to be unserialized.
* @def: a #FMADataDef structure which identifies the data to be unserialized.
* @messages: a pointer to a #GSList list of strings; the provider
* may append messages to this list, but shouldn't reinitialize it.
*
......@@ -209,7 +209,7 @@ typedef struct {
*
* Since: 2.30
*/
FMADataBoxed * ( *read_data ) ( const NAIFactoryProvider *reader, void *reader_data, const NAIFactoryObject *object, const NADataDef *def, GSList **messages );
FMADataBoxed * ( *read_data ) ( const NAIFactoryProvider *reader, void *reader_data, const NAIFactoryObject *object, const FMADataDef *def, GSList **messages );
/**
* read_done:
......
......@@ -56,8 +56,8 @@ libna_core_la_SOURCES = \
fma-boxed.c \
fma-core-utils.c \
fma-data-boxed.c \
na-data-def.c \
na-data-types.c \
fma-data-def.c \
fma-data-types.c \
na-desktop-environment.c \
na-desktop-environment.h \
na-exporter.c \
......
......@@ -35,7 +35,7 @@
#include <string.h>
#include <api/fma-boxed.h>
#include <api/na-data-types.h>
#include <api/fma-data-types.h>
#include <api/fma-core-utils.h>
/* private class data
......@@ -485,7 +485,7 @@ string_to_array( const gchar *string )
/**
* fma_boxed_set_type:
* @boxed: this #FMABoxed object.
* @type: the required type as defined in na-data-types.h
* @type: the required type as defined in fma-data-types.h
*
* Set the type of the just-allocated @boxed object.
*
......
......@@ -37,8 +37,8 @@
#include <api/fma-core-utils.h>
#include <api/na-gconf-utils.h>
#include <api/na-data-def.h>
#include <api/na-data-types.h>
#include <api/fma-data-def.h>
#include <api/fma-data-types.h>
#include <api/fma-data-boxed.h>
/* private class data
......@@ -52,7 +52,7 @@ struct _FMADataBoxedClassPrivate {
*/
typedef struct {
guint type;
GParamSpec * ( *spec ) ( const NADataDef * );
GParamSpec * ( *spec ) ( const FMADataDef * );
gboolean ( *is_default )( const FMADataBoxed * );
gboolean ( *is_valid ) ( const FMADataBoxed * );
}
......@@ -62,7 +62,7 @@ typedef struct {
*/
struct _FMADataBoxedPrivate {
gboolean dispose_has_run;
const NADataDef *data_def ;
const FMADataDef *data_def ;
const DataBoxedDef *boxed_def;
};
......@@ -76,30 +76,30 @@ static void instance_finalize( GObject *object );
static const DataBoxedDef *get_data_boxed_def( guint type );
static GParamSpec *bool_spec( const NADataDef *idtype );
static GParamSpec *bool_spec( const FMADataDef *idtype );
static gboolean bool_is_default( const FMADataBoxed *boxed );
static gboolean bool_is_valid( const FMADataBoxed *boxed );
static GParamSpec *pointer_spec( const NADataDef *idtype );
static GParamSpec *pointer_spec( const FMADataDef *idtype );
static gboolean pointer_is_default( const FMADataBoxed *boxed );
static gboolean pointer_is_valid( const FMADataBoxed *boxed );
static GParamSpec *string_spec( const NADataDef *idtype );
static GParamSpec *string_spec( const FMADataDef *idtype );
static gboolean string_is_default( const FMADataBoxed *boxed );
static gboolean string_is_valid( const FMADataBoxed *boxed );
static GParamSpec *string_list_spec( const NADataDef *idtype );
static GParamSpec *string_list_spec( const FMADataDef *idtype );
static gboolean string_list_is_default( const FMADataBoxed *boxed );
static gboolean string_list_is_valid( const FMADataBoxed *boxed );
static gboolean locale_is_default( const FMADataBoxed *boxed );
static gboolean locale_is_valid( const FMADataBoxed *boxed );
static GParamSpec *uint_spec( const NADataDef *idtype );
static GParamSpec *uint_spec( const FMADataDef *idtype );
static gboolean uint_is_default( const FMADataBoxed *boxed );
static gboolean uint_is_valid( const FMADataBoxed *boxed );
static GParamSpec *uint_list_spec( const NADataDef *idtype );
static GParamSpec *uint_list_spec( const FMADataDef *idtype );
static gboolean uint_list_is_default( const FMADataBoxed *boxed );
static gboolean uint_list_is_valid( const FMADataBoxed *boxed );
......@@ -267,14 +267,14 @@ get_data_boxed_def( guint type )
/**
* fma_data_boxed_new:
* @def: the #NADataDef definition structure for this boxed.
* @def: the #FMADataDef definition structure for this boxed.
*
* Returns: a newly allocated #FMADataBoxed.
*
* Since: 2.30
*/
FMADataBoxed *
fma_data_boxed_new( const NADataDef *def )
fma_data_boxed_new( const FMADataDef *def )
{
FMADataBoxed *boxed;
......@@ -292,15 +292,15 @@ fma_data_boxed_new( const NADataDef *def )
* fma_data_boxed_get_data_def:
* @boxed: this #FMADataBoxed object.
*
* Returns: a pointer to the #NADataDef structure attached to the object.
* Returns: a pointer to the #FMADataDef structure attached to the object.
* Should never be %NULL.
*
* Since: 2.30
*/
const NADataDef *
const FMADataDef *
fma_data_boxed_get_data_def( const FMADataBoxed *boxed )
{
const NADataDef *def;
const FMADataDef *def;
g_return_val_if_fail( FMA_IS_DATA_BOXED( boxed ), NULL );
......@@ -317,16 +317,16 @@ fma_data_boxed_get_data_def( const FMADataBoxed *boxed )
/**
* fma_data_boxed_set_data_def:
* @boxed: this #FMADataBoxed object.
* @def: the new #NADataDef to be set.
* @def: the new #FMADataDef to be set.
*
* Changes the #NADataDef a @boxed points to:
* Changes the #FMADataDef a @boxed points to:
* -> the new type must be the same that the previous one.
* -> value is unchanged.
*
* Since: 2.30
*/
void
fma_data_boxed_set_data_def( FMADataBoxed *boxed, const NADataDef *new_def )
fma_data_boxed_set_data_def( FMADataBoxed *boxed, const FMADataDef *new_def )
{
g_return_if_fail( FMA_IS_DATA_BOXED( boxed ));
g_return_if_fail( boxed->private->data_def );
......@@ -335,20 +335,20 @@ fma_data_boxed_set_data_def( FMADataBoxed *boxed, const NADataDef *new_def )
if( !boxed->private->dispose_has_run ){
boxed->private->data_def = ( NADataDef * ) new_def;
boxed->private->data_def = ( FMADataDef * ) new_def;
}
}
/**
* fma_data_boxed_get_param_spec:
* @def: a #NADataDef definition structure.
* @def: a #FMADataDef definition structure.
*
* Returns: a #GParamSpec structure.
*
* Since: 2.30
*/
GParamSpec *
fma_data_boxed_get_param_spec( const NADataDef *def )
fma_data_boxed_get_param_spec( const FMADataDef *def )
{
GParamSpec *spec;
const DataBoxedDef *fn;
......@@ -576,7 +576,7 @@ fma_data_boxed_set_from_void( FMADataBoxed *boxed, const void *value )
#endif /* NA_ENABLE_DEPRECATED */
static GParamSpec *
bool_spec( const NADataDef *def )
bool_spec( const FMADataDef *def )
{
return( g_param_spec_boolean(
def->name,
......@@ -607,7 +607,7 @@ bool_is_valid( const FMADataBoxed *boxed )
}
static GParamSpec *
pointer_spec( const NADataDef *def )
pointer_spec( const FMADataDef *def )
{
return( g_param_spec_pointer(
def->name,
......@@ -645,7 +645,7 @@ pointer_is_valid( const FMADataBoxed *boxed )
}
static GParamSpec *
string_spec( const NADataDef *def )
string_spec( const FMADataDef *def )
{
return( g_param_spec_string(
def->name,
......@@ -702,7 +702,7 @@ string_is_valid( const FMADataBoxed *boxed )
}
static GParamSpec *
string_list_spec( const NADataDef *def )
string_list_spec( const FMADataDef *def )
{
return( g_param_spec_pointer(
def->name,
......@@ -795,7 +795,7 @@ locale_is_valid( const FMADataBoxed *boxed )
}
static GParamSpec *
uint_spec( const NADataDef *def )
uint_spec( const FMADataDef *def )
{
return( g_param_spec_uint(
def->name,
......@@ -828,7 +828,7 @@ uint_is_valid( const FMADataBoxed *boxed )
}
static GParamSpec *
uint_list_spec( const NADataDef *def )
uint_list_spec( const FMADataDef *def )
{
return( g_param_spec_pointer(
def->name,
......
......@@ -33,25 +33,25 @@
#include <string.h>
#include <api/na-data-def.h>
#include <api/fma-data-def.h>
/**
* na_data_def_get_data_def:
* @group: a #NADataGroup structure array.
* fma_data_def_get_data_def:
* @group: a #FMADataGroup structure array.
* @group_name: the searched group name.
* @name: the searched data name.
*
* Returns: a pointer to the #NADataDef structure, or %NULL if not found.
* Returns: a pointer to the #FMADataDef structure, or %NULL if not found.
*
* Since: 2.30
*/
const NADataDef *
na_data_def_get_data_def( const NADataGroup *group, const gchar *group_name, const gchar *name )
const FMADataDef *
fma_data_def_get_data_def( const FMADataGroup *group, const gchar *group_name, const gchar *name )
{
NADataGroup *igroup;
NADataDef *idef;
FMADataGroup *igroup;
FMADataDef *idef;
igroup = ( NADataGroup * ) group;
igroup = ( FMADataGroup * ) group;
while( igroup->group ){
if( !strcmp( igroup->group, group_name )){
idef = igroup->def;
......
......@@ -31,7 +31,7 @@
#include <config.h>
#endif
#include <api/na-data-types.h>
#include <api/fma-data-types.h>
#include <api/fma-core-utils.h>
typedef struct {
......@@ -53,7 +53,7 @@ static FactoryType st_factory_type[] = {
};
/**
* na_data_types_get_gconf_dump_key:
* fma_data_types_get_gconf_dump_key:
* @type: the FactoryData type.
*
* Returns: the GConf key suitable for this type.
......@@ -64,9 +64,9 @@ static FactoryType st_factory_type[] = {
* Since: 2.30
*/
const gchar *
na_data_types_get_gconf_dump_key( guint type )
fma_data_types_get_gconf_dump_key( guint type )
{
static const gchar *thisfn = "na_data_types_get_gconf_dump_key";
static const gchar *thisfn = "fma_data_types_get_gconf_dump_key";
FactoryType *str;
str = st_factory_type;
......
......@@ -37,7 +37,7 @@
#include <api/fma-core-utils.h>
#include <api/fma-data-boxed.h>
#include <api/na-data-types.h>
#include <api/fma-data-types.h>
#include <api/na-iio-provider.h>
#include <api/na-ifactory-provider.h>
#include <api/na-object-api.h>
......@@ -45,7 +45,7 @@
#include "na-factory-object.h"
#include "na-factory-provider.h"
typedef gboolean ( *NADataDefIterFunc )( NADataDef *def, void *user_data );
typedef gboolean ( *FMADataDefIterFunc )( FMADataDef *def, void *user_data );
enum {
DATA_DEF_ITER_SET_PROPERTIES = 1,
......@@ -92,13 +92,13 @@ typedef struct {
extern gboolean ifactory_object_initialized;
extern gboolean ifactory_object_finalized;
static gboolean define_class_properties_iter( const NADataDef *def, GObjectClass *class );
static gboolean set_defaults_iter( NADataDef *def, NafoDefaultIter *data );
static gboolean is_valid_mandatory_iter( const NADataDef *def, NafoValidIter *data );
static gboolean read_data_iter( NADataDef *def, NafoReadIter *iter );
static gboolean define_class_properties_iter( const FMADataDef *def, GObjectClass *class );
static gboolean set_defaults_iter( FMADataDef *def, NafoDefaultIter *data );
static gboolean is_valid_mandatory_iter( const FMADataDef *def, NafoValidIter *data );
static gboolean read_data_iter( FMADataDef *def, NafoReadIter *iter );
static gboolean write_data_iter( const NAIFactoryObject *object, FMADataBoxed *boxed, NafoWriteIter *iter );
static NADataGroup *v_get_groups( const NAIFactoryObject *object );
static FMADataGroup *v_get_groups( const NAIFactoryObject *object );
static void v_copy( NAIFactoryObject *target, const NAIFactoryObject *source );
static gboolean v_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *b );
static gboolean v_is_valid( const NAIFactoryObject *object );
......@@ -109,17 +109,17 @@ static guint v_write_done( NAIFactoryObject *serializable, const NAIFacto
static void attach_boxed_to_object( NAIFactoryObject *object, FMADataBoxed *boxed );
static void free_data_boxed_list( NAIFactoryObject *object );
static void iter_on_data_defs( const NADataGroup *idgroups, guint mode, NADataDefIterFunc pfn, void *user_data );
static void iter_on_data_defs( const FMADataGroup *idgroups, guint mode, FMADataDefIterFunc pfn, void *user_data );
/*
* na_factory_object_define_properties:
* @class: the #GObjectClass.
* @groups: the list of #NADataGroup structure which define the data of the class.
* @groups: the list of #FMADataGroup structure which define the data of the class.
*
* Initializes all the properties for the class.
*/
void
na_factory_object_define_properties( GObjectClass *class, const NADataGroup *groups )
na_factory_object_define_properties( GObjectClass *class, const FMADataGroup *groups )
{
static const gchar *thisfn = "na_factory_object_define_properties";
......@@ -130,11 +130,11 @@ na_factory_object_define_properties( GObjectClass *class, const NADataGroup *gro
/* define class properties
*/
iter_on_data_defs( groups, DATA_DEF_ITER_SET_PROPERTIES, ( NADataDefIterFunc ) define_class_properties_iter, class );
iter_on_data_defs( groups, DATA_DEF_ITER_SET_PROPERTIES, ( FMADataDefIterFunc ) define_class_properties_iter, class );
}
static gboolean
define_class_properties_iter( const NADataDef *def, GObjectClass *class )
define_class_properties_iter( const FMADataDef *def, GObjectClass *class )
{
static const gchar *thisfn = "na_factory_object_define_class_properties_iter";
gboolean stop;
......@@ -161,21 +161,21 @@ define_class_properties_iter( const NADataDef *def, GObjectClass *class )
* @object: this #NAIFactoryObject object.
* @name: the searched name.
*
* Returns: the #NADataDef structure which describes this @name, or %NULL.
* Returns: the #FMADataDef structure which describes this @name, or %NULL.
*/
NADataDef *
FMADataDef *
na_factory_object_get_data_def( const NAIFactoryObject *object, const gchar *name )
{
NADataDef *def;
FMADataDef *def;
g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
def = NULL;
NADataGroup *groups = v_get_groups( object );
FMADataGroup *groups = v_get_groups( object );
while( groups->group ){
NADataDef *def = groups->def;
FMADataDef *def = groups->def;
if( def ){
while( def->name ){
......@@ -195,12 +195,12 @@ na_factory_object_get_data_def( const NAIFactoryObject *object, const gchar *nam
* na_factory_object_get_data_groups:
* @object: the #NAIFactoryObject instance.
*
* Returns: a pointer to the list of #NADataGroup which define the data.
* Returns: a pointer to the list of #FMADataGroup which define the data.
*/
NADataGroup *
FMADataGroup *
na_factory_object_get_data_groups( const NAIFactoryObject *object )
{
NADataGroup *groups;
FMADataGroup *groups;
g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
......@@ -249,7 +249,7 @@ na_factory_object_get_default( NAIFactoryObject *object, const gchar *name )
{
static const gchar *thisfn = "na_factory_object_set_defaults";
gchar *value;
NADataDef *def;
FMADataDef *def;
g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
......@@ -275,7 +275,7 @@ void
na_factory_object_set_defaults( NAIFactoryObject *object )
{
static const gchar *thisfn = "na_factory_object_set_defaults";
NADataGroup *groups;
FMADataGroup *groups;
NafoDefaultIter *iter_data;
g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
......@@ -284,13 +284,13 @@ na_factory_object_set_defaults( NAIFactoryObject *object )
groups = v_get_groups( object );
if( !groups ){
g_warning( "%s: no NADataGroup found for %s", thisfn, G_OBJECT_TYPE_NAME( object ));
g_warning( "%s: no FMADataGroup found for %s", thisfn, G_OBJECT_TYPE_NAME( object ));
} else {
iter_data = g_new0( NafoDefaultIter, 1 );
iter_data->object = object;
iter_on_data_defs( groups, DATA_DEF_ITER_SET_DEFAULTS, ( NADataDefIterFunc ) set_defaults_iter, iter_data );
iter_on_data_defs( groups, DATA_DEF_ITER_SET_DEFAULTS, ( FMADataDefIterFunc ) set_defaults_iter, iter_data );
g_free( iter_data );
}
......@@ -303,7 +303,7 @@ na_factory_object_set_defaults( NAIFactoryObject *object )
* as an 'unset' value.
*/
static gboolean
set_defaults_iter( NADataDef *def, NafoDefaultIter *data )
set_defaults_iter( FMADataDef *def, NafoDefaultIter *data )
{
FMADataBoxed *boxed = na_ifactory_object_get_data_boxed( data->object, def->name );
......@@ -340,8 +340,8 @@ na_factory_object_move_boxed( NAIFactoryObject *target, const NAIFactoryObject *
attach_boxed_to_object( target, boxed );
const NADataDef *src_def = fma_data_boxed_get_data_def( boxed );
NADataDef *tgt_def = na_factory_object_get_data_def( target, src_def->name );
const FMADataDef *src_def = fma_data_boxed_get_data_def( boxed );
FMADataDef *tgt_def = na_factory_object_get_data_def( target, src_def->name );
fma_data_boxed_set_data_def( boxed, tgt_def );
}
}
......@@ -361,7 +361,7 @@ na_factory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source
GList *dest_list, *idest, *inext;
GList *src_list, *isrc;
FMADataBoxed *boxed;
const NADataDef *def;
const FMADataDef *def;
void *provider, *provider_data;
g_return_if_fail( NA_IS_IFACTORY_OBJECT( target ));
......@@ -441,7 +441,7 @@ na_factory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *
for( ia = a_list ; ia && are_equal ; ia = ia->next ){
FMADataBoxed *a_boxed = FMA_DATA_BOXED( ia->data );
const NADataDef *a_def = fma_data_boxed_get_data_def( a_boxed );
const FMADataDef *a_def = fma_data_boxed_get_data_def( a_boxed );
if( a_def->comparable ){
FMADataBoxed *b_boxed = na_ifactory_object_get_data_boxed( b, a_def->name );
......@@ -461,7 +461,7 @@ na_factory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *
for( ib = b_list ; ib && are_equal ; ib = ib->next ){
FMADataBoxed *b_boxed = FMA_DATA_BOXED( ib->data );
const NADataDef *b_def = fma_data_boxed_get_data_def( b_boxed );
const FMADataDef *b_def = fma_data_boxed_get_data_def( b_boxed );
if( b_def->comparable ){
FMADataBoxed *a_boxed = na_ifactory_object_get_data_boxed( a, b_def->name );
......@@ -488,7 +488,7 @@ na_factory_object_is_valid( const NAIFactoryObject *object )
{
static const gchar *thisfn = "na_factory_object_is_valid";
gboolean is_valid;
NADataGroup *groups;
FMADataGroup *groups;
GList *list, *iv;
g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), FALSE );
......@@ -506,7 +506,7 @@ na_factory_object_is_valid( const NAIFactoryObject *object )
groups = v_get_groups( object );
if( groups ){
iter_on_data_defs( groups, DATA_DEF_ITER_IS_VALID, ( NADataDefIterFunc ) is_valid_mandatory_iter, &iter_data );
iter_on_data_defs( groups, DATA_DEF_ITER_IS_VALID, ( FMADataDefIterFunc ) is_valid_mandatory_iter, &iter_data );
}
is_valid = iter_data.is_valid;
......@@ -520,7 +520,7 @@ na_factory_object_is_valid( const NAIFactoryObject *object )
}
static gboolean
is_valid_mandatory_iter( const NADataDef *def, NafoValidIter *data )
is_valid_mandatory_iter( const FMADataDef *def, NafoValidIter *data )
{
FMADataBoxed *boxed;
......@@ -557,7 +557,7 @@ na_factory_object_dump( const NAIFactoryObject *object )
for( it = list ; it ; it = it->next ){
FMADataBoxed *boxed = FMA_DATA_BOXED( it->data );
const NADataDef *def = fma_data_boxed_get_data_def( boxed );
const FMADataDef *def = fma_data_boxed_get_data_def( boxed );
length = MAX( length, strlen( def->name ));
}
......@@ -566,7 +566,7 @@ na_factory_object_dump( const NAIFactoryObject *object )
for( it = list ; it ; it = it->next ){
FMADataBoxed *boxed = FMA_DATA_BOXED( it->data );
const NADataDef *def = fma_data_boxed_get_data_def( boxed );
const FMADataDef *def = fma_data_boxed_get_data_def( boxed );
gchar *value = fma_boxed_get_string( FMA_BOXED( boxed ));
g_debug( "| %s: %*s=%s", thisfn, length, def->name+l_prefix, value );
g_free( value );
......@@ -603,7 +603,7 @@ na_factory_object_read_item( NAIFactoryObject *object, const NAIFactoryProvider
g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
NADataGroup *groups = v_get_groups( object );
FMADataGroup *groups = v_get_groups( object );
if( groups ){
v_read_start( object, reader, reader_data, messages );
......@@ -614,20 +614,20 @@ na_factory_object_read_item( NAIFactoryObject *object, const NAIFactoryProvider
iter->reader_data = reader_data;
iter->messages = messages;
iter_on_data_defs( groups, DATA_DEF_ITER_READ_ITEM, ( NADataDefIterFunc )