Eo: Removed "type" property from event/op descriptions.

No use for it ATM, will be added if needed."

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/PROTO/eobj@71896 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/examples/access/inherit.c b/examples/access/inherit.c
index f84b095..91a8869 100644 (file)
--- a/examples/access/inherit.c
+++ b/examples/access/inherit.c
@@ -30,7 +30,7 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION_CONST(INHERIT_SUB_ID_PROT_PRINT, "", "Print protected var x1."),
+     EO_OP_DESCRIPTION_CONST(INHERIT_SUB_ID_PROT_PRINT, "Print protected var x1."),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/access/simple.c b/examples/access/simple.c
index c43f529..1399214 100644 (file)
--- a/examples/access/simple.c
+++ b/examples/access/simple.c
@@ -11,7 +11,7 @@ typedef struct
 } Private_Data;
 
 EAPI const Eo_Event_Description _EV_A_CHANGED =
-        EO_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
+        EO_EVENT_DESCRIPTION("a,changed", "Called when a has changed.");
 
 #define MY_CLASS SIMPLE_CLASS
 
@@ -42,7 +42,7 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "i", "Set property A"),
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/composite_objects/simple.c b/examples/composite_objects/simple.c
index ee9e6e3..d7e5e25 100644 (file)
--- a/examples/composite_objects/simple.c
+++ b/examples/composite_objects/simple.c
@@ -6,7 +6,7 @@
 EAPI Eo_Op SIMPLE_BASE_ID = 0;
 
 EAPI const Eo_Event_Description _EV_A_CHANGED =
-        EO_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
+        EO_EVENT_DESCRIPTION("a,changed", "Called when a has changed.");
 
 #define MY_CLASS SIMPLE_CLASS
 
@@ -44,8 +44,8 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "i", "Set property A"),
-     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_GET, "i", "Get property A"),
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
+     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_GET, "Get property A"),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/constructors/mixin.c b/examples/constructors/mixin.c
index eac643d..b8d9cf6 100644 (file)
--- a/examples/constructors/mixin.c
+++ b/examples/constructors/mixin.c
@@ -47,7 +47,7 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION_CONST(MIXIN_SUB_ID_ADD_AND_SET, "i", "Add A + B + param and print it"),
+     EO_OP_DESCRIPTION_CONST(MIXIN_SUB_ID_ADD_AND_SET, "Add A + B + param and print it"),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/constructors/simple.c b/examples/constructors/simple.c
index 15716b8..7918b8c 100644 (file)
--- a/examples/constructors/simple.c
+++ b/examples/constructors/simple.c
@@ -80,10 +80,10 @@ _class_destructor(Eo_Class *klass EINA_UNUSED)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "i", "Set property A"),
-     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_GET, "i", "Get property A"),
-     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_B_SET, "i", "Set property B"),
-     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_B_GET, "i", "Get property B"),
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
+     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_GET, "Get property A"),
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_B_SET, "Set property B"),
+     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_B_GET, "Get property B"),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/evas/elw_box.c b/examples/evas/elw_box.c
index a4302da..508db15 100644 (file)
--- a/examples/evas/elw_box.c
+++ b/examples/evas/elw_box.c
@@ -52,7 +52,7 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(ELW_BOX_SUB_ID_PACK_END, "o", "Pack obj at the end of box."),
+     EO_OP_DESCRIPTION(ELW_BOX_SUB_ID_PACK_END, "Pack obj at the end of box."),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/evas/elw_button.c b/examples/evas/elw_button.c
index 47ff6d3..52e6d5f 100644 (file)
--- a/examples/evas/elw_button.c
+++ b/examples/evas/elw_button.c
@@ -9,7 +9,7 @@
 EAPI Eo_Op ELW_BUTTON_BASE_ID = 0;
 
 EAPI const Eo_Event_Description _EV_CLICKED =
-        EO_EVENT_DESCRIPTION("clicked", "", "Called when there was a click.");
+        EO_EVENT_DESCRIPTION("clicked", "Called when there was a click.");
 
 typedef struct
 {
@@ -87,7 +87,7 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(ELW_BUTTON_SUB_ID_TEXT_SET, "s", "Text of a text supporting evas object."), // FIXME: This ID sholudn't really be defined here...
+     EO_OP_DESCRIPTION(ELW_BUTTON_SUB_ID_TEXT_SET, "Text of a text supporting evas object."), // FIXME: This ID sholudn't really be defined here...
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/evas/evas_obj.c b/examples/evas/evas_obj.c
index 89f68cb..1177fd6 100644 (file)
--- a/examples/evas/evas_obj.c
+++ b/examples/evas/evas_obj.c
@@ -119,12 +119,12 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_POSITION_SET, "ii", "Position of an evas object."),
-     EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_SET, "ii", "Size of an evas object."),
-     EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_COLOR_SET, "iiii", "Color of an evas object."),
-     EO_OP_DESCRIPTION_CONST(EVAS_OBJ_SUB_ID_COLOR_GET, "iiii", "Color of an evas object."),
-     EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_VISIBILITY_SET, "b", "Visibility of an evas object."),
-     EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CHILD_ADD, "o", "Add a child eo."),
+     EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_POSITION_SET, "Position of an evas object."),
+     EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_SET, "Size of an evas object."),
+     EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_COLOR_SET, "Color of an evas object."),
+     EO_OP_DESCRIPTION_CONST(EVAS_OBJ_SUB_ID_COLOR_GET, "Color of an evas object."),
+     EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_VISIBILITY_SET, "Visibility of an evas object."),
+     EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CHILD_ADD, "Add a child eo."),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/function_overrides/inherit2.c b/examples/function_overrides/inherit2.c
index e083236..2d8ed17 100644 (file)
--- a/examples/function_overrides/inherit2.c
+++ b/examples/function_overrides/inherit2.c
@@ -61,8 +61,8 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(INHERIT2_SUB_ID_PRINT, "", "Print hey"),
-     EO_OP_DESCRIPTION(INHERIT2_SUB_ID_PRINT2, "", "Print hey2"),
+     EO_OP_DESCRIPTION(INHERIT2_SUB_ID_PRINT, "Print hey"),
+     EO_OP_DESCRIPTION(INHERIT2_SUB_ID_PRINT2, "Print hey2"),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/function_overrides/simple.c b/examples/function_overrides/simple.c
index c4dea10..d3742a5 100644 (file)
--- a/examples/function_overrides/simple.c
+++ b/examples/function_overrides/simple.c
@@ -57,10 +57,10 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "i", "Set property A"),
-     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_PRINT, "", "Print property A"),
-     EO_OP_DESCRIPTION_CLASS(SIMPLE_SUB_ID_CLASS_PRINT, "", "Print class name."),
-     EO_OP_DESCRIPTION_CLASS(SIMPLE_SUB_ID_CLASS_PRINT2, "", "Print2 class name."),
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
+     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_PRINT, "Print property A"),
+     EO_OP_DESCRIPTION_CLASS(SIMPLE_SUB_ID_CLASS_PRINT, "Print class name."),
+     EO_OP_DESCRIPTION_CLASS(SIMPLE_SUB_ID_CLASS_PRINT2, "Print2 class name."),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/interface/interface.c b/examples/interface/interface.c
index 76bae03..d03a30c 100644 (file)
--- a/examples/interface/interface.c
+++ b/examples/interface/interface.c
@@ -9,7 +9,7 @@ EAPI Eo_Op INTERFACE_BASE_ID = 0;
 #define MY_CLASS INTERFACE_CLASS
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION_CONST(INTERFACE_SUB_ID_AB_SUM_GET, "i", "Get the sum of a and b."),
+     EO_OP_DESCRIPTION_CONST(INTERFACE_SUB_ID_AB_SUM_GET, "Get the sum of a and b."),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/interface/interface2.c b/examples/interface/interface2.c
index a86a89a..9abf7f0 100644 (file)
--- a/examples/interface/interface2.c
+++ b/examples/interface/interface2.c
@@ -10,7 +10,7 @@ EAPI Eo_Op INTERFACE2_BASE_ID = 0;
 #define MY_CLASS INTERFACE2_CLASS
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION_CONST(INTERFACE2_SUB_ID_AB_SUM_GET2, "i", "Print the sum of a and b."),
+     EO_OP_DESCRIPTION_CONST(INTERFACE2_SUB_ID_AB_SUM_GET2, "Print the sum of a and b."),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/interface/simple.c b/examples/interface/simple.c
index 5a3bbc4..216bc5a 100644 (file)
--- a/examples/interface/simple.c
+++ b/examples/interface/simple.c
@@ -77,10 +77,10 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "i", "Set property A"),
-     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_GET, "i", "Get property A"),
-     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_B_SET, "i", "Set property B"),
-     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_B_GET, "i", "Get property B"),
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
+     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_GET, "Get property A"),
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_B_SET, "Set property B"),
+     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_B_GET, "Get property B"),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/mixin/mixin.c b/examples/mixin/mixin.c
index fdfda63..f1b112c 100644 (file)
--- a/examples/mixin/mixin.c
+++ b/examples/mixin/mixin.c
@@ -44,7 +44,7 @@ _class_constructor(Eo_Class *klass)
 
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION_CONST(MIXIN_SUB_ID_AB_SUM_GET, "i", "Get the sum of a and b."),
+     EO_OP_DESCRIPTION_CONST(MIXIN_SUB_ID_AB_SUM_GET, "Get the sum of a and b."),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/mixin/simple.c b/examples/mixin/simple.c
index f230441..347e3b5 100644 (file)
--- a/examples/mixin/simple.c
+++ b/examples/mixin/simple.c
@@ -54,10 +54,10 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "i", "Set property A"),
-     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_GET, "i", "Get property A"),
-     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_B_SET, "i", "Set property B"),
-     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_B_GET, "i", "Get property B"),
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
+     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_GET, "Get property A"),
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_B_SET, "Set property B"),
+     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_B_GET, "Get property B"),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/examples/signals/simple.c b/examples/signals/simple.c
index dd52e48..ad68e33 100644 (file)
--- a/examples/signals/simple.c
+++ b/examples/signals/simple.c
@@ -12,7 +12,7 @@ typedef struct
 } Private_Data;
 
 EAPI const Eo_Event_Description _EV_A_CHANGED =
