From kde-commits Sun Dec 31 21:00:38 2006 From: Reinhold Kainhofer Date: Sun, 31 Dec 2006 21:00:38 +0000 To: kde-commits Subject: KDE/kdepimlibs/kcal/libical Message-Id: <1167598838.640476.10814.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=116759885914216 SVN commit 618274 by kainhofe: Forward port of SVN commit 618271 by kainhofe: Remove libical files from the libicalss/ subdir that were not used at all (but generated serious warnings in some distro's build systems... We only need icalclassify from libicalss, nothing else. CCMAIL:133159@bugs.kde.org D src/libicalss/icalcalendar.c D src/libicalss/icalcalendar.h M +0 -51 src/libicalss/icalclassify.c M +0 -6 src/libicalss/icalclassify.h D src/libicalss/icalcluster.c D src/libicalss/icalcluster.h D src/libicalss/icalclusterimpl.h D src/libicalss/icaldirset.c D src/libicalss/icaldirset.h D src/libicalss/icaldirsetimpl.h D src/libicalss/icalfileset.c D src/libicalss/icalfileset.h D src/libicalss/icalfilesetimpl.h D src/libicalss/icalgauge.c D src/libicalss/icalgauge.h D src/libicalss/icalgaugeimpl.h D src/libicalss/icalmessage.c D src/libicalss/icalmessage.h D src/libicalss/icalset.c D src/libicalss/icalset.h D src/libicalss/icalspanlist.c D src/libicalss/icalspanlist.h D src/libicalss/icalsslexer.c D src/libicalss/icalsslexer.l D src/libicalss/icalssyacc.c D src/libicalss/icalssyacc.h D src/libicalss/icalssyacc.y D src/test (directory) D test-data (directory) --- trunk/KDE/kdepimlibs/kcal/libical/src/libicalss/icalclassify.c #618273:618274 @@ -67,59 +67,8 @@ return xnew; } -/* Return a set of components that intersect in time with comp. For -component X and Y to intersect: - X.DTSTART < Y.DTEND && X.DTEND > Y.DTSTART -*/ -icalcomponent* icalclassify_find_overlaps(icalset* set, icalcomponent* comp) -{ - icalcomponent *return_set; - icalcomponent *c; - struct icaltime_span span,compspan; - - icalerror_clear_errno(); - compspan = icalcomponent_get_span(comp); - - if(icalerrno != ICAL_NO_ERROR){ - return 0; - } - - - return_set = icalcomponent_new(ICAL_XROOT_COMPONENT); - - for(c = icalset_get_first_component(set); - c != 0; - c = icalset_get_next_component(set)){ - - icalerror_clear_errno(); - - span = icalcomponent_get_span(c); - - if(icalerrno != ICAL_NO_ERROR){ - continue; - } - - if (compspan.start < span.end && - compspan.end > span.start){ - - icalcomponent *clone = icalcomponent_new_clone(c); - - icalcomponent_add_component(return_set,clone); - } - } - - if(icalcomponent_count_components(return_set,ICAL_ANY_COMPONENT) !=0){ - return return_set; - } else { - icalcomponent_free(return_set); - return 0; - } -} - - - icalproperty* icalclassify_find_attendee(icalcomponent *c, const char* attendee) { --- trunk/KDE/kdepimlibs/kcal/libical/src/libicalss/icalclassify.h #618273:618274 @@ -27,16 +27,10 @@ #define ICALCLASSIFY_H #include "ical.h" -#include "icalset.h" icalproperty_xlicclass icalclassify(icalcomponent* c,icalcomponent* match, const char* user); -icalcomponent* icalclassify_find_overlaps(icalset* set, icalcomponent* comp); - -char* icalclassify_class_to_string(icalproperty_xlicclass c); - - #endif /* ICALCLASSIFY_H*/