1 files changed, 27 insertions, 15 deletions

diff --git a/libical/src/libical/icalproperty.h b/libical/src/libical/icalproperty.h
index e39c6b5..472adb9 100644
--- a/libical/src/libical/icalproperty.h
+++ b/libical/src/libical/icalproperty.h
@@ -31,11 +31,7 @@
 #define ICALPROPERTY_H
 
 #include <time.h>
-
-#ifdef _WIN32
-#include <stdio.h> /* for printf */
-#include <stdarg.h> /* for va_list, va_start, etc. */
-#endif
+#include <stdarg.h>  /* for va_... */
 
 #include "icalderivedparameter.h"
 
@@ -43,12 +39,10 @@
 #include "icalrecur.h"
 
 /* Actually in icalderivedproperty.h:
-   typedef void icalproperty; */
+   typedef struct icalproperty_impl icalproperty; */
 
 #include "icalderivedproperty.h" /* To get icalproperty_kind enumerations */
 
-// void icalproperty_add_parameters(struct icalproperty_impl *prop,va_list args);
-
 icalproperty* icalproperty_new(icalproperty_kind kind);
 
 icalproperty* icalproperty_new_clone(icalproperty * prop);
@@ -62,6 +56,7 @@ void  icalproperty_free(icalproperty* prop);
 icalproperty_kind icalproperty_isa(icalproperty* property);
 int icalproperty_isa_property(void* property);
 
+void icalproperty_add_parameters(struct icalproperty_impl *prop,va_list args);
 void icalproperty_add_parameter(icalproperty* prop,icalparameter* parameter);
 void icalproperty_set_parameter(icalproperty* prop,icalparameter* parameter);
 void icalproperty_set_parameter_from_string(icalproperty* prop,
@@ -72,7 +67,18 @@ const char* icalproperty_get_parameter_as_string(icalproperty* prop,
 void icalproperty_remove_parameter(icalproperty* prop,
 				   icalparameter_kind kind);
 
-int icalproperty_count_parameters(icalproperty* prop);
+void icalproperty_remove_parameter_by_kind(icalproperty* prop,
+					   icalparameter_kind kind);
+
+void icalproperty_remove_parameter_by_name(icalproperty* prop,
+					   const char *name);
+
+void icalproperty_remove_parameter_by_ref(icalproperty* prop,
+					  icalparameter *param);
+
+
+
+int icalproperty_count_parameters(const icalproperty* prop);
 
 /* Iterate through the parameters */
 icalparameter* icalproperty_get_first_parameter(icalproperty* prop,
@@ -83,33 +89,39 @@ icalparameter* icalproperty_get_next_parameter(icalproperty* prop,
 void icalproperty_set_value(icalproperty* prop, icalvalue* value);
 void icalproperty_set_value_from_string(icalproperty* prop,const char* value, const char* kind);
 
-icalvalue* icalproperty_get_value(icalproperty* prop);
-const char* icalproperty_get_value_as_string(icalproperty* prop);
+icalvalue* icalproperty_get_value(const icalproperty* prop);
+const char* icalproperty_get_value_as_string(const icalproperty* prop);
 
 /* Deal with X properties */
 
 void icalproperty_set_x_name(icalproperty* prop, const char* name);
 const char* icalproperty_get_x_name(icalproperty* prop);
 
-/* Return the name of the property -- the type name converted to a
-   string, or the value of _get_x_name if the type is and X property */
-const char* icalproperty_get_name (icalproperty* prop);
+/** Return the name of the property -- the type name converted to a
+ *  string, or the value of _get_x_name if the type is and X
+ *  property 
+ */
+const char* icalproperty_get_property_name (const icalproperty* prop);
 
 icalvalue_kind icalparameter_value_to_value_kind(icalparameter_value value);
 
 /* Convert kinds to string and get default value type */
 
 icalvalue_kind icalproperty_kind_to_value_kind(icalproperty_kind kind);
-icalvalue_kind icalproperty_value_kind_to_kind(icalvalue_kind kind);
+icalproperty_kind icalproperty_value_kind_to_kind(icalvalue_kind kind);
 const char* icalproperty_kind_to_string(icalproperty_kind kind);
 icalproperty_kind icalproperty_string_to_kind(const char* string);
 
+/** Check validity of a specific icalproperty_kind **/
+int icalproperty_kind_is_valid(const icalproperty_kind kind);
+
 icalproperty_method icalproperty_string_to_method(const char* str);
 const char* icalproperty_method_to_string(icalproperty_method method);
 
 
 const char* icalproperty_enum_to_string(int e);
 int icalproperty_string_to_enum(const char* str);
+int icalproperty_kind_and_string_to_enum(const int kind, const char* str);
 
 const char* icalproperty_status_to_string(icalproperty_status);
 icalproperty_status icalproperty_string_to_status(const char* string);