-        EO_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
+        EO_EVENT_DESCRIPTION("a,changed", "Called when a has changed.");
 
 #define MY_CLASS SIMPLE_CLASS
 
@@ -85,7 +85,7 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "i", "Set property A"),
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/lib/Eo.h b/lib/Eo.h
index 0a62214..e0d8d82 100644 (file)
--- a/lib/Eo.h
+++ b/lib/Eo.h
@@ -173,7 +173,6 @@ typedef void (*eo_op_func_type_class)(const Eo_Class *, va_list *list);
 struct _Eo_Event_Description
 {
    const char *name; /**< name of the event. */
-   const char *type; /**< describes the data passed in event_info */
    const char *doc; /**< Explanation about the event. */
 };
 
@@ -184,14 +183,13 @@ struct _Eo_Event_Description
 typedef struct _Eo_Event_Description Eo_Event_Description;
 
 /**
- * @def EO_EVENT_DESCRIPTION(name, type, doc)
+ * @def EO_EVENT_DESCRIPTION(name, doc)
  * An helper macro to help populating #Eo_Event_Description
  * @param name The name of the event.
- * @param type The type string of the event.
  * @param doc Additional doc for the event.
  * @see Eo_Event_Description
  */
-#define EO_EVENT_DESCRIPTION(name, type, doc) { name, type, doc }
+#define EO_EVENT_DESCRIPTION(name, doc) { name, doc }
 
 /**
  * @}
@@ -344,7 +342,6 @@ struct _Eo_Op_Description
 {
    Eo_Op sub_op; /**< The sub_id of the op in it's class. */
    const char *name; /**< The name of the op. */
-   const char *type; /**< descripbes the Op's function signature. */
    const char *doc; /**< Explanation about the Op. */
    Eo_Op_Type op_type; /**< The type of the Op. */
 };
@@ -394,45 +391,42 @@ typedef struct _Eo_Class_Description Eo_Class_Description;
 #define EO_CLASS_DESCRIPTION_OPS(base_op_id, op_descs, count) { base_op_id, op_descs, count }
 
 /**
- * @def EO_OP_DESCRIPTION(op, type, doc)
+ * @def EO_OP_DESCRIPTION(op, doc)
  * An helper macro to help populating #Eo_Op_Description
  * @param sub_id The sub id of the op being described.
- * @param type The type string for the op.
  * @param doc Additional doc for the op.
  * @see Eo_Op_Description
  * @see EO_OP_DESCRIPTION_CLASS
  * @see EO_OP_DESCRIPTION_CONST
  * @see EO_OP_DESCRIPTION_SENTINEL
  */
-#define EO_OP_DESCRIPTION(sub_id, type, doc) { sub_id, #sub_id, type, doc, EO_OP_TYPE_REGULAR }
+#define EO_OP_DESCRIPTION(sub_id, doc) { sub_id, #sub_id, doc, EO_OP_TYPE_REGULAR }
 
 /**
- * @def EO_OP_DESCRIPTION_CONST(op, type, doc)
+ * @def EO_OP_DESCRIPTION_CONST(op, doc)
  * An helper macro to help populating #Eo_Op_Description
  * This macro is the same as EO_OP_DESCRIPTION but indicates that the op's
  * implementation should not change the object.
  * @param sub_id The sub id of the op being described.
- * @param type The type string for the op.
  * @param doc Additional doc for the op.
  * @see Eo_Op_Description
  * @see EO_OP_DESCRIPTION
  * @see EO_OP_DESCRIPTION_SENTINEL
  */
-#define EO_OP_DESCRIPTION_CONST(sub_id, type, doc) { sub_id, #sub_id, type, doc, EO_OP_TYPE_CONST }
+#define EO_OP_DESCRIPTION_CONST(sub_id, doc) { sub_id, #sub_id, doc, EO_OP_TYPE_CONST }
 
 /**
- * @def EO_OP_DESCRIPTION_CLASS(op, type, doc)
+ * @def EO_OP_DESCRIPTION_CLASS(op, doc)
  * An helper macro to help populating #Eo_Op_Description
  * This macro is the same as EO_OP_DESCRIPTION but indicates that the op's
  * implementation is of type CLASS.
  * @param sub_id The sub id of the op being described.
- * @param type The type string for the op.
  * @param doc Additional doc for the op.
  * @see Eo_Op_Description
  * @see EO_OP_DESCRIPTION
  * @see EO_OP_DESCRIPTION_SENTINEL
  */
-#define EO_OP_DESCRIPTION_CLASS(sub_id, type, doc) { sub_id, #sub_id, type, doc, EO_OP_TYPE_CLASS }
+#define EO_OP_DESCRIPTION_CLASS(sub_id, doc) { sub_id, #sub_id, doc, EO_OP_TYPE_CLASS }
 
 /**
  * @def EO_OP_DESCRIPTION_SENTINEL
@@ -441,7 +435,7 @@ typedef struct _Eo_Class_Description Eo_Class_Description;
  * @see Eo_Op_Description
  * @see EO_OP_DESCRIPTION
  */
