Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/include/libast
Modified Files:
objpair.h
Log Message:
Mon Mar 1 14:29:13 2004 Michael Jennings (mej)
AVL tree removal work-in-progress.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast/objpair.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- objpair.h 30 Jan 2004 22:55:18 -0000 1.2
+++ objpair.h 1 Mar 2004 19:22:48 -0000 1.3
@@ -1,14 +1,14 @@
/*
- * Copyright (C) 1997-2004, Michael Jennings
+ * Copyvalue (C) 1997-2004, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * values to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice shall be included in
+ * The above copyvalue notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
@@ -32,8 +32,8 @@
* This file contains the declarations for the paired object type.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * $Revision: 1.2 $
- * $Date: 2004/01/30 22:55:18 $
+ * $Revision: 1.3 $
+ * $Date: 2004/03/01 19:22:48 $
*/
/[EMAIL PROTECTED]/
@@ -214,27 +214,27 @@
*/
SPIF_DECL_OBJ(objpair) {
SPIF_DECL_PARENT_TYPE(obj);
- SPIF_DECL_PROPERTY(obj, left);
- SPIF_DECL_PROPERTY(obj, right);
+ SPIF_DECL_PROPERTY(obj, key);
+ SPIF_DECL_PROPERTY(obj, value);
};
/[EMAIL PROTECTED]/
extern spif_class_t SPIF_CLASS_VAR(objpair);
extern spif_objpair_t spif_objpair_new(void);
-extern spif_objpair_t spif_objpair_new_from_left(spif_obj_t left);
-extern spif_objpair_t spif_objpair_new_from_right(spif_obj_t right);
-extern spif_objpair_t spif_objpair_new_from_both(spif_obj_t left, spif_obj_t right);
+extern spif_objpair_t spif_objpair_new_from_key(spif_obj_t key);
+extern spif_objpair_t spif_objpair_new_from_value(spif_obj_t value);
+extern spif_objpair_t spif_objpair_new_from_both(spif_obj_t key, spif_obj_t value);
extern spif_bool_t spif_objpair_del(spif_objpair_t self);
extern spif_bool_t spif_objpair_init(spif_objpair_t self);
-extern spif_bool_t spif_objpair_init_from_left(spif_objpair_t self, spif_obj_t left);
-extern spif_bool_t spif_objpair_init_from_right(spif_objpair_t self, spif_obj_t
right);
-extern spif_bool_t spif_objpair_init_from_both(spif_objpair_t self, spif_obj_t left,
spif_obj_t right);
+extern spif_bool_t spif_objpair_init_from_key(spif_objpair_t self, spif_obj_t key);
+extern spif_bool_t spif_objpair_init_from_value(spif_objpair_t self, spif_obj_t
value);
+extern spif_bool_t spif_objpair_init_from_both(spif_objpair_t self, spif_obj_t key,
spif_obj_t value);
extern spif_bool_t spif_objpair_done(spif_objpair_t self);
extern spif_str_t spif_objpair_show(spif_objpair_t self, spif_charptr_t name,
spif_str_t buff, size_t indent);
-extern spif_cmp_t spif_objpair_comp(spif_objpair_t self, spif_objpair_t other);
+extern spif_cmp_t spif_objpair_comp(spif_objpair_t self, spif_obj_t other);
extern spif_objpair_t spif_objpair_dup(spif_objpair_t self);
extern spif_classname_t spif_objpair_type(spif_objpair_t self);
-SPIF_DECL_PROPERTY_FUNC(objpair, obj, left);
-SPIF_DECL_PROPERTY_FUNC(objpair, obj, right);
+SPIF_DECL_PROPERTY_FUNC(objpair, obj, key);
+SPIF_DECL_PROPERTY_FUNC(objpair, obj, value);
#endif /* _LIBAST_OBJPAIR_H_ */
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
