[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kdepim-3.5.5+/libkcal
From: Reinhold Kainhofer <reinhold () kainhofer ! com>
Date: 2006-12-31 21:00:11
Message-ID: 1167598811.667381.10569.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 618273 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
M +0 -1 branches/work/kdepim-3.5.5+/libkcal/icalformatimpl.cpp
M +0 -1 branches/work/kdepim-3.5.5+/libkcal/icalformatimpl.h
M +4 -38 branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/Makefile.am \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalcalendar.c \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalcalendar.h \
M +0 -51 branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalclassify.c \
M +0 -6 branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalclassify.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalcluster.c \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalcluster.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalclusterimpl.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icaldirset.c \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icaldirset.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icaldirsetimpl.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalfileset.c \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalfileset.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalfilesetimpl.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalgauge.c \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalgauge.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalgaugeimpl.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalmessage.c \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalmessage.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalset.c
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalset.h
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalspanlist.c \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalspanlist.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalsslexer.c \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalsslexer.l \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalssyacc.c \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalssyacc.h \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalssyacc.y \
D branches/work/kdepim-3.5.5+/libkcal/libical/src/test (directory)
--- branches/work/kdepim-3.5.5+/libkcal/icalformatimpl.cpp #618272:618273
@@ -31,7 +31,6 @@
extern "C" {
#include <ical.h>
- #include <icalss.h>
#include <icalparser.h>
#include <icalrestriction.h>
}
--- branches/work/kdepim-3.5.5+/libkcal/icalformatimpl.h #618272:618273
@@ -31,7 +31,6 @@
extern "C" {
#include <ical.h>
- #include <icalss.h>
}
namespace KCal {
--- branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/Makefile.am \
#618272:618273 @@ -8,45 +8,14 @@
INCLUDES = -I../libical -I$(srcdir)/../libical
libicalss_la_SOURCES = \
- icalcalendar.c \
- icalcalendar.h \
icalclassify.c \
- icalclassify.h \
- icalcluster.c \
- icalcluster.h \
- icalclusterimpl.h \
- icalgauge.c \
- icalgauge.h \
- icalgaugeimpl.h \
- icaldirset.c \
- icaldirset.h \
- icaldirsetimpl.h \
- icalfileset.c \
- icalfileset.h \
- icalfilesetimpl.h \
- icalset.c \
- icalset.h \
- icalssyacc.h \
- icalspanlist.c \
- icalspanlist.h \
- icalmessage.c \
- icalmessage.h \
- icalsslexer.c \
- icalssyacc.c
+ icalclassify.h
# We don't need icalss.h, but it needs to be built...
libicalss_la_COMPILE_FIRST = ../libical/ical.h icalss.h
COMBINEDHEADERS = \
- $(srcdir)/icalgauge.h \
- $(srcdir)/icalset.h \
- $(srcdir)/icalcluster.h \
- $(srcdir)/icalfileset.h \
- $(srcdir)/icaldirset.h \
- $(srcdir)/icalcalendar.h \
- $(srcdir)/icalclassify.h \
- $(srcdir)/icalspanlist.h \
- $(srcdir)/icalmessage.h
+ $(srcdir)/icalclassify.h
icalss.h: $(COMBINEDHEADERS)
echo '#ifdef __cplusplus' > icalss.h
@@ -63,10 +32,7 @@
echo '}' >> icalss.h
echo '#endif' >> icalss.h
-noinst_HEADERS = icalss.h icalcalendar.h icalclassify.h icalcluster.h \
- icaldirset.h icaldirsetimpl.h icalfileset.h icalfilesetimpl.h \
- icalgauge.h icalgaugeimpl.h icalmessage.h icalset.h \
- icalspanlist.h icalssyacc.h
+noinst_HEADERS = icalss.h icalclassify.h
-CLEANFILES = y.output icalss.h
+CLEANFILES = icalss.h
--- branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalclassify.c \
#618272:618273 @@ -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)
{
--- branches/work/kdepim-3.5.5+/libkcal/libical/src/libicalss/icalclassify.h \
#618272:618273 @@ -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*/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic