Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : libs/evolve
Dir : e17/libs/evolve/src/lib
Modified Files:
Makefile.am evolve_private.h evolve_widget.c evolve_widget.h
Added Files:
evolve_property.c evolve_property.h
Log Message:
Break out property code into its own files.
Cleanups.
===================================================================
RCS file: /cvs/e/e17/libs/evolve/src/lib/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 18 Jun 2007 22:31:38 -0000 1.1
+++ Makefile.am 9 Feb 2008 07:24:13 -0000 1.2
@@ -22,6 +22,7 @@
Evolve.h \
evolve_constructor.h \
evolve_parse.h \
+ evolve_property.h \
evolve_private.h \
evolve_widget.h \
evolve_signal.h \
@@ -35,6 +36,7 @@
evolve_lib.c \
evolve_constructor.c \
evolve_parse.c \
+ evolve_property.c \
evolve_widget.c \
evolve_signal.c \
evolve_gui.c \
===================================================================
RCS file: /cvs/e/e17/libs/evolve/src/lib/evolve_private.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evolve_private.h 19 Jul 2007 10:44:49 -0000 1.2
+++ evolve_private.h 9 Feb 2008 07:24:13 -0000 1.3
@@ -18,6 +18,7 @@
#include "evolve_util.h"
#include "evolve_parse.h"
+#include "evolve_property.h"
#include "evolve_widget.h"
#include "evolve_constructor.h"
#include "evolve_signal.h"
===================================================================
RCS file: /cvs/e/e17/libs/evolve/src/lib/evolve_widget.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evolve_widget.c 8 Feb 2008 05:31:20 -0000 1.4
+++ evolve_widget.c 9 Feb 2008 07:24:13 -0000 1.5
@@ -40,105 +40,6 @@
static Evas_Bool evolve_widget_code_get_packing_props_foreach(Evas_Hash *hash,
const char *key, void *data, void *fdata);
static Evas_Bool evolve_widget_code_get_props_foreach(Evas_Hash *hash, const
char *key, void *data, void *fdata);
-/* temp until we support unions in eet */
-
-Evolve_Property_Type evolve_property_type_get(Evolve_Property *property)
-{
- if (!property || !property->default_value)
- return EVOLVE_PROPERTY_UNKNOWN;
-
- return property->default_value->type;
-}
-
-Evolve_Property_Value *evolve_property_value_new()
-{
- Evolve_Property_Value *value = calloc(1, sizeof(Evolve_Property_Value));
- value->type = EVOLVE_PROPERTY_UNKNOWN;
- return value;
-}
-Evolve_Property_Value *evolve_property_value_string(const char *value)
-{
- Evolve_Property_Value *new_value;
- new_value = evolve_property_value_new();
- new_value->string_value = value ? strdup(value) : NULL;
- new_value->type = EVOLVE_PROPERTY_STRING;
- return new_value;
-}
-Evolve_Property_Value *evolve_property_value_double(double value)
-{
- Evolve_Property_Value *new_value;
- new_value = evolve_property_value_new();
- new_value->double_value = value;
- new_value->type = EVOLVE_PROPERTY_DOUBLE;
- return new_value;
-}
-Evolve_Property_Value *evolve_property_value_int(int value)
-{
- Evolve_Property_Value *new_value;
- new_value = evolve_property_value_new();
- new_value->int_value = value;
- new_value->type = EVOLVE_PROPERTY_INT;
- return new_value;
-}
-const char *evolve_property_value_string_get(Evolve_Property_Value *value)
-{
- if (!value)
- return NULL;
- return value->string_value;
-}
-Etk_Bool evolve_property_value_bool_get(Evolve_Property_Value *value)
-{
- if (!value)
- return ETK_FALSE;
- return value->bool_value;
-}
-long int evolve_property_value_long_get(Evolve_Property_Value *value)
-{
- if (!value)
- return 0;
- return value->long_value;
-}
-char evolve_property_value_char_get(Evolve_Property_Value *value)
-{
- if (!value)
- return 0;
- return value->char_value;
-}
-float evolve_property_value_float_get(Evolve_Property_Value *value)
-{
- if (!value)
- return 0;
- return value->float_value;
-}
-short int evolve_property_value_short_get(Evolve_Property_Value *value)
-{
- if (!value)
- return 0;
- return value->short_value;
-}
-int evolve_property_value_int_get(Evolve_Property_Value *value)
-{
- if (!value)
- return 0;
- return value->int_value;
-}
-double evolve_property_value_double_get(Evolve_Property_Value *value)
-{
- if (!value)
- return 0;
- return value->double_value;
-}
-void evolve_property_value_delete(Evolve_Property_Value *value)
-{
- if (!value)
- return;
- if (value->string_value) free(value->string_value);
- free(value);
-}
-
-
-
-
/* populate widget packing info hashes (used at init time) */
void evolve_widget_packing_info_populate()
{
===================================================================
RCS file: /cvs/e/e17/libs/evolve/src/lib/evolve_widget.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evolve_widget.h 8 Feb 2008 05:31:20 -0000 1.2
+++ evolve_widget.h 9 Feb 2008 07:24:13 -0000 1.3
@@ -6,26 +6,6 @@
typedef struct _Evolve_Widget_Packing_Info Evolve_Widget_Packing_Info;
typedef struct _Evolve_Widget_Type Evolve_Widget_Type;
-/* temporary until we fix eet to store unions */
-typedef struct _Evolve_Property Evolve_Property;
-typedef struct _Evolve_Property_Value Evolve_Property_Value;
-
-typedef enum _Evolve_Property_Type
-{
- EVOLVE_PROPERTY_UNKNOWN,
- EVOLVE_PROPERTY_INT,
- EVOLVE_PROPERTY_BOOL,
- EVOLVE_PROPERTY_CHAR,
- EVOLVE_PROPERTY_FLOAT,
- EVOLVE_PROPERTY_DOUBLE,
- EVOLVE_PROPERTY_SHORT,
- EVOLVE_PROPERTY_LONG,
- EVOLVE_PROPERTY_OBJECT,
- EVOLVE_PROPERTY_POINTER,
- EVOLVE_PROPERTY_STRING
-} Evolve_Property_Type;
-
-
struct _Evolve_Widget_Packing_Option_Value
{
int value;
@@ -49,39 +29,6 @@
Evas_Hash *packing_options;
Evas_Hash *internal_props;
};
-
-struct _Evolve_Property
-{
- char *name;
- int id;
- Evolve_Property_Type type;
- Evolve_Property_Value *default_value;
-};
-
-struct _Evolve_Property_Value
-{
- int int_value;
- int bool_value;
- char char_value;
- float float_value;
- double double_value;
- short short_value;
- long long_value;
- char *string_value;
- int type;
-};
-
-/* temp */
-const char *evolve_property_value_string_get(Evolve_Property_Value *value);
-int evolve_property_value_int_get(Evolve_Property_Value *value);
-short int evolve_property_value_short_get(Evolve_Property_Value *value);
-long int evolve_property_value_long_get(Evolve_Property_Value *value);
-Etk_Bool evolve_property_value_bool_get(Evolve_Property_Value *value);
-double evolve_property_value_double_get(Evolve_Property_Value *value);
-char evolve_property_value_char_get(Evolve_Property_Value *value);
-float evolve_property_value_float_get(Evolve_Property_Value *value);
-void evolve_property_value_delete_get(Evolve_Property_Value *value);
-
void evolve_widget_packing_info_populate();
void evolve_widget_types_populate();
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs