diff -u /home/harrie/libical-cvs/libical/src/libical/icalparameter_cxx.cpp src/libical/icalparameter_cxx.cpp --- /home/harrie/libical-cvs/libical/src/libical/icalparameter_cxx.cpp 2002-09-27 00:17:22.000000000 +0200 +++ src/libical/icalparameter_cxx.cpp 2004-05-14 15:30:54.000000000 +0200 @@ -86,15 +86,27 @@ void ICalParameter::set_xname(ICalParameter ¶m, string v){ icalparameter_set_xname(param, v); } +void ICalParameter::set_xname(ICalParameter *param, string v){ + icalparameter_set_xname(*param, v); +} string ICalParameter::get_xname(ICalParameter ¶m){ return (string)icalparameter_get_xname(param); } +string ICalParameter::get_xname(ICalParameter *param){ + return (string)icalparameter_get_xname(*param); +} void ICalParameter::set_xvalue (ICalParameter ¶m, string v){ icalparameter_set_xvalue(param, v); } +void ICalParameter::set_xvalue (ICalParameter *param, string v){ + icalparameter_set_xvalue(*param, v); +} string ICalParameter::get_xvalue(ICalParameter ¶m){ return (string)icalparameter_get_xvalue(param); } +string ICalParameter::get_xvalue(ICalParameter *param){ + return (string)icalparameter_get_xvalue(*param); +} /* Convert enumerations */ string ICalParameter::kind_to_string(icalparameter_kind kind){ diff -u /home/harrie/libical-cvs/libical/src/libical/icalparameter_cxx.h src/libical/icalparameter_cxx.h --- /home/harrie/libical-cvs/libical/src/libical/icalparameter_cxx.h 2002-09-27 00:17:22.000000000 +0200 +++ src/libical/icalparameter_cxx.h 2004-05-14 15:30:54.000000000 +0200 @@ -51,9 +51,13 @@ public: /* Acess the name of an X parameer */ static void set_xname (ICalParameter ¶m, string v); + static void set_xname (ICalParameter *param, string v); static string get_xname(ICalParameter ¶m); + static string get_xname(ICalParameter *param); static void set_xvalue (ICalParameter ¶m, string v); + static void set_xvalue (ICalParameter *param, string v); static string get_xvalue(ICalParameter ¶m); + static string get_xvalue(ICalParameter *param); /* Convert enumerations */ static string kind_to_string(icalparameter_kind kind); (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org diff -u /home/harrie/libical-cvs/libical/src/libical/icalproperty_cxx.cpp src/libical/icalproperty_cxx.cpp --- /home/harrie/libical-cvs/libical/src/libical/icalproperty_cxx.cpp 2002-09-27 00:17:22.000000000 +0200 +++ src/libical/icalproperty_cxx.cpp 2004-07-06 09:28:09.000000000 +0200 @@ -29,6 +29,11 @@ if (!imp) throw icalerrno; } +ICalProperty::ICalProperty(const ICalProperty* v) throw(icalerrorenum){ + imp = icalproperty_new_clone(v->imp); + if (!imp) throw icalerrno; +} + ICalProperty& ICalProperty::operator=(const ICalProperty& v) throw(icalerrorenum) { if (this == &v) return *this; @@ -77,9 +82,15 @@ void ICalProperty::add_parameter(ICalParameter& parameter){ icalproperty_add_parameter(imp, parameter); } +void ICalProperty::add_parameter(ICalParameter* parameter){ + icalproperty_add_parameter(imp, *parameter); +} void ICalProperty::set_parameter(ICalParameter ¶meter){ icalproperty_set_parameter(imp, parameter); } +void ICalProperty::set_parameter(ICalParameter *parameter){ + icalproperty_set_parameter(imp, *parameter); +} void ICalProperty::set_parameter_from_string(string name, string val){ icalproperty_set_parameter_from_string(imp, name, val); } @@ -127,9 +138,15 @@ void ICalProperty::set_x_name(ICalProperty &prop, string name){ icalproperty_set_x_name(prop, name); } +void ICalProperty::set_x_name(ICalProperty *prop, string name){ + icalproperty_set_x_name(*prop, name); +} string ICalProperty::get_x_name(ICalProperty &prop){ return (string)icalproperty_get_x_name(prop); } +string ICalProperty::get_x_name(ICalProperty *prop){ + return (string)icalproperty_get_x_name(*prop); +} icalvalue_kind ICalProperty::icalparameter_value_to_value_kind(icalparameter_value val){ return icalparameter_value_to_value_kind(val); diff -u /home/harrie/libical-cvs/libical/src/libical/icalproperty_cxx.h src/libical/icalproperty_cxx.h --- /home/harrie/libical-cvs/libical/src/libical/icalproperty_cxx.h 2002-09-27 00:17:22.000000000 +0200 +++ src/libical/icalproperty_cxx.h 2004-07-06 09:26:51.000000000 +0200 @@ -23,6 +23,7 @@ public: ICalProperty(); ICalProperty(const ICalProperty&) throw(icalerrorenum); + ICalProperty(const ICalProperty*) throw(icalerrorenum); ICalProperty& operator=(const ICalProperty&) throw(icalerrorenum); ~ICalProperty(); @@ -44,7 +45,9 @@ int isa_property(void* property); void add_parameter(ICalParameter& parameter); + void add_parameter(ICalParameter* parameter); void set_parameter(ICalParameter& parameter); + void set_parameter(ICalParameter* parameter); void set_parameter_from_string(string name, string val); string get_parameter_as_string(string name); void remove_parameter(icalparameter_kind kind); @@ -70,7 +73,9 @@ public: /* Deal with X properties */ static void set_x_name(ICalProperty &prop, string name); + static void set_x_name(ICalProperty *prop, string name); static string get_x_name(ICalProperty &prop); + static string get_x_name(ICalProperty *prop); static icalvalue_kind icalparameter_value_to_value_kind(icalparameter_value val);