From: <svn...@op...> - 2009-03-31 22:12:51
|
Author: cdfrey Date: Wed Apr 1 00:12:31 2009 New Revision: 5504 URL: http://www.opensync.org/changeset/5504 Log: Removed deleted API functions and types from python wrapper Modified: trunk/wrapper/opensync-format.i trunk/wrapper/opensync-group.i trunk/wrapper/opensync-helper.i trunk/wrapper/opensync-plugin.i trunk/wrapper/opensync.i Modified: trunk/wrapper/opensync-format.i ============================================================================== --- trunk/wrapper/opensync-format.i Wed Apr 1 00:11:36 2009 (r5503) +++ trunk/wrapper/opensync-format.i Wed Apr 1 00:12:31 2009 (r5504) @@ -79,17 +79,6 @@ osync_converter_path_add_edge(self, edge); } - int num_edges() { - return osync_converter_path_num_edges(self); - } - - FormatConverter *nth_edge(unsigned int nth) { - FormatConverter *ret = osync_converter_path_nth_edge(self, nth); - if (ret) - osync_converter_ref(ret); - return ret; - } - const char *get_config() { return osync_converter_path_get_config(self); } @@ -105,7 +94,6 @@ __oldinit = __init__ def __init__(self, *args): self.__oldinit(*args) - self.edges = _ListWrapper(self.num_edges, self.nth_edge) %} } @@ -188,17 +176,6 @@ return ret; } - int num_objformats() { - return osync_format_env_num_objformats(self); - } - - ObjFormat *nth_objformat(int nth) { - ObjFormat *ret = osync_format_env_nth_objformat(self, nth); - if (ret) - osync_objformat_ref(ret); - return ret; - } - void register_converter(FormatConverter *converter) { osync_format_env_register_converter(self, converter); } @@ -210,17 +187,6 @@ return ret; } - int num_converters() { - return osync_format_env_num_converters(self); - } - - FormatConverter *nth_converter(int nth) { - FormatConverter *ret = osync_format_env_nth_converter(self, nth); - if (ret) - osync_converter_ref(ret); - return ret; - } - /* void register_filter(CustomFilter *filter) { osync_format_env_register_filter(self, filter); @@ -306,8 +272,6 @@ __oldinit = __init__ def __init__(self, *args): self.__oldinit(*args) - self.objformats = _ListWrapper(self.num_objformats, self.nth_objformat) - self.converters = _ListWrapper(self.num_converters, self.nth_converter) /* self.filters = _ListWrapper(self.num_filters, self.nth_filter) */ Modified: trunk/wrapper/opensync-group.i ============================================================================== --- trunk/wrapper/opensync-group.i Wed Apr 1 00:11:36 2009 (r5503) +++ trunk/wrapper/opensync-group.i Wed Apr 1 00:12:31 2009 (r5504) @@ -38,23 +38,11 @@ osync_group_env_remove_group(self, group); } - int num_groups() { - return osync_group_env_num_groups(self); - } - - Group *nth_group(int nth) { - Group *group = osync_group_env_nth_group(self, nth); - if (group) - osync_group_ref(group); - return group; - } - %pythoncode %{ # extend the SWIG-generated constructor, so that we can setup our list-wrapper classes __oldinit = __init__ def __init__(self, *args): self.__oldinit(*args) - self.groups = _ListWrapper(self.num_groups, self.nth_group) %} } @@ -144,17 +132,6 @@ return member; } - Member *nth_member(int nth) { - Member *member = osync_group_nth_member(self, nth); - if (member) - osync_member_ref(member); - return member; - } - - int num_members() { - return osync_group_num_members(self); - } - const char *get_configdir() { return osync_group_get_configdir(self); } @@ -163,14 +140,6 @@ osync_group_set_configdir(self, directory); } - int num_objtypes() { - return osync_group_num_objtypes(self); - } - - const char *nth_objtype(int nth) { - return osync_group_nth_objtype(self, nth); - } - void set_objtype_enabled(const char *objtype, bool enabled) { osync_group_set_objtype_enabled(self, objtype, enabled); } @@ -241,8 +210,6 @@ __oldinit = __init__ def __init__(self, *args): self.__oldinit(*args) - self.members = _ListWrapper(self.num_members, self.nth_member) - self.objtypes = _ListWrapper(self.num_objtypes, self.nth_objtype) /* self.filters = _ListWrapper(self.num_filters, self.nth_filter) */ @@ -366,14 +333,6 @@ osync_member_add_objtype_sink(self, sink); } - int num_objtypes() { - return osync_member_num_objtypes(self); - } - - const char *nth_objtype(int nth) { - return osync_member_nth_objtype(self, nth); - } - bool objtype_enabled(const char *objtype) { return osync_member_objtype_enabled(self, objtype); } @@ -412,6 +371,5 @@ __oldinit = __init__ def __init__(self, *args): self.__oldinit(*args) - self.objtypes = _ListWrapper(self.num_objtypes, self.nth_objtype) %} } Modified: trunk/wrapper/opensync-helper.i ============================================================================== --- trunk/wrapper/opensync-helper.i Wed Apr 1 00:11:36 2009 (r5503) +++ trunk/wrapper/opensync-helper.i Wed Apr 1 00:12:31 2009 (r5504) @@ -43,10 +43,6 @@ return TRUE; } - static int hashtable_num_entries(OSyncHashTable *hashtable) { - return osync_hashtable_num_entries(hashtable); - } - void hashtable_update_change(OSyncHashTable *hashtable, Change *change) { osync_hashtable_update_change(hashtable, change); } Modified: trunk/wrapper/opensync-plugin.i ============================================================================== --- trunk/wrapper/opensync-plugin.i Wed Apr 1 00:11:36 2009 (r5503) +++ trunk/wrapper/opensync-plugin.i Wed Apr 1 00:12:31 2009 (r5504) @@ -345,14 +345,6 @@ osync_objtype_sink_set_name(self, name); } - unsigned int num_objformats() { - return osync_objtype_sink_num_objformat_sinks(self); - } - - ObjFormatSink *nth_objformat(int nth) { - return osync_objtype_sink_nth_objformat_sink(self, nth); - } - ObjFormatSink *find_objformat(ObjFormat *objformat) { return osync_objtype_sink_find_objformat_sink(self, objformat); } Modified: trunk/wrapper/opensync.i ============================================================================== --- trunk/wrapper/opensync.i Wed Apr 1 00:11:36 2009 (r5503) +++ trunk/wrapper/opensync.i Wed Apr 1 00:12:31 2009 (r5504) @@ -44,7 +44,6 @@ typedef OSyncMember Member; typedef OSyncObjFormat ObjFormat; typedef OSyncObjFormatSink ObjFormatSink; -typedef OSyncObjTypeSinkFunctions ObjTypeSinkFunctions; typedef OSyncObjTypeSink ObjTypeSink; typedef OSyncPluginConfig PluginConfig; typedef OSyncPluginEnv PluginEnv; |