-#define EO_OP_DESCRIPTION_SENTINEL { 0, NULL, NULL, NULL, EINA_FALSE }
+#define EO_OP_DESCRIPTION_SENTINEL { 0, NULL, NULL, EO_OP_TYPE_INVALID }
 
 /**
  * @brief Create a new class.

diff --git a/lib/eo.c b/lib/eo.c
index f5baf94..63735f4 100644 (file)
--- a/lib/eo.c
+++ b/lib/eo.c
@@ -248,7 +248,7 @@ _dich_func_clean_all(Eo_Class *klass)
 /* END OF DICH */
 
 static const Eo_Op_Description noop_desc =
-        EO_OP_DESCRIPTION(EO_NOOP, "", "No operation.");
+        EO_OP_DESCRIPTION(EO_NOOP, "No operation.");
 
 static const Eo_Op_Description *
 _eo_op_id_desc_get(Eo_Op op)

diff --git a/lib/eo_base_class.c b/lib/eo_base_class.c
index 297440b..a90d37a 100644 (file)
--- a/lib/eo_base_class.c
+++ b/lib/eo_base_class.c
@@ -477,11 +477,11 @@ _ev_global_freeze_get(const Eo_Class *klass EINA_UNUSED, va_list *list)
 
 /* FIXME: Set proper type descriptions. */
 EAPI const Eo_Event_Description _EO_EV_CALLBACK_ADD =
-   EO_EVENT_DESCRIPTION("callback,add", "?", "A callback was added.");
+   EO_EVENT_DESCRIPTION("callback,add", "A callback was added.");
 EAPI const Eo_Event_Description _EO_EV_CALLBACK_DEL =
-   EO_EVENT_DESCRIPTION("callback,del", "?", "A callback was deleted.");
+   EO_EVENT_DESCRIPTION("callback,del", "A callback was deleted.");
 EAPI const Eo_Event_Description _EO_EV_DEL =
-   EO_EVENT_DESCRIPTION("del", "", "Obj is being deleted.");
+   EO_EVENT_DESCRIPTION("del", "Obj is being deleted.");
 
 static void
 _constructor(Eo *obj, void *class_data EINA_UNUSED)
@@ -528,22 +528,22 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_DATA_SET, "?", "Set data for key."),
-     EO_OP_DESCRIPTION_CONST(EO_BASE_SUB_ID_DATA_GET, "?", "Get data for key."),
-     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_DATA_DEL, "?", "Del key."),
-     EO_OP_DESCRIPTION_CONST(EO_BASE_SUB_ID_WREF_ADD, "?", "Add a weak ref to the object."),
-     EO_OP_DESCRIPTION_CONST(EO_BASE_SUB_ID_WREF_DEL, "?", "Delete the weak ref."),
-     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_CALLBACK_PRIORITY_ADD, "?", "Add an event callback with a priority."),
-     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_CALLBACK_DEL, "?", "Delete an event callback"),
-     EO_OP_DESCRIPTION_CONST(EO_BASE_SUB_ID_EVENT_CALLBACK_CALL, "?", "Call the event callbacks for an event."),
-     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_ADD, "?", "Add an event forwarder."),
-     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_DEL, "?", "Delete an event forwarder."),
-     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_FREEZE, "?", "Freezes events."),
-     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_THAW, "?", "Thaws events."),
-     EO_OP_DESCRIPTION_CONST(EO_BASE_SUB_ID_EVENT_FREEZE_GET, "?", "Get event freeze counter."),
-     EO_OP_DESCRIPTION_CLASS(EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE, "?", "Freezes events globally."),
-     EO_OP_DESCRIPTION_CLASS(EO_BASE_SUB_ID_EVENT_GLOBAL_THAW, "?", "Thaws events globally."),
-     EO_OP_DESCRIPTION_CLASS(EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE_GET, "?", "Get global event freeze counter."),
+     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_DATA_SET, "Set data for key."),
+     EO_OP_DESCRIPTION_CONST(EO_BASE_SUB_ID_DATA_GET, "Get data for key."),
+     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_DATA_DEL, "Del key."),
+     EO_OP_DESCRIPTION_CONST(EO_BASE_SUB_ID_WREF_ADD, "Add a weak ref to the object."),
+     EO_OP_DESCRIPTION_CONST(EO_BASE_SUB_ID_WREF_DEL, "Delete the weak ref."),
+     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_CALLBACK_PRIORITY_ADD, "Add an event callback with a priority."),
+     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_CALLBACK_DEL, "Delete an event callback"),
+     EO_OP_DESCRIPTION_CONST(EO_BASE_SUB_ID_EVENT_CALLBACK_CALL, "Call the event callbacks for an event."),
+     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_ADD, "Add an event forwarder."),
+     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_DEL, "Delete an event forwarder."),
+     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_FREEZE, "Freezes events."),
+     EO_OP_DESCRIPTION(EO_BASE_SUB_ID_EVENT_THAW, "Thaws events."),
+     EO_OP_DESCRIPTION_CONST(EO_BASE_SUB_ID_EVENT_FREEZE_GET, "Get event freeze counter."),
+     EO_OP_DESCRIPTION_CLASS(EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE, "Freezes events globally."),
+     EO_OP_DESCRIPTION_CLASS(EO_BASE_SUB_ID_EVENT_GLOBAL_THAW, "Thaws events globally."),
+     EO_OP_DESCRIPTION_CLASS(EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE_GET, "Get global event freeze counter."),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/tests/class_simple.c b/tests/class_simple.c
index 1037641..58d6d29 100644 (file)
--- a/tests/class_simple.c
+++ b/tests/class_simple.c
@@ -46,9 +46,9 @@ _class_constructor(Eo_Class *klass)
 }
 
 static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "i", "Set property A"),
