From 2ba95f7fc2dd9be08896946fb208e58dd4c3efeb Mon Sep 17 00:00:00 2001
From: raster <raster>
Date: Wed, 18 Apr 2012 09:12:26 +0000
Subject: [PATCH] and extract model stuff from value...

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@70292 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---
 src/include/eina_value.h | 20 +-------------------
 src/lib/eina_value.c     | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/include/eina_value.h b/src/include/eina_value.h
index 2ef89ff..3fb2948 100644
--- a/src/include/eina_value.h
+++ b/src/include/eina_value.h
@@ -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
@@ -592,23 +591,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.
  *
diff --git a/src/lib/eina_value.c b/src/lib/eina_value.c
index b8df693..a436b3c 100644
--- a/src/lib/eina_value.c
+++ b/src/lib/eina_value.c
@@ -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;
 
-- 
2.7.4