kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

and extract model stuff from value... 

SVN revision: 70292
This commit is contained in:
Carsten Haitzler 2012-04-18 09:12:26 +00:00
parent 5f4523e6c9
commit 1fb2825ac8
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
legacy/eina/src/include/eina_value.h
View File

@ -285,8 +285,7 @@
* It is meant for simple data types, providing uniform access and
* release functions, useful to exchange data preserving their
* types. For more complex hierarchical data, with properties and
* children, reference counting, inheritance and interfaces, see @ref
* Eina_Model_Group.
* children, reference counting, inheritance and interfaces,
*
* Examples of usage of the Eina_Value API:
* @li @ref eina_value_example_01_page
@ -591,23 +590,6 @@ EAPI extern const Eina_Value_Type *EINA_VALUE_TYPE_BLOB;
*/
EAPI extern const Eina_Value_Type *EINA_VALUE_TYPE_STRUCT;
/**
* @var EINA_VALUE_TYPE_MODEL
*
* manages Eina_Model type. Use the value get/set to change the model
* in use, it will increase the reference while in use by the value.
*
* eina_value_set() takes a pointer to #Eina_Model, increasing the
* reference.
*
* eina_value_get() takes a pointer to pointer to #Eina_Model, it's an
* exact copy of the current model, no copies are done, no references
* are increased.
*
* @since 1.2
*/
EAPI extern const Eina_Value_Type *EINA_VALUE_TYPE_MODEL;
/**
* @var EINA_ERROR_VALUE_FAILED
* Error identifier corresponding to value check failure.

16
legacy/eina/src/lib/eina_value.c
View File

@ -64,7 +64,9 @@ void *alloca (size_t);
/* undefs EINA_ARG_NONULL() so NULL checks are not compiled out! */
#include "eina_safety_checks.h"
#include "eina_value.h"
#include "eina_model.h" /* uses eina_value.h */
/* no model for now
#include "eina_model.h" // uses eina_value.h
*/
/*============================================================================*
* Local *
@ -4447,6 +4449,7 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_STRUCT = {
_eina_value_type_struct_pget
};
/* no model for now
static Eina_Bool
_eina_value_type_model_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
{
@ -4473,7 +4476,7 @@ _eina_value_type_model_copy(const Eina_Value_Type *type __UNUSED__, const void *
const Eina_Model * const *s = src;
Eina_Model **d = dst;
if (*s)
*d = eina_model_copy(*s); /* is it better to deep-copy? */
*d = eina_model_copy(*s); // is it better to deep-copy?
else
*d = NULL;
return EINA_TRUE;
@ -4565,11 +4568,12 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_MODEL = {
_eina_value_type_model_copy,
_eina_value_type_model_compare,
_eina_value_type_model_convert_to,
NULL, /* no convert from */
NULL, // no convert from
_eina_value_type_model_vset,
_eina_value_type_model_pset,
_eina_value_type_model_pget
};
*/
/* keep all basic types inlined in an array so we can compare if it's
* a basic type using pointer arithmetic.
@ -5017,8 +5021,10 @@ eina_value_init(void)
EINA_VALUE_TYPE_TIMEVAL = &_EINA_VALUE_TYPE_TIMEVAL;
EINA_VALUE_TYPE_BLOB = &_EINA_VALUE_TYPE_BLOB;
EINA_VALUE_TYPE_STRUCT = &_EINA_VALUE_TYPE_STRUCT;
/* no model for now
EINA_VALUE_TYPE_MODEL = &_EINA_VALUE_TYPE_MODEL;
*/
EINA_VALUE_BLOB_OPERATIONS_MALLOC = &_EINA_VALUE_BLOB_OPERATIONS_MALLOC;
EINA_VALUE_STRUCT_OPERATIONS_BINSEARCH = &_EINA_VALUE_STRUCT_OPERATIONS_BINSEARCH;
@ -5100,7 +5106,9 @@ EAPI const Eina_Value_Type *EINA_VALUE_TYPE_HASH = NULL;
EAPI const Eina_Value_Type *EINA_VALUE_TYPE_TIMEVAL = NULL;
EAPI const Eina_Value_Type *EINA_VALUE_TYPE_BLOB = NULL;
EAPI const Eina_Value_Type *EINA_VALUE_TYPE_STRUCT = NULL;
/* no model for now
EAPI const Eina_Value_Type *EINA_VALUE_TYPE_MODEL = NULL;
*/
EAPI const Eina_Value_Blob_Operations *EINA_VALUE_BLOB_OPERATIONS_MALLOC = NULL;