-     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_PRINT, "", "Print property A"),
-     EO_OP_DESCRIPTION_CLASS(SIMPLE_SUB_ID_CLASS_HI_PRINT, "", "Print Hi"),
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
+     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_PRINT, "Print property A"),
+     EO_OP_DESCRIPTION_CLASS(SIMPLE_SUB_ID_CLASS_HI_PRINT, "Print Hi"),
      EO_OP_DESCRIPTION_SENTINEL
 };
 

diff --git a/tests/eo_test_class_errors.c b/tests/eo_test_class_errors.c
index 340d26c..fcafc4f 100644 (file)
--- a/tests/eo_test_class_errors.c
+++ b/tests/eo_test_class_errors.c
@@ -21,14 +21,14 @@ START_TEST(eo_incomplete_desc)
    };
 
    static const Eo_Op_Description op_desc[] = {
-        EO_OP_DESCRIPTION(TEST_SUB_ID_FOO, "i", "Foo"),
-        EO_OP_DESCRIPTION(TEST_SUB_ID_FOO2, "i", "Foo2"),
+        EO_OP_DESCRIPTION(TEST_SUB_ID_FOO, "Foo"),
+        EO_OP_DESCRIPTION(TEST_SUB_ID_FOO2, "Foo2"),
         EO_OP_DESCRIPTION_SENTINEL
    };
 
    static const Eo_Op_Description op_desc_wrong[] = {
-        EO_OP_DESCRIPTION(TEST_SUB_ID_FOO2, "i", "Foo2"),
-        EO_OP_DESCRIPTION(TEST_SUB_ID_FOO, "i", "Foo"),
+        EO_OP_DESCRIPTION(TEST_SUB_ID_FOO2, "Foo2"),
+        EO_OP_DESCRIPTION(TEST_SUB_ID_FOO, "Foo"),
         EO_OP_DESCRIPTION_SENTINEL
    };
 

diff --git a/tests/eo_test_general.c b/tests/eo_test_general.c
index 30a5cb6..c37bf3d 100644 (file)
--- a/tests/eo_test_general.c
+++ b/tests/eo_test_general.c
@@ -84,7 +84,7 @@ START_TEST(eo_static_classes)
    eo_init();
 
    static const Eo_Op_Description op_desc[] = {
-        EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "i", "Set property A"),
+        EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
         EO_OP_DESCRIPTION_SENTINEL
    };