Remove deprecated icalproperty_remove_parameter

Use icalproperty_remove_parameter_by_kind instead.

10 files changed, 12 insertions, 27 deletions

diff --git a/doc/UsingLibical.txt b/doc/UsingLibical.txt
index 97a771c0..3b521893 100644
--- a/doc/UsingLibical.txt
+++ b/doc/UsingLibical.txt
@@ -710,7 +710,7 @@ void icalproperty_add_parameter(
 
      icalparameter* parameter);
 
-void icalproperty_remove_parameter(
+void icalproperty_remove_parameter_by_kind(
 
      icalproperty* prop,
 
diff --git a/examples/access_properties_and_parameters.c b/examples/access_properties_and_parameters.c
index 02505cd0..d17d91c0 100644
--- a/examples/access_properties_and_parameters.c
+++ b/examples/access_properties_and_parameters.c
@@ -82,7 +82,7 @@ void update_attendees(icalcomponent* event)
             /* Remove the NEEDSACTION parameter and replace it with
                TENTATIVE */
 
-            icalproperty_remove_parameter(p,ICAL_PARTSTAT_PARAMETER);
+            icalproperty_remove_parameter_by_kind(p,ICAL_PARTSTAT_PARAMETER);
 
             /* Don't forget to free it */
             icalparameter_free(parameter);
diff --git a/src/java/ICalProperty.java b/src/java/ICalProperty.java
index 66a2893d..6aa8dae1 100644
--- a/src/java/ICalProperty.java
+++ b/src/java/ICalProperty.java
@@ -175,7 +175,7 @@ public class ICalProperty
         public native void set_parameter(ICalParameter parameter);
         public native void set_parameter_from_string(String name, String val);
         public native String get_parameter_as_string(String name);
-        public native void remove_parameter(/* ICalParameterKind */ int kind);
+        public native void remove_parameter_by_kind(/* ICalParameterKind */ int kind);
         public native int count_parameters();
 
         /* Iterate through the parameters */
diff --git a/src/java/net_cp_jlibical_ICalProperty_cxx.cpp b/src/java/net_cp_jlibical_ICalProperty_cxx.cpp
index 4334354b..adbd7846 100644
--- a/src/java/net_cp_jlibical_ICalProperty_cxx.cpp
+++ b/src/java/net_cp_jlibical_ICalProperty_cxx.cpp
@@ -190,17 +190,17 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1parameter_1as_1
 
 /*
  * Class:     net_cp_jlibical_ICalProperty
- * Method:    remove_parameter
+ * Method:    remove_parameter_by_kind
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_remove_1parameter
+JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_remove_1parameter_by_kind
   (JNIEnv *env, jobject jobj, jint kind)
 {
 	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
 
 	if (cObj != NULL)
 	{
-		cObj->remove_parameter((icalparameter_kind)kind);
+		cObj->remove_parameter_by_kind((icalparameter_kind)kind);
 	}
 }
 
diff --git a/src/java/net_cp_jlibical_ICalProperty_cxx.h b/src/java/net_cp_jlibical_ICalProperty_cxx.h
index 41b4a36c..3e98c0d3 100644
--- a/src/java/net_cp_jlibical_ICalProperty_cxx.h
+++ b/src/java/net_cp_jlibical_ICalProperty_cxx.h
@@ -74,10 +74,10 @@ JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1parameter_1as_1
 
 /*
  * Class:     net_cp_jlibical_ICalProperty
- * Method:    remove_parameter
+ * Method:    remove_parameter_by_kind
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_remove_1parameter
+JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_remove_1parameter_by_kind
   (JNIEnv *, jobject, jint);
 
 /*
diff --git a/src/libical/icalproperty.c b/src/libical/icalproperty.c
index b907c4cc..fa177b5c 100644
--- a/src/libical/icalproperty.c
+++ b/src/libical/icalproperty.c
@@ -631,17 +631,6 @@ char *icalproperty_get_parameter_as_string_r(icalproperty *prop, const char *nam
     return str;
 }
 
-/** @see icalproperty_remove_parameter_by_kind()
- *
- *  @deprecated Please use icalproperty_remove_parameter_by_kind()
- *              instead.
- */
-
-void icalproperty_remove_parameter(icalproperty *prop, icalparameter_kind kind)
-{
-    icalproperty_remove_parameter_by_kind(prop, kind);
-}
-
 /** @brief Remove all parameters with the specified kind.
  *
  *  @param prop   A valid icalproperty.
diff --git a/src/libical/icalproperty.h b/src/libical/icalproperty.h
index 425d1a60..e965008e 100644
--- a/src/libical/icalproperty.h
+++ b/src/libical/icalproperty.h
@@ -58,9 +58,6 @@ LIBICAL_ICAL_EXPORT const char *icalproperty_get_parameter_as_string(icalpropert
 LIBICAL_ICAL_EXPORT char *icalproperty_get_parameter_as_string_r(icalproperty *prop,
                                                                  const char *name);
 
-LIBICAL_ICAL_EXPORT void icalproperty_remove_parameter(icalproperty *prop,
-                                                       icalparameter_kind kind);
-
 LIBICAL_ICAL_EXPORT void icalproperty_remove_parameter_by_kind(icalproperty *prop,
                                                                icalparameter_kind kind);
 
diff --git a/src/libical/icalproperty_cxx.cpp b/src/libical/icalproperty_cxx.cpp
index ac22c9ae..8392414a 100644
--- a/src/libical/icalproperty_cxx.cpp
+++ b/src/libical/icalproperty_cxx.cpp
@@ -124,9 +124,9 @@ std::string ICalProperty::get_parameter_as_string(const std::string &name)
     return static_cast<std::string>(icalproperty_get_parameter_as_string(imp, name.c_str()));
 }
 
-void ICalProperty::remove_parameter(const icalparameter_kind &kind)
+void ICalProperty::remove_parameter_by_kind(const icalparameter_kind &kind)
 {
-    icalproperty_remove_parameter(imp, kind);
+    icalproperty_remove_parameter_by_kind(imp, kind);
 }
 
 int ICalProperty::count_parameters()
diff --git a/src/libical/icalproperty_cxx.h b/src/libical/icalproperty_cxx.h
index af8d1dbc..ad0294ee 100644
--- a/src/libical/icalproperty_cxx.h
+++ b/src/libical/icalproperty_cxx.h
@@ -67,7 +67,7 @@ public:
     void set_parameter(ICalParameter &parameter);
     void set_parameter_from_string(const std::string &name, const std::string &val);
     std::string get_parameter_as_string(const std::string &name);
-    void remove_parameter(const icalparameter_kind &kind);
+    void remove_parameter_by_kind(const icalparameter_kind &kind);
     int count_parameters();
 
     /** Iterate through the parameters */
diff --git a/src/python/LibicalWrap.i b/src/python/LibicalWrap.i
index dfe24b0b..fe5b2efc 100644
--- a/src/python/LibicalWrap.i
+++ b/src/python/LibicalWrap.i
@@ -43,7 +43,7 @@ import Error
 
 typedef int time_t;
 
-// Remove depreciated functions
+// Remove deprecated functions
 %ignore icalproperty_string_to_enum(const char* str);
 %ignore icaltimezone_get_utc_offset(icaltimezone    *zone,
                                     struct icaltimetype *tt,
@@ -53,7 +53,6 @@ typedef int time_t;
                      int        *is_daylight);
 %ignore icaltime_start_doy_of_week(const struct icaltimetype t);
 %ignore icalcomponent_get_span(icalcomponent* comp);
-%ignore icalproperty_remove_parameter(icalproperty* prop, icalparameter_kind kind);
 
 #ifndef _DLOPEN_TEST
 %ignore icalset_register_class(icalset *set);