New lib ical.Some minor changes as well.

12 files changed, 1415 insertions, 1203 deletions

diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 7a85e74..7d23619 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -1,349 +1,350 @@
 /*
     This file is part of libkcal.
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef CALENDAR_H
 #define CALENDAR_H
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qdatetime.h>
 #include <qptrlist.h>
 #include <qdict.h>
 
 #include "customproperties.h"
 #include "event.h"
 #include "todo.h"
 #include "journal.h"
 
 #define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */
 
 class KConfig;
 
 namespace KCal {
 
 class CalFilter;
 
 /**
   This is the main "calendar" object class for KOrganizer.  It holds
   information like all appointments/events, user information, etc. etc.
   one calendar is associated with each CalendarView (@see calendarview.h).
   This is an abstract base class defining the interface to a calendar. It is
   implemented by subclasses like @see CalendarLocal, which use different
   methods to store and access the data.
 
   Ownership of events etc. is handled by the following policy: As soon as an
   event (or any other subclass of IncidenceBase) object is added to the
   Calendar by addEvent() it is owned by the Calendar object. The Calendar takes
   care of deleting it. All Events returned by the query functions are returned
   as pointers, that means all changes to the returned events are immediately
   visible in the Calendar. You shouldn't delete any Event object you get from
   Calendar.
 */
 class Calendar : public QObject, public CustomProperties,
                  public IncidenceBase::Observer
 {
     Q_OBJECT
 public:
     Calendar();
     Calendar(const QString &timeZoneId);
     virtual ~Calendar();
     void deleteIncidence(Incidence *in);
     /**
       Clears out the current calendar, freeing all used memory etc.
     */
     virtual void close() = 0;
   
     /**
       Sync changes in memory to persistant storage.
     */
     virtual void save() = 0;
 
     virtual bool isSaving() { return false; }
 
     /**
       Return the owner of the calendar's full name.
     */
     const QString &getOwner() const;
     /**
       Set the owner of the calendar. Should be owner's full name.
     */
     void setOwner( const QString &os );
     /**
       Return the email address of the calendar owner.
     */
     const QString &getEmail();
     /**
       Set the email address of the calendar owner.
     */
     void setEmail( const QString & );
   
     /**
       Set time zone from a timezone string (e.g. -2:00)
     */
     void setTimeZone( const QString &tz );
     /**
       Set time zone from a minutes value (e.g. -60)
     */
     void setTimeZone( int tz );
     /**
       Return time zone as offest in minutes.
     */
     int getTimeZone() const;
     /**
       Compute an ISO 8601 format string from the time zone.
     */
     QString getTimeZoneStr() const;
     /**
       Set time zone id (see /usr/share/zoneinfo/zone.tab for list of legal
       values).
     */
     void setTimeZoneId( const QString & );
     /**
       Return time zone id.
     */
     QString timeZoneId() const;
     /**
       Use local time, not UTC or a time zone.
     */
     void setLocalTime();
     /**
       Return whether local time is being used.
     */
     bool isLocalTime() const;
   
     /**
       Add an incidence to calendar.
       
       @return true on success, false on error.
     */
     virtual bool addIncidence( Incidence * );  
     /**
       Return filtered list of all incidences of this calendar.
     */
     virtual QPtrList<Incidence> incidences();
 
     /**
       Return unfiltered list of all incidences of this calendar.
     */
     virtual QPtrList<Incidence> rawIncidences();
 
     /**
       Adds a Event to this calendar object.
       @param anEvent a pointer to the event to add
       
       @return true on success, false on error.
     */
     virtual bool addEventNoDup( Event *event ) = 0;
+    virtual bool addAnniversaryNoDup( Event *event ) = 0;
     virtual bool addEvent( Event *anEvent ) = 0;
     /**
       Delete event from calendar.
     */
     virtual void deleteEvent( Event * ) = 0;
     /**
       Retrieves an event on the basis of the unique string ID.
     */
     virtual Event *event( const QString &UniqueStr ) = 0;
     virtual Event *event( int ) = 0;
     /**
       Builds and then returns a list of all events that match for the
       date specified. useful for dayView, etc. etc.
       The calendar filter is applied.
     */
     QPtrList<Event> events( const QDate &date, bool sorted = false);
     /**
       Get events, which occur on the given date.
       The calendar filter is applied.
     */
     QPtrList<Event> events( const QDateTime &qdt );
     /**
       Get events in a range of dates. If inclusive is set to true, only events
       are returned, which are completely included in the range.
       The calendar filter is applied.
     */
     QPtrList<Event> events( const QDate &start, const QDate &end,
                             bool inclusive = false);
     /**
       Return filtered list of all events in calendar.
     */
     virtual QPtrList<Event> events();
     /**
       Return unfiltered list of all events in calendar.
     */
     virtual QPtrList<Event> rawEvents() = 0;
 
     /**
       Add a todo to the todolist.
       
       @return true on success, false on error.
     */
     virtual bool addTodo( Todo *todo ) = 0;
     virtual bool addTodoNoDup( Todo *todo ) = 0;
     /**
       Remove a todo from the todolist.
     */
     virtual void deleteTodo( Todo * ) = 0;
     virtual void deleteJournal( Journal * ) = 0;
     /**
       Return filterd list of todos.
     */
     virtual QPtrList<Todo> todos();
     /**
       Searches todolist for an event with this unique string identifier,
       returns a pointer or null.
     */
     virtual Todo *todo( const QString &uid ) = 0;
     virtual Todo *todo( int ) = 0;
     /**
       Returns list of todos due on the specified date.
     */
     virtual QPtrList<Todo> todos( const QDate &date ) = 0;
     /**
       Return unfiltered list of todos.
     */
     virtual QPtrList<Todo> rawTodos() = 0;
 
     /**
       Add a Journal entry to calendar.
       
       @return true on success, false on error.
     */
     virtual bool addJournal( Journal * ) = 0;
     /**
       Return Journal for given date.
     */
     virtual Journal *journal( const QDate & ) = 0;
     /**
       Return Journal with given UID.
     */
     virtual Journal *journal( const QString &UID ) = 0;
     /**
       Return list of all Journal entries.
     */
     virtual QPtrList<Journal> journals() = 0;
 
     /**
       Searches all incidence types for an incidence with this unique
       string identifier, returns a pointer or null.
     */
     Incidence* incidence( const QString&UID );
 
     /**
       Setup relations for an incidence.
     */
     virtual void setupRelations( Incidence * );
     /**
       Remove all relations to an incidence
     */
     virtual void removeRelations( Incidence * );
     
     /**
       Set calendar filter, which filters events for the events() functions.
       The Filter object is owned by the caller.
     */
     void setFilter( CalFilter * );
     /**
       Return calendar filter.
     */
     CalFilter *filter();
     virtual QDateTime  nextAlarm(  int daysTo ) = 0;
     virtual QString  nextSummary( ) const  = 0;
     virtual void reInitAlarmSettings() = 0;
     virtual QDateTime nextAlarmEventDateTime()  const = 0;
     virtual void  checkAlarmForIncidence( Incidence *, bool )  = 0;
     /**
       Return all alarms, which ocur in the given time interval.
     */
     virtual Alarm::List alarms( const QDateTime &from,
                                 const QDateTime &to ) = 0;
 
     class Observer {
     public:
         virtual void calendarModified( bool, Calendar * ) = 0;
     };
   
     void registerObserver( Observer * );
 
     void setModified( bool );
 
     /**
       Set product id returned by loadedProductId(). This function is only
       useful for the calendar loading code.
     */
     void setLoadedProductId( const QString & );
     /**
       Return product id taken from file that has been loaded. Returns
       QString::null, if no calendar has been loaded.
     */
     QString loadedProductId();
 
   signals:
     void calendarChanged();
     void calendarSaved();
     void calendarLoaded();
     void addAlarm(const QDateTime &qdt, const QString &noti  );
     void removeAlarm(const QDateTime &qdt, const QString &noti  );
 
   protected:
     /**
       Get unfiltered events, which occur on the given date.
     */
     virtual QPtrList<Event> rawEventsForDate( const QDateTime &qdt ) = 0;
     /**
       Get unfiltered events, which occur on the given date.
     */
     virtual QPtrList<Event> rawEventsForDate( const QDate &date,
                                               bool sorted = false ) = 0;  
     /**
       Get events in a range of dates. If inclusive is set to true, only events
       are returned, which are completely included in the range.
     */
     virtual QPtrList<Event> rawEvents( const QDate &start, const QDate &end,
                                        bool inclusive = false ) = 0; 
     Incidence *mNextAlarmIncidence;
 
 private:
     void init();
   
     QString mOwner;        // who the calendar belongs to
     QString mOwnerEmail;   // email address of the owner
     int mTimeZone;         // timezone OFFSET from GMT (MINUTES)
     bool mLocalTime;       // use local time, not UTC or a time zone
 
     CalFilter *mFilter;
     CalFilter *mDefaultFilter;
     
     QString mTimeZoneId;
 
     Observer *mObserver;
     bool mNewObserver;
     
     bool mModified;
 
     QString mLoadedProductId;
 
     // This list is used to put together related todos
     QDict<Incidence> mOrphans;
     QDict<Incidence> mOrphanUids;
 };
   
 }
 
 #endif
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 8ff8b14..3c572f0 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -1,655 +1,686 @@
 /*
     This file is part of libkcal.
 
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001,2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qptrlist.h>
 
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 
 #include "vcaldrag.h"
 #include "vcalformat.h"
 #include "icalformat.h"
 #include "exceptions.h"
 #include "incidence.h"
 #include "journal.h"
 #include "filestorage.h"
 #include "calfilter.h"
 
 #include "calendarlocal.h"
 
 // #ifndef DESKTOP_VERSION
 // #include <qtopia/alarmserver.h> 
 // #endif
 using namespace KCal;
 
 CalendarLocal::CalendarLocal()
   : Calendar()
 {
   init();
 }
 
 CalendarLocal::CalendarLocal(const QString &timeZoneId)
   : Calendar(timeZoneId)
 {
   init();
 }
 
 void CalendarLocal::init()
 {
     mNextAlarmIncidence = 0;
 }
 
 
 CalendarLocal::~CalendarLocal()
 {
   close();
 }
 
 bool CalendarLocal::load( const QString &fileName )
 {
   FileStorage storage( this, fileName );
   return storage.load();
 }
 
 bool CalendarLocal::save( const QString &fileName, CalFormat *format )
 {
   FileStorage storage( this, fileName, format );
   return storage.save();
 }
 
 void CalendarLocal::close()
 {
   mEventList.setAutoDelete( true );
   mTodoList.setAutoDelete( true );
   mJournalList.setAutoDelete( false );
 
   mEventList.clear();
   mTodoList.clear();
   mJournalList.clear();
 
   mEventList.setAutoDelete( false );
   mTodoList.setAutoDelete( false );
   mJournalList.setAutoDelete( false );
 
   setModified( false );
 }
+    
+bool CalendarLocal::addAnniversaryNoDup( Event *event )
+{
+    QString cat;
+    bool isBirthday = true;
+    if(  event->categoriesStr() == i18n( "Anniversary" ) ) {
+        isBirthday = false;
+        cat = i18n( "Anniversary" );
+    } else if(  event->categoriesStr() == i18n( "Birthday" ) ) {
+        isBirthday = true;
+        cat = i18n( "Birthday" );
+    } else {
+        qDebug("addAnniversaryNoDup called without fitting category! ");
+        return false;
+    }
+    Event * eve;
+    for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
+        if ( !(eve->categories().contains( cat ) ))
+            continue;
+        // now we have an event with fitting category
+        if ( eve->dtStart().date() != event->dtStart().date() )
+            continue;
+        // now we have an event with fitting category+date
+        if ( eve->summary() != event->summary() )
+            continue;
+        // now we have an event with fitting category+date+summary
+        return false;
+    }
+    return addEvent( event );
+
+}
 bool CalendarLocal::addEventNoDup( Event *event )
 {
     Event * eve;
     for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
         if ( *eve == *event ) {
             //qDebug("CalendarLocal::Duplicate event found! Not inserted! ");
             return false;
         }
     }
     return addEvent( event );
 }
 
 bool CalendarLocal::addEvent( Event *event )
 {
   insertEvent( event );
 
   event->registerObserver( this );
 
   setModified( true );
 
   return true;
 }
 
 void CalendarLocal::deleteEvent( Event *event )
 {
  
 
   if ( mEventList.removeRef( event ) ) {
     setModified( true );
   }
 }
 
 
 Event *CalendarLocal::event( const QString &uid )
 {
 
   Event *event;
 
   for ( event = mEventList.first(); event; event = mEventList.next() ) {
     if ( event->uid() == uid ) {
       return event;
     }
   }
 
   return 0;
 }
 bool CalendarLocal::addTodoNoDup( Todo *todo )
 {
   Todo * eve;
     for ( eve = mTodoList.first(); eve ; eve = mTodoList.next() ) {
         if ( *eve == *todo ) {
             //qDebug("duplicate todo found! not inserted! ");
             return false;
         }
     }
     return addTodo( todo );
 }
 bool CalendarLocal::addTodo( Todo *todo )
 {
   mTodoList.append( todo );
 
   todo->registerObserver( this );
 
   // Set up subtask relations
   setupRelations( todo );
 
   setModified( true );
 
   return true;
 }
 
 void CalendarLocal::deleteTodo( Todo *todo )
 {
   // Handle orphaned children
   removeRelations( todo );
 
   if ( mTodoList.removeRef( todo ) ) {
     setModified( true );
   }
 }
 
 QPtrList<Todo> CalendarLocal::rawTodos()
 {
   return mTodoList;
 }
 Todo *CalendarLocal::todo( int id )
 {
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
     if ( todo->zaurusId() == id ) return todo;
   }
 
   return 0;
 }
 
 Event *CalendarLocal::event( int id )
 {
   Event *todo;
   for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
     if ( todo->zaurusId() == id ) return todo;
   }
 
   return 0;
 }
 Todo *CalendarLocal::todo( const QString &uid )
 {
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
     if ( todo->uid() == uid ) return todo;
   }
 
   return 0;
 }
 QString CalendarLocal::nextSummary() const
 {
     return mNextSummary;
 }
 QDateTime CalendarLocal::nextAlarmEventDateTime()  const
 {
     return mNextAlarmEventDateTime;
 }
 void  CalendarLocal::checkAlarmForIncidence( Incidence * incidence, bool deleted)
 {
     //mNextAlarmIncidence
     //mNextAlarmDateTime
     //return mNextSummary;
     //return mNextAlarmEventDateTime;
     bool newNextAlarm = false; 
     bool computeNextAlarm = false;
     bool ok;
     int offset;
     QDateTime nextA;
     // QString nextSum;
     //QDateTime nextEvent;
     if ( mNextAlarmIncidence == 0 || incidence == 0 ) {
         computeNextAlarm = true;
     } else {
         if ( ! deleted ) {
             nextA = incidence->getNextAlarmDateTime(& ok, &offset ) ;
             if ( ok ) {
                 if ( nextA < mNextAlarmDateTime  ) {
                     deRegisterAlarm();
                     mNextAlarmDateTime = nextA;
                     mNextSummary  = incidence->summary();
                     mNextAlarmEventDateTime = nextA.addSecs(offset ) ; 
                     mNextAlarmEventDateTimeString = KGlobal::locale()->formatDateTime(mNextAlarmEventDateTime);
                     newNextAlarm = true;
                     mNextAlarmIncidence = incidence;
                 } else {
                     if ( incidence == mNextAlarmIncidence ) {
                         computeNextAlarm = true;
                     }
                 }
             } else {
                 if ( mNextAlarmIncidence == incidence ) {
                     computeNextAlarm = true;
                 }
             }
         } else { // deleted
             if ( incidence == mNextAlarmIncidence ) {
                 computeNextAlarm = true;
             }
         }
     }
     if ( computeNextAlarm ) {
         deRegisterAlarm();
         nextA = nextAlarm( 1000 );  
         if (! mNextAlarmIncidence ) {
             return;
         }
         newNextAlarm = true;
     }
     if ( newNextAlarm )
         registerAlarm();
 }
 QString CalendarLocal:: getAlarmNotification()
 { 
     QString ret;
     // this should not happen
     if (! mNextAlarmIncidence ) 
             return "cal_alarm"+ mNextSummary.left( 25 )+"\n"+mNextAlarmEventDateTimeString;
     Alarm* alarm =  mNextAlarmIncidence->alarms().first();
     if ( alarm->type() == Alarm::Procedure ) {
         ret = "proc_alarm" + alarm->programFile()+"+++";
     } else {
         ret = "audio_alarm" +alarm->audioFile() +"+++";
     }
     ret += "cal_alarm"+ mNextSummary.left( 25 );
     if ( mNextSummary.length() > 25 )
         ret += "\n" + mNextSummary.mid(25, 25 );
     ret+= "\n"+mNextAlarmEventDateTimeString;
     return ret;
 }
 
 void CalendarLocal::registerAlarm()
 {
     mLastAlarmNotificationString = getAlarmNotification();
     // qDebug("++ register Alarm %s %s",mNextAlarmDateTime.toString().latin1(), mLastAlarmNotificationString.latin1() );
     emit addAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString );
 // #ifndef DESKTOP_VERSION
 //     AlarmServer::addAlarm ( mNextAlarmDateTime,"koalarm", mLastAlarmNotificationString.latin1() );
 // #endif     
 }
 void CalendarLocal::deRegisterAlarm()
 {
     if ( mLastAlarmNotificationString.isNull() )
         return;
     //qDebug("-- deregister Alarm %s ", mLastAlarmNotificationString.latin1() );
 
     emit removeAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString );
 // #ifndef DESKTOP_VERSION
 //     AlarmServer::deleteAlarm (mNextAlarmDateTime ,"koalarm" ,mLastAlarmNotificationString.latin1() );
 // #endif     
 }
 
 QPtrList<Todo> CalendarLocal::todos( const QDate &date )
 {
   QPtrList<Todo> todos;
 
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
     if ( todo->hasDueDate() && todo->dtDue().date() == date ) {
       todos.append( todo );
     }
   }
 
  filter()->apply( &todos );
   return todos;
 }
 void CalendarLocal::reInitAlarmSettings()
 {
     if ( !mNextAlarmIncidence  ) {
         nextAlarm( 1000 );
     }
     deRegisterAlarm();
     mNextAlarmIncidence = 0;
     checkAlarmForIncidence( 0, false );
     
 }
 
 
 
 QDateTime  CalendarLocal::nextAlarm( int daysTo )
 {
   QDateTime nextA = QDateTime::currentDateTime().addDays( daysTo );
     QDateTime start = QDateTime::currentDateTime().addSecs( 30 );
     QDateTime next;
     Event *e;
     bool ok;
     bool found = false;
     int offset;
     mNextAlarmIncidence = 0;
     for( e = mEventList.first(); e; e = mEventList.next() ) {
         next = e->getNextAlarmDateTime(& ok, &offset ) ;
         if ( ok ) {
             if (  next < nextA ) {
                 nextA = next;
                 found = true;
                 mNextSummary = e->summary();
                 mNextAlarmEventDateTime = next.addSecs(offset ) ; 
                 mNextAlarmIncidence = (Incidence *) e;
             }
         }
     }
     Todo *t;
     for( t = mTodoList.first(); t; t = mTodoList.next() ) {
         next = t->getNextAlarmDateTime(& ok, &offset ) ;
         if ( ok ) {
             if (  next < nextA ) {
                 nextA = next;
                 found = true;
                 mNextSummary = t->summary();
                 mNextAlarmEventDateTime = next.addSecs(offset ); 
                 mNextAlarmIncidence = (Incidence *) t;
             }
         }
     } 
     if ( mNextAlarmIncidence  ) {
         mNextAlarmEventDateTimeString = KGlobal::locale()->formatDateTime(mNextAlarmEventDateTime);
         mNextAlarmDateTime = nextA;
     }
     return nextA;
 }
 Alarm::List CalendarLocal::alarmsTo( const QDateTime &to )
 {
   return alarms( QDateTime( QDate( 1900, 1, 1 ) ), to );
 }
 
 Alarm::List CalendarLocal::alarms( const QDateTime &from, const QDateTime &to )
 {
   kdDebug(5800) << "CalendarLocal::alarms(" << from.toString() << " - "
                 << to.toString() << ")\n";
 
   Alarm::List alarms;
 
   Event *e;
 
   for( e = mEventList.first(); e; e = mEventList.next() ) {
     if ( e->doesRecur() ) appendRecurringAlarms( alarms, e, from, to );
     else appendAlarms( alarms, e, from, to );
   }
 
   Todo *t;
   for( t = mTodoList.first(); t; t = mTodoList.next() ) {
     appendAlarms( alarms, t, from, to );
   }
 
   return alarms;
 }
 
 void CalendarLocal::appendAlarms( Alarm::List &alarms, Incidence *incidence,
                                   const QDateTime &from, const QDateTime &to )
 {
   QPtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
   for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) {
 //    kdDebug(5800) << "CalendarLocal::appendAlarms() '" << alarm->text()
 //                  << "': " << alarm->time().toString() << " - " << alarm->enabled() << endl;
     if ( alarm->enabled() ) {
       if ( alarm->time() >= from && alarm->time() <= to ) {
         kdDebug(5800) << "CalendarLocal::appendAlarms() '" << incidence->summary()
                       << "': " << alarm->time().toString() << endl;
         alarms.append( alarm );
       }
     }
   }
 }
 
 void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms,
                                            Incidence *incidence,
                                            const QDateTime &from,
                                            const QDateTime &to )
 {
  
   QPtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
   QDateTime qdt;
   for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) {
     if (incidence->recursOn(from.date())) {
       qdt.setTime(alarm->time().time());
       qdt.setDate(from.date());
     }
     else qdt = alarm->time();
     // qDebug("1 %s %s %s", qdt.toString().latin1(),  from.toString().latin1(), to.toString().latin1());
     if ( alarm->enabled() ) {
       if ( qdt >= from && qdt <= to ) {
         alarms.append( alarm );
       }
     }
   }
 }
 
 
 /****************************** PROTECTED METHODS ****************************/
 
 // after changes are made to an event, this should be called.
 void CalendarLocal::update( IncidenceBase *incidence )
 {
   incidence->setSyncStatus( Event::SYNCMOD );
   incidence->setLastModified( QDateTime::currentDateTime() );
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
   // need to verify with ical documentation.
 
   setModified( true );
 }
 
 void CalendarLocal::insertEvent( Event *event )
 {
   if ( mEventList.findRef( event ) < 0 ) mEventList.append( event );
 }
 
 
 QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
 {
   QPtrList<Event> eventList;
 
   Event *event;
   for( event = mEventList.first(); event; event = mEventList.next() ) {
     if ( event->doesRecur() ) {
       if ( event->isMultiDay() ) {
         int extraDays = event->dtStart().date().daysTo( event->dtEnd().date() );
         int i;
         for ( i = 0; i <= extraDays; i++ ) {
             if ( event->recursOn( qd.addDays( -i ) ) ) {
                 eventList.append( event );
                 break;
             }
         }
       } else {
         if ( event->recursOn( qd ) )
           eventList.append( event );
       }
     } else {
       if ( event->dtStart().date() <= qd && event->dtEnd().date() >= qd ) {
         eventList.append( event );
       }
     }
   }
 
   if ( !sorted ) {
     return eventList;
   }
 
   //  kdDebug(5800) << "Sorting events for date\n" << endl;
   // now, we have to sort it based on dtStart.time()
   QPtrList<Event> eventListSorted;
   Event *sortEvent;
   for ( event = eventList.first(); event; event = eventList.next() ) {
     sortEvent = eventListSorted.first();
     int i = 0;
     while ( sortEvent && event->dtStart().time()>=sortEvent->dtStart().time() )
     {
       i++;
       sortEvent = eventListSorted.next();
     }
     eventListSorted.insert( i, event );
   }
   return eventListSorted;
 }
 
 
 QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
                                           bool inclusive )
 {
   Event *event = 0;
 
   QPtrList<Event> eventList;
 
   // Get non-recurring events
   for( event = mEventList.first(); event; event = mEventList.next() ) {
     if ( event->doesRecur() ) {
       QDate rStart = event->dtStart().date();
       bool found = false;
       if ( inclusive ) {
         if ( rStart >= start && rStart <= end ) {
           // Start date of event is in range. Now check for end date.
           // if duration is negative, event recurs forever, so do not include it.
           if ( event->recurrence()->duration() == 0 ) {  // End date set
             QDate rEnd = event->recurrence()->endDate();
             if ( rEnd >= start && rEnd <= end ) {  // End date within range
               found = true;
             }
           } else if ( event->recurrence()->duration() > 0 ) {  // Duration set
             // TODO: Calculate end date from duration. Should be done in Event
             // For now exclude all events with a duration.
           }
         }
       } else {
           bool founOne;
           QDate next = event->getNextOccurence( start, &founOne ).date();
           if ( founOne ) {
               if ( next <= end ) {
                   found = true;
               }
           }
           
           /*
           // crap !!!
         if ( rStart <= end ) {  // Start date not after range
           if ( rStart >= start ) {  // Start date within range
             found = true;
           } else if ( event->recurrence()->duration() == -1 ) {  // Recurs forever
             found = true;
           } else if ( event->recurrence()->duration() == 0 ) {  // End date set
             QDate rEnd = event->recurrence()->endDate();
             if ( rEnd >= start && rEnd <= end ) {  // End date within range
               found = true;
             }
           } else {  // Duration set
             // TODO: Calculate end date from duration. Should be done in Event
             // For now include all events with a duration.
             found = true;
           }
         }
           */
 
       }
 
       if ( found ) eventList.append( event );
     } else {
       QDate s = event->dtStart().date();
       QDate e = event->dtEnd().date();
 
       if ( inclusive ) {
         if ( s >= start && e <= end ) {
           eventList.append( event );
         }
       } else {
         if ( ( s >= start && s <= end ) || ( e >= start && e <= end ) ) {
           eventList.append( event );
         }
       }
     }
   }
 
   return eventList;
 }
 
 QPtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
 {
   return rawEventsForDate( qdt.date() );
 }
 
 QPtrList<Event> CalendarLocal::rawEvents()
 {
   return mEventList;
 }
 
 bool CalendarLocal::addJournal(Journal *journal)
 {
   if ( journal->dtStart().isValid())
     kdDebug(5800) << "Adding Journal on " << journal->dtStart().toString() << endl;
   else
     kdDebug(5800) << "Adding Journal without a DTSTART" << endl;
 
   mJournalList.append(journal);
 
   journal->registerObserver( this );
 
   setModified( true );
 
   return true;
 }
 
 void CalendarLocal::deleteJournal( Journal *journal )
 {
   if ( mJournalList.removeRef(journal) ) {
     setModified( true );
   }
 }
 
 Journal *CalendarLocal::journal( const QDate &date )
 {
 //  kdDebug(5800) << "CalendarLocal::journal() " << date.toString() << endl;
 
   for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
     if ( it->dtStart().date() == date )
       return it;
 
   return 0;
 }
 
 Journal *CalendarLocal::journal( const QString &uid )
 {
   for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
     if ( it->uid() == uid )
       return it;
 
   return 0;
 }
 
 QPtrList<Journal> CalendarLocal::journals()
 {
   return mJournalList;
 }
 
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index a17cf11..a2e50e3 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -1,216 +1,217 @@
 /*
     This file is part of libkcal.
 
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001,2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef KCAL_CALENDARLOCAL_H
 #define KCAL_CALENDARLOCAL_H
 
 #include "calendar.h"
 
 namespace KCal {
 
 class CalFormat;
 
 /**
   This class provides a calendar stored as a local file.
 */
 class CalendarLocal : public Calendar
 {
   public:
     /**
       Constructs a new calendar, with variables initialized to sane values.
     */
     CalendarLocal();
     /**
       Constructs a new calendar, with variables initialized to sane values.
     */
     CalendarLocal( const QString &timeZoneId );
     ~CalendarLocal();
   
     /**
       Loads a calendar on disk in vCalendar or iCalendar format into the current
       calendar. Any information already present is lost.
       @return true, if successfull, false on error.
       @param fileName the name of the calendar on disk.
     */
     bool load( const QString &fileName );
     /**
       Writes out the calendar to disk in the specified \a format.
       CalendarLocal takes ownership of the CalFormat object.
       @return true, if successfull, false on error.
       @param fileName the name of the file
     */
     bool save( const QString &fileName, CalFormat *format = 0 );
 
     /**
       Clears out the current calendar, freeing all used memory etc. etc.
     */
     void close();
 
     void save() {}
   
     /**
       Add Event to calendar.
     */
+    bool addAnniversaryNoDup( Event *event );
     bool addEventNoDup( Event *event );
     bool addEvent( Event *event );
     /** 
       Deletes an event from this calendar.
     */
     void deleteEvent( Event *event );
 
     /**
       Retrieves an event on the basis of the unique string ID.
     */
     Event *event( const QString &uid );
     /**
       Return unfiltered list of all events in calendar.
     */
     QPtrList<Event> rawEvents();
 
     /**
       Add a todo to the todolist.
     */
     bool addTodo( Todo *todo );
     bool addTodoNoDup( Todo *todo );
     /**
       Remove a todo from the todolist.
     */
     void deleteTodo( Todo * );
     /**
       Searches todolist for an event with this unique string identifier,
       returns a pointer or null.
     */
     Todo *todo( const QString &uid );
     /**
       Return list of all todos.
     */
     QPtrList<Todo> rawTodos();
     /**
       Returns list of todos due on the specified date.
     */
     QPtrList<Todo> todos( const QDate &date );
     /**
       Return list of all todos.
       
       Workaround because compiler does not recognize function of base class.
     */
     QPtrList<Todo> todos() { return Calendar::todos(); }
 
     /**
       Add a Journal entry to calendar.
     */
     bool addJournal( Journal * );
     /**
       Remove a Journal from the calendar.
     */
     void deleteJournal( Journal * );
     /**
       Return Journal for given date.
     */
     Journal *journal( const QDate & );
     /**
       Return Journal with given UID.
     */
     Journal *journal( const QString &uid );
     /**
       Return list of all Journals stored in calendar.
     */
     QPtrList<Journal> journals();
 
     /**
       Return all alarms, which ocur in the given time interval.
     */
     Alarm::List alarms( const QDateTime &from, const QDateTime &to );
 
     /**
       Return all alarms, which ocur before given date.
     */
     Alarm::List alarmsTo( const QDateTime &to );
  
     QDateTime nextAlarm( int daysTo ) ;
     QDateTime nextAlarmEventDateTime()  const;
     void  checkAlarmForIncidence( Incidence *, bool deleted )  ;
     void registerAlarm();
     void deRegisterAlarm();
     QString getAlarmNotification();
     QString nextSummary() const ;
     /**
       This method should be called whenever a Event is modified directly
       via it's pointer. It makes sure that the calendar is internally
       consistent.
     */
     void update( IncidenceBase *incidence );
  
     /**
       Builds and then returns a list of all events that match for the
       date specified. useful for dayView, etc. etc.
     */
     QPtrList<Event> rawEventsForDate( const QDate &date, bool sorted = false );
     /**
       Get unfiltered events for date \a qdt.
     */
     QPtrList<Event> rawEventsForDate( const QDateTime &qdt );
     /**
       Get unfiltered events in a range of dates. If inclusive is set to true,
       only events are returned, which are completely included in the range.
     */
     QPtrList<Event> rawEvents( const QDate &start, const QDate &end,
                                bool inclusive = false );
     Todo *CalendarLocal::todo( int uid );
     Event *CalendarLocal::event( int uid );
  
 
 
   protected:
 
     // Event* mNextAlarmEvent;
     QString mNextSummary;
     QString mNextAlarmEventDateTimeString;
     QString mLastAlarmNotificationString;
     QDateTime mNextAlarmEventDateTime;
     QDateTime mNextAlarmDateTime; 
     void reInitAlarmSettings();
    
     /** Notification function of IncidenceBase::Observer. */
     void incidenceUpdated( IncidenceBase *i ) { update( i ); }
   
     /** inserts an event into its "proper place" in the calendar. */
     void insertEvent( Event *event );
   
     /** Append alarms of incidence in interval to list of alarms. */
     void appendAlarms( Alarm::List &alarms, Incidence *incidence,
                        const QDateTime &from, const QDateTime &to );
 
     /** Append alarms of recurring events in interval to list of alarms. */
     void appendRecurringAlarms( Alarm::List &alarms, Incidence *incidence,
                        const QDateTime &from, const QDateTime &to );
 
   private:
     void init();
 
     QPtrList<Event> mEventList;
     QPtrList<Todo> mTodoList;
     QPtrList<Journal> mJournalList;
 };
 
 }
 
 #endif
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index 5893db5..f2e7dfc 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -1,478 +1,480 @@
 /*
     This file is part of libkcal.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qptrlist.h>
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <stdlib.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 
 extern "C" {
   #include <ical.h>
   #include <icalss.h>
   #include <icalparser.h>
   #include <icalrestriction.h>
 }
 
 #include "calendar.h"
 #include "calendarlocal.h"
 #include "journal.h"
 
 #include "icalformat.h"
 #include "icalformatimpl.h"
 
 #define _ICAL_VERSION "2.0"
 
 using namespace KCal;
 
 ICalFormat::ICalFormat(bool quick )
 {
     mQuicksave = false; //quick; 
    mImpl = new ICalFormatImpl( this );
    tzOffsetMin = 0;
    //qDebug("new ICalFormat() ");
 }
 
 ICalFormat::~ICalFormat()
 {
   delete mImpl; 
   //qDebug("delete ICalFormat ");
 }
 
 bool ICalFormat::load( Calendar *calendar, const QString &fileName)
 {
 
   clearException();
 
   QFile file( fileName );  
   if (!file.open( IO_ReadOnly ) ) {
     setException(new ErrorFormat(ErrorFormat::LoadError));
     return false;
   } 
   QTextStream ts( &file );
   QString text; 
 #if 0
   if ( !mQuicksave ) {
       qDebug("KO: No quickload!");
       ts.setEncoding( QTextStream::Latin1 );
       text = ts.read(); 
   } else {
       ts.setCodec( QTextCodec::codecForName("utf8") );
       text = ts.read(); 
   }
 #endif
   ts.setEncoding( QTextStream::Latin1 );
   text = ts.read(); 
   file.close();
 
   return fromString( calendar, text );
 }
 
 //#include <qdatetime.h>
 bool ICalFormat::save( Calendar *calendar, const QString &fileName )
 {
     //kdDebug(5800) << "ICalFormat::save(): " << fileName << endl;
     //qDebug("ICalFormat::save ");
   clearException();
   QString text = toString( calendar );
   //return false; 
   // qDebug("to string takes ms: %d ",is.elapsed() );
   if ( text.isNull() ) return false;
 
   // TODO: write backup file
   //is.restart();
   QFile file( fileName );
   if (!file.open( IO_WriteOnly ) ) {
     setException(new ErrorFormat(ErrorFormat::SaveError,
                  i18n("Could not open file '%1'").arg(fileName)));
     return false;
   }
   QTextStream ts( &file );
 
 // #ifdef DESKTOP_VERSION
 //   mQuicksave = false;
 // #endif
 //   if ( mQuicksave ) {
 //       ts << text.utf8();
 //   } else {
 //       ts.setEncoding( QTextStream::Latin1 );
 //       ts << text;
 //       //ts << text.latin1();
 //   }
   ts.setEncoding( QTextStream::Latin1 );
   ts << text;
   file.close();
   //qDebug("saving file takes ms: %d ", is.elapsed() );
   return true;
 }
 
 bool ICalFormat::fromString( Calendar *cal, const QString &text )
 {
   setTimeZone( cal->timeZoneId(), !cal->isLocalTime() );
   // qDebug("ICalFormat::fromString tz: %s ", cal->timeZoneId().latin1());
   // Get first VCALENDAR component.
   // TODO: Handle more than one VCALENDAR or non-VCALENDAR top components
   icalcomponent *calendar;
 
   //calendar = icalcomponent_new_from_string( text.local8Bit().data());
   // good calendar = icalcomponent_new_from_string( text.utf8().data());
   calendar = icalcomponent_new_from_string( (char*)text.latin1());
   if (!calendar) {
     setException(new ErrorFormat(ErrorFormat::ParseErrorIcal));
     return false;
   }
 
   bool success = true;
 
   if (icalcomponent_isa(calendar) != ICAL_VCALENDAR_COMPONENT) {
     setException(new ErrorFormat(ErrorFormat::NoCalendar));
     success = false;
   } else {
     // put all objects into their proper places
     if ( !mImpl->populate( cal, calendar ) ) {
       if ( !exception() ) {
         setException(new ErrorFormat(ErrorFormat::ParseErrorKcal));
       } 
       success = false;
     } else
       mLoadedProductId = mImpl->loadedProductId();
   }
 
   icalcomponent_free( calendar );
 
   return success;
 }
 
 Incidence *ICalFormat::fromString( const QString &text )
 {
   CalendarLocal cal( mTimeZoneId );
   fromString(&cal, text);
   
   Incidence *ical = 0;
   QPtrList<Event> elist = cal.events();
   if ( elist.count() > 0 ) {
     ical = elist.first();
   } else {
     QPtrList<Todo> tlist = cal.todos();
     if ( tlist.count() > 0 ) {
       ical = tlist.first();
     } else {
       QPtrList<Journal> jlist = cal.journals();
       if ( jlist.count() > 0 ) {
         ical = jlist.first();
       }
     }
   }
   return ical;
 }
 #include <qapp.h>
 
 QString ICalFormat::toString( Calendar *cal )
 {
  
   setTimeZone( cal->timeZoneId(), !cal->isLocalTime() );
  
   icalcomponent *calendar = mImpl->createCalendarComponent(cal);
 
   icalcomponent *component;
  
   // todos 
   QPtrList<Todo> todoList = cal->rawTodos();
   QPtrListIterator<Todo> qlt(todoList);
   for (; qlt.current(); ++qlt) {
     component = mImpl->writeTodo(qlt.current());
     icalcomponent_add_component(calendar,component);
     //qDebug(" todos ");
     qApp->processEvents();
   }
   // events
   QPtrList<Event> events = cal->rawEvents();
   Event *ev;
   for(ev=events.first();ev;ev=events.next()) {
     component = mImpl->writeEvent(ev);
     icalcomponent_add_component(calendar,component);
     //qDebug("events ");
     qApp->processEvents();
   }
  
   // journals
   QPtrList<Journal> journals = cal->journals();
   Journal *j;
   for(j=journals.first();j;j=journals.next()) {
     component = mImpl->writeJournal(j);
     icalcomponent_add_component(calendar,component);
     //qDebug("journals ");
     qApp->processEvents(); 
   }
    const char *text; 
   QString ret =""; 
   text = icalcomponent_as_ical_string( calendar ); 
   qApp->processEvents(); 
 
   // text = "BEGIN:VCALENDAR\nPRODID\n :-//K Desktop Environment//NONSGML libkcal 3.1//EN\nVERSION\n :2.0\nBEGIN:VEVENT\nDTSTAMP\n :20031231T213514Z\nORGANIZER\n :MAILTO:lutz@putz.de\nCREATED\n :20031231T213513Z\nUID\n :libkcal-1295166342.120\nSEQUENCE\n :0\nLAST-MODIFIED\n :20031231T213513Z\nSUMMARY\n :test1\nCLASS\n :PUBLIC\nPRIORITY\n :3\nDTSTART\n :20040101T090000Z\nDTEND\n :20040101T110000Z\nTRANSP\n :OPAQUE\nEND:VEVENT\nEND:VCALENDAR\n";
 
 
    if ( text ) {
        ret = QString ( text );
    }
    icalcomponent_free( calendar );
 
   if (!text) { 
     setException(new ErrorFormat(ErrorFormat::SaveError,
                  i18n("libical error")));
     return QString::null;
   }
 
   return ret;
 }
 
 QString ICalFormat::toICalString( Incidence *incidence )
 {
   CalendarLocal cal( mTimeZoneId );
   cal.addIncidence( incidence->clone() );
   return toString( &cal );
 }
 
 QString ICalFormat::toString( Incidence *incidence )
 {
   icalcomponent *component;
 
   component = mImpl->writeIncidence( incidence );
 
   const char *text = icalcomponent_as_ical_string( component );
 
   icalcomponent_free( component );
 
   return QString::fromLocal8Bit( text );
 }
 
 QString ICalFormat::toString( Recurrence *recurrence )
 {
   icalproperty *property;
   property = mImpl->writeRecurrenceRule( recurrence );
   const char *text = icalproperty_as_ical_string( property );
   icalproperty_free( property );
   return QString::fromLocal8Bit( text );
 }
 /*
 bool ICalFormat::fromString( Recurrence * recurrence, const QString& rrule )
 {
   bool success = true;
   icalerror_clear_errno();
   struct icalrecurrencetype recur = icalrecurrencetype_from_string( rrule );
   if ( icalerrno != ICAL_NO_ERROR ) {
     kdDebug() << "Recurrence parsing error: " << icalerror_strerror( icalerrno ) << endl;
     success = false;
   }
 
   if ( success ) {
     mImpl->readRecurrence( recur, recurrence );
   }
 
   return success;
 }
 */
 
 QString ICalFormat::createScheduleMessage(IncidenceBase *incidence,
                                           Scheduler::Method method)
 {
   icalcomponent *message = mImpl->createScheduleComponent(incidence,method);
 
   QString messageText = icalcomponent_as_ical_string(message);
 
 
 
   return messageText;
 }
 
 ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
                                                    const QString &messageText )
 {
   setTimeZone( cal->timeZoneId(), !cal->isLocalTime() );
   clearException();
 
   if (messageText.isEmpty()) return 0;
 
   icalcomponent *message;
   message = icalparser_parse_string(messageText.local8Bit());
 
   if (!message) return 0;
 
   icalproperty *m = icalcomponent_get_first_property(message,
                                                      ICAL_METHOD_PROPERTY);
 
   if (!m) return 0;
 
   icalcomponent *c;
 
   IncidenceBase *incidence = 0;
   c = icalcomponent_get_first_component(message,ICAL_VEVENT_COMPONENT);
   if (c) {
     incidence = mImpl->readEvent(c);
   }
 
   if (!incidence) {
     c = icalcomponent_get_first_component(message,ICAL_VTODO_COMPONENT);
     if (c) {
       incidence = mImpl->readTodo(c);
     }
   }
 
   if (!incidence) {
     c = icalcomponent_get_first_component(message,ICAL_VFREEBUSY_COMPONENT);
     if (c) {
       incidence = mImpl->readFreeBusy(c);
     }
   }
 
   if (!incidence) {
     kdDebug() << "ICalFormat:parseScheduleMessage: object is not a freebusy, event or todo" << endl;
     return 0;
   }
 
   kdDebug(5800) << "ICalFormat::parseScheduleMessage() getting method..." << endl;
 
   icalproperty_method icalmethod = icalproperty_get_method(m);
   Scheduler::Method method;
 
   switch (icalmethod) {
     case ICAL_METHOD_PUBLISH:
       method = Scheduler::Publish;
       break;
     case ICAL_METHOD_REQUEST:
       method = Scheduler::Request;
       break;
     case ICAL_METHOD_REFRESH:
       method = Scheduler::Refresh;
       break;
     case ICAL_METHOD_CANCEL:
       method = Scheduler::Cancel;
       break;
     case ICAL_METHOD_ADD:
       method = Scheduler::Add;
       break;
     case ICAL_METHOD_REPLY:
       method = Scheduler::Reply;
       break;
     case ICAL_METHOD_COUNTER:
       method = Scheduler::Counter;
       break;
     case ICAL_METHOD_DECLINECOUNTER:
       method = Scheduler::Declinecounter;
       break;
     default:
       method = Scheduler::NoMethod;
       kdDebug(5800) << "ICalFormat::parseScheduleMessage(): Unknow method" << endl;
       break;
   }
 
 
   if (!icalrestriction_check(message)) {
     setException(new ErrorFormat(ErrorFormat::Restriction,
                                    Scheduler::translatedMethodName(method) + ": " +
                                    mImpl->extractErrorProperty(c)));
     return 0;
   }
 
   icalcomponent *calendarComponent = mImpl->createCalendarComponent(cal);
 
   Incidence *existingIncidence = cal->event(incidence->uid());
   if (existingIncidence) {
     // TODO: check, if cast is required, or if it can be done by virtual funcs.
     if (existingIncidence->type() == "Todo") {
       Todo *todo = static_cast<Todo *>(existingIncidence);
       icalcomponent_add_component(calendarComponent,
                                   mImpl->writeTodo(todo));
     }
     if (existingIncidence->type() == "Event") {
       Event *event = static_cast<Event *>(existingIncidence);
       icalcomponent_add_component(calendarComponent,
                                   mImpl->writeEvent(event));
     }
   } else {
     calendarComponent = 0;
   }
-
+  qDebug("icalclassify commented out ");
+  ScheduleMessage::Status status;
+#if 0
 
   icalclass result = icalclassify(message,calendarComponent,(char *)"");
 
 
-  ScheduleMessage::Status status;
 
   switch (result) {
     case ICAL_PUBLISH_NEW_CLASS:
       status = ScheduleMessage::PublishNew;
       break;
     case ICAL_OBSOLETE_CLASS:
       status = ScheduleMessage::Obsolete;
       break;
     case ICAL_REQUEST_NEW_CLASS:
       status = ScheduleMessage::RequestNew;
       break;
     case ICAL_REQUEST_UPDATE_CLASS:
       status = ScheduleMessage::RequestUpdate;
       break;
     case ICAL_UNKNOWN_CLASS:
     default:
       status = ScheduleMessage::Unknown;
       break;
   }
-
+#endif
+  status = ScheduleMessage::RequestUpdate;
   return new ScheduleMessage(incidence,method,status);
 }
 
 void ICalFormat::setTimeZone( const QString &id, bool utc )
 {
 
 
     mTimeZoneId = id;
     mUtc = utc;
 
     tzOffsetMin  = KGlobal::locale()->timezoneOffset(mTimeZoneId);
   
     //qDebug("ICalFormat::setTimeZoneOffset %s %d ",mTimeZoneId.latin1(),  tzOffsetMin);
 }
 
 QString ICalFormat::timeZoneId() const
 {
   return mTimeZoneId;
 }
 
 bool ICalFormat::utc() const
 {
   return mUtc;
 }
 int ICalFormat::timeOffset()
 {
     return tzOffsetMin;
 }
 const char *ICalFormat::tzString()
 {
     const char*  ret = (const char* ) mTzString;
     return ret;
 }
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index e5c27a0..32a1337 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -1,2173 +1,2170 @@
 /*
     This file is part of libkcal.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qptrlist.h>
 #include <qfile.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 
 extern "C" {
   #include <ical.h>
   #include <icalss.h>
   #include <icalparser.h>
   #include <icalrestriction.h>
 }
 
 #include "calendar.h"
 #include "journal.h"
 #include "icalformat.h"
 #include "icalformatimpl.h"
 #include "compat.h"
 
 #define _ICAL_VERSION "2.0"
 
 using namespace KCal;
 
 const int gSecondsPerMinute = 60;
 const int gSecondsPerHour   = gSecondsPerMinute * 60;
 const int gSecondsPerDay    = gSecondsPerHour   * 24;
 const int gSecondsPerWeek   = gSecondsPerDay    * 7;
 
 ICalFormatImpl::ICalFormatImpl( ICalFormat *parent ) :
   mParent( parent ), mCalendarVersion( 0 )
 {
   mCompat = new Compat;
 }
 
 ICalFormatImpl::~ICalFormatImpl()
 {
   delete mCompat;
 }
 
 class ToStringVisitor : public Incidence::Visitor
 {
   public:
     ToStringVisitor( ICalFormatImpl *impl ) : mImpl( impl ), mComponent( 0 ) {}
 
     bool visit( Event *e ) { mComponent = mImpl->writeEvent( e ); return true; }
     bool visit( Todo *e ) { mComponent = mImpl->writeTodo( e ); return true; }
     bool visit( Journal *e ) { mComponent = mImpl->writeJournal( e ); return true; }
 
     icalcomponent *component() { return mComponent; }
 
   private:
     ICalFormatImpl *mImpl;
     icalcomponent *mComponent;
 };
 
 icalcomponent *ICalFormatImpl::writeIncidence(Incidence *incidence)
 {
   ToStringVisitor v( this );
   incidence->accept(v);
   return v.component();
 }
 
 icalcomponent *ICalFormatImpl::writeTodo(Todo *todo)
 {
   QString tmpStr;
   QStringList tmpStrList;
 
   icalcomponent *vtodo = icalcomponent_new(ICAL_VTODO_COMPONENT);
 
   writeIncidence(vtodo,todo);
 
   // due date
   if (todo->hasDueDate()) {
     icaltimetype due;
     if (todo->doesFloat()) {
       due = writeICalDate(todo->dtDue().date());
     } else {
       due = writeICalDateTime(todo->dtDue());
     }
     icalcomponent_add_property(vtodo,icalproperty_new_due(due));
   }
 
   // start time
   if (todo->hasStartDate()) {
     icaltimetype start;
     if (todo->doesFloat()) {
 //      kdDebug(5800) << "§§ Incidence " << todo->summary() << " floats." << endl;
       start = writeICalDate(todo->dtStart().date());
     } else {
 //      kdDebug(5800) << "§§ incidence " << todo->summary() << " has time." << endl;
       start = writeICalDateTime(todo->dtStart());
     }
     icalcomponent_add_property(vtodo,icalproperty_new_dtstart(start));
   }
 
   // completion date
   if (todo->isCompleted()) {
     if (!todo->hasCompletedDate()) {
       // If todo was created by KOrganizer <2.2 it has no correct completion
       // date. Set it to now.
       todo->setCompleted(QDateTime::currentDateTime());
     }
     icaltimetype completed = writeICalDateTime(todo->completed());
     icalcomponent_add_property(vtodo,icalproperty_new_completed(completed));
   }
 
   icalcomponent_add_property(vtodo,
       icalproperty_new_percentcomplete(todo->percentComplete()));
 
   return vtodo;
 }
 
 icalcomponent *ICalFormatImpl::writeEvent(Event *event)
 {
   kdDebug(5800) << "Write Event '" << event->summary() << "' (" << event->uid()
               << ")" << endl;
 
   QString tmpStr;
   QStringList tmpStrList;
 
   icalcomponent *vevent = icalcomponent_new(ICAL_VEVENT_COMPONENT);
 
   writeIncidence(vevent,event);
 
   // start time
   icaltimetype start;
   if (event->doesFloat()) {
 //    kdDebug(5800) << "§§ Incidence " << event->summary() << " floats." << endl;
     start = writeICalDate(event->dtStart().date());
   } else {
 //    kdDebug(5800) << "§§ incidence " << event->summary() << " has time." << endl;
     start = writeICalDateTime(event->dtStart());
   }
   icalcomponent_add_property(vevent,icalproperty_new_dtstart(start));
 
   if (event->hasEndDate()) {
     // end time
     icaltimetype end;
     if (event->doesFloat()) {
 //      kdDebug(5800) << "§§ Event " << event->summary() << " floats." << endl;
       // +1 day because end date is non-inclusive.
       end = writeICalDate( event->dtEnd().date().addDays( 1 ) );
     } else {
 //      kdDebug(5800) << "§§ Event " << event->summary() << " has time." << endl;
       end = writeICalDateTime(event->dtEnd());
     }
     icalcomponent_add_property(vevent,icalproperty_new_dtend(end));
   }
 
 // TODO: attachments, resources
 #if 0
   // attachments
   tmpStrList = anEvent->attachments();
   for ( QStringList::Iterator it = tmpStrList.begin();
         it != tmpStrList.end();
         ++it )
     addPropValue(vevent, VCAttachProp, (*it).utf8());
 
   // resources
   tmpStrList = anEvent->resources();
   tmpStr = tmpStrList.join(";");
   if (!tmpStr.isEmpty())
     addPropValue(vevent, VCResourcesProp, tmpStr.utf8());
 
 #endif
 
   // Transparency
   switch( event->transparency() ) {
   case Event::Transparent:
-    icalcomponent_add_property(vevent, icalproperty_new_transp("TRANSPARENT"));
+      icalcomponent_add_property(vevent, icalproperty_new_transp(ICAL_TRANSP_TRANSPARENT));
     break;
   case Event::Opaque:
-    icalcomponent_add_property(vevent, icalproperty_new_transp("OPAQUE"));
+    icalcomponent_add_property(vevent, icalproperty_new_transp(ICAL_TRANSP_OPAQUE));
     break;
   }
 
   return vevent;
 }
 
 icalcomponent *ICalFormatImpl::writeFreeBusy(FreeBusy *freebusy,
                                              Scheduler::Method method)
 {
 #if QT_VERSION >= 300
   kdDebug(5800) << "icalformatimpl: writeFreeBusy: startDate: "
     << freebusy->dtStart().toString("ddd MMMM d yyyy: h:m:s ap") << " End Date: "
     << freebusy->dtEnd().toString("ddd MMMM d yyyy: h:m:s ap") << endl;
 #endif
 
   icalcomponent *vfreebusy = icalcomponent_new(ICAL_VFREEBUSY_COMPONENT);
 
   writeIncidenceBase(vfreebusy,freebusy);
 
   icalcomponent_add_property(vfreebusy, icalproperty_new_dtstart(
       writeICalDateTime(freebusy->dtStart())));
 
   icalcomponent_add_property(vfreebusy, icalproperty_new_dtend(
       writeICalDateTime(freebusy->dtEnd())));
 
   if (method == Scheduler::Request) {
     icalcomponent_add_property(vfreebusy,icalproperty_new_uid(
        freebusy->uid().utf8()));
   }
 
   //Loops through all the periods in the freebusy object
   QValueList<Period> list = freebusy->busyPeriods();
   QValueList<Period>::Iterator it;
   icalperiodtype period;
   for (it = list.begin(); it!= list.end(); ++it) {
     period.start = writeICalDateTime((*it).start());
     period.end = writeICalDateTime((*it).end());
     icalcomponent_add_property(vfreebusy, icalproperty_new_freebusy(period) );
   }
 
   return vfreebusy;
 }
 
 icalcomponent *ICalFormatImpl::writeJournal(Journal *journal)
 {
   icalcomponent *vjournal = icalcomponent_new(ICAL_VJOURNAL_COMPONENT);
 
   writeIncidence(vjournal,journal);
   
   // start time
   if (journal->dtStart().isValid()) {
     icaltimetype start;
     if (journal->doesFloat()) {
 //      kdDebug(5800) << "§§ Incidence " << event->summary() << " floats." << endl;
       start = writeICalDate(journal->dtStart().date());
     } else {
 //      kdDebug(5800) << "§§ incidence " << event->summary() << " has time." << endl;
       start = writeICalDateTime(journal->dtStart());
     }
     icalcomponent_add_property(vjournal,icalproperty_new_dtstart(start));
   }
 
   return vjournal;
 }
 
 void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
 {
   // pilot sync stuff
 // TODO: move this application-specific code to kpilot
   if (incidence->pilotId()) {
     incidence->setNonKDECustomProperty("X-PILOTID", QString::number(incidence->pilotId()));
     incidence->setNonKDECustomProperty("X-PILOTSTAT", QString::number(incidence->syncStatus()));
   }
   if (incidence->zaurusId() >= 0) {
       incidence->setNonKDECustomProperty("X-ZAURUSID", QString::number(incidence->zaurusId()));
   }
 
   if (incidence->zaurusUid() > 0) {
       incidence->setNonKDECustomProperty("X-ZAURUSUID", QString::number(incidence->zaurusUid()));
   }
   if (incidence->zaurusStat() > 0) {
       incidence->setNonKDECustomProperty("X-ZAURUSSTAT", QString::number(incidence->zaurusStat()));
   }
 
   writeIncidenceBase(parent,incidence);
   if (incidence->cancelled()) {
       icalcomponent_add_property(parent,icalproperty_new_status(ICAL_STATUS_CANCELLED));
   }
 
   // creation date
   icalcomponent_add_property(parent,icalproperty_new_created(
       writeICalDateTime(incidence->created())));
 
   // unique id
   icalcomponent_add_property(parent,icalproperty_new_uid(
       incidence->uid().utf8()));
 
   // revision
   icalcomponent_add_property(parent,icalproperty_new_sequence(
       incidence->revision()));
 
   // last modification date
   icalcomponent_add_property(parent,icalproperty_new_lastmodified(
       writeICalDateTime(incidence->lastModified())));
 
   // description
   if (!incidence->description().isEmpty()) {
     icalcomponent_add_property(parent,icalproperty_new_description(
         incidence->description().utf8()));
   }
 
   // summary
   if (!incidence->summary().isEmpty()) {
     icalcomponent_add_property(parent,icalproperty_new_summary(
         incidence->summary().utf8()));
   }
 
   // location
   if (!incidence->location().isEmpty()) {
     icalcomponent_add_property(parent,icalproperty_new_location(
         incidence->location().utf8()));
   }
 
 // TODO:
   // status
 //  addPropValue(parent, VCStatusProp, incidence->getStatusStr().utf8());
 
   // secrecy
-  const char *classStr;
+  enum icalproperty_class classInt;
   switch (incidence->secrecy()) {
     case Incidence::SecrecyPublic:
-      classStr = "PUBLIC";
+      classInt = ICAL_CLASS_PUBLIC;
       break;
     case Incidence::SecrecyConfidential:
-      classStr = "CONFIDENTIAL";
+      classInt = ICAL_CLASS_CONFIDENTIAL;
       break;
     case Incidence::SecrecyPrivate:
+      classInt =ICAL_CLASS_PRIVATE ;
     default:
-      classStr = "PRIVATE";
+      classInt =ICAL_CLASS_PRIVATE ;
       break;
   }
-  icalcomponent_add_property(parent,icalproperty_new_class(classStr));
+  icalcomponent_add_property(parent,icalproperty_new_class(classInt));
 
   // priority
   icalcomponent_add_property(parent,icalproperty_new_priority(
       incidence->priority()));
 
   // categories
   QStringList categories = incidence->categories();
   QStringList::Iterator it;
   for(it = categories.begin(); it != categories.end(); ++it ) {
     icalcomponent_add_property(parent,icalproperty_new_categories((*it).utf8()));
   }
 // TODO: Ensure correct concatenation of categories properties.
 
 /*
   // categories
   tmpStrList = incidence->getCategories();
   tmpStr = "";
   QString catStr;
   for ( QStringList::Iterator it = tmpStrList.begin();
         it != tmpStrList.end();
         ++it ) {
     catStr = *it;
     if (catStr[0] == ' ')
       tmpStr += catStr.mid(1);
     else
       tmpStr += catStr;
     // this must be a ';' character as the vCalendar specification requires!
     // vcc.y has been hacked to translate the ';' to a ',' when the vcal is
     // read in.
     tmpStr += ";";
   }
   if (!tmpStr.isEmpty()) {
     tmpStr.truncate(tmpStr.length()-1);
     icalcomponent_add_property(parent,icalproperty_new_categories(
         writeText(incidence->getCategories().join(";"))));
   }
 */
 
   // related event
   if (incidence->relatedTo()) {
     icalcomponent_add_property(parent,icalproperty_new_relatedto(
         incidence->relatedTo()->uid().utf8()));
   }
 
   // recurrence rule stuff
   Recurrence *recur = incidence->recurrence();
   if (recur->doesRecur()) {
     
     icalcomponent_add_property(parent,writeRecurrenceRule(recur));
   }
 
   // recurrence excpetion dates
   DateList dateList = incidence->exDates();
   DateList::ConstIterator exIt;
   for(exIt = dateList.begin(); exIt != dateList.end(); ++exIt) {
     icalcomponent_add_property(parent,icalproperty_new_exdate(
         writeICalDate(*exIt)));
   }
   
   // attachments
   QPtrList<Attachment> attachments = incidence->attachments();
   for (Attachment *at = attachments.first(); at; at = attachments.next())
     icalcomponent_add_property(parent,writeAttachment(at));
 
   // alarms
   QPtrList<Alarm> alarms = incidence->alarms();
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
     if (alarm->enabled()) {
       kdDebug(5800) << "Write alarm for " << incidence->summary() << endl;
       icalcomponent_add_component(parent,writeAlarm(alarm));
     }
   }
 
   // duration
 
 // turned off as it always is set to PTS0 (and must not occur together with DTEND
 
 //  if (incidence->hasDuration()) {
 //    icaldurationtype duration;
 //    duration = writeICalDuration(incidence->duration());
 //    icalcomponent_add_property(parent,icalproperty_new_duration(duration));
 //  }
 }
 
 void ICalFormatImpl::writeIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase)
 {
   icalcomponent_add_property(parent,icalproperty_new_dtstamp(
       writeICalDateTime(QDateTime::currentDateTime())));
 
   // organizer stuff
   icalcomponent_add_property(parent,icalproperty_new_organizer(
       ("MAILTO:" + incidenceBase->organizer()).utf8()));
 
   // attendees
   if (incidenceBase->attendeeCount() != 0) {
     QPtrList<Attendee> al = incidenceBase->attendees();
     QPtrListIterator<Attendee> ai(al);
     for (; ai.current(); ++ai) {
       icalcomponent_add_property(parent,writeAttendee(ai.current()));
     }
   }
 
   // custom properties
   writeCustomProperties(parent, incidenceBase);
 }
 
 void ICalFormatImpl::writeCustomProperties(icalcomponent *parent,CustomProperties *properties)
 {
   QMap<QCString, QString> custom = properties->customProperties();
   for (QMap<QCString, QString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
     icalproperty *p = icalproperty_new_x(c.data().utf8());
     icalproperty_set_x_name(p,c.key());
     icalcomponent_add_property(parent,p);
   }
 }
 
 icalproperty *ICalFormatImpl::writeAttendee(Attendee *attendee)
 {
   icalproperty *p = icalproperty_new_attendee("mailto:" + attendee->email().utf8());
 
   if (!attendee->name().isEmpty()) {
     icalproperty_add_parameter(p,icalparameter_new_cn(attendee->name().utf8()));
   }
 
 
   icalproperty_add_parameter(p,icalparameter_new_rsvp(
           attendee->RSVP() ? ICAL_RSVP_TRUE : ICAL_RSVP_FALSE ));
 
   icalparameter_partstat status = ICAL_PARTSTAT_NEEDSACTION;
   switch (attendee->status()) {
     default:
     case Attendee::NeedsAction:
       status = ICAL_PARTSTAT_NEEDSACTION;
       break;
     case Attendee::Accepted:
       status = ICAL_PARTSTAT_ACCEPTED;
       break;
     case Attendee::Declined:
       status = ICAL_PARTSTAT_DECLINED;
       break;
     case Attendee::Tentative:
       status = ICAL_PARTSTAT_TENTATIVE;
       break;
     case Attendee::Delegated:
       status = ICAL_PARTSTAT_DELEGATED;
       break;
     case Attendee::Completed:
       status = ICAL_PARTSTAT_COMPLETED;
       break;
     case Attendee::InProcess:
       status = ICAL_PARTSTAT_INPROCESS;
       break;
   }
   icalproperty_add_parameter(p,icalparameter_new_partstat(status));
 
   icalparameter_role role = ICAL_ROLE_REQPARTICIPANT;
   switch (attendee->role()) {
     case Attendee::Chair:
       role = ICAL_ROLE_CHAIR;
       break;
     default:
     case Attendee::ReqParticipant:
       role = ICAL_ROLE_REQPARTICIPANT;
       break;
     case Attendee::OptParticipant:
       role = ICAL_ROLE_OPTPARTICIPANT;
       break;
     case Attendee::NonParticipant:
       role = ICAL_ROLE_NONPARTICIPANT;
       break;
   }
   icalproperty_add_parameter(p,icalparameter_new_role(role));
 
   if (!attendee->uid().isEmpty()) {
     icalparameter* icalparameter_uid = icalparameter_new_x(attendee->uid().utf8());
     icalparameter_set_xname(icalparameter_uid,"X-UID");
     icalproperty_add_parameter(p,icalparameter_uid);
   }
 
   return p;
 }
 
 icalproperty *ICalFormatImpl::writeAttachment(Attachment *att)
 {
-  icalattachtype* attach = icalattachtype_new();
+#if 0
+   icalattachtype* attach = icalattachtype_new();
   if (att->isURI())
     icalattachtype_set_url(attach, att->uri().utf8().data());
   else
     icalattachtype_set_base64(attach, att->data(), 0);
-
+#endif
+  icalattach *attach;
+  if (att->isURI())
+      attach = icalattach_new_from_url( att->uri().utf8().data());
+  else
+      attach = icalattach_new_from_data ( (unsigned char *)att->data(), 0, 0);
   icalproperty *p = icalproperty_new_attach(attach);
-
   if (!att->mimeType().isEmpty())
     icalproperty_add_parameter(p,icalparameter_new_fmttype(att->mimeType().utf8().data()));
 
   if (att->isBinary()) {
     icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_BINARY));
     icalproperty_add_parameter(p,icalparameter_new_encoding(ICAL_ENCODING_BASE64));
   }
   return p;
 }
 
 icalproperty *ICalFormatImpl::writeRecurrenceRule(Recurrence *recur)
 {
 //  kdDebug(5800) << "ICalFormatImpl::writeRecurrenceRule()" << endl;
 
   icalrecurrencetype r;
 
   icalrecurrencetype_clear(&r);
 
   int index = 0;
   int index2 = 0;
 
   QPtrList<Recurrence::rMonthPos> tmpPositions;
   QPtrList<int> tmpDays;
   int *tmpDay;
   Recurrence::rMonthPos *tmpPos;
   bool datetime = false;
   int day;
   int i;
 
   switch(recur->doesRecur()) {
     case Recurrence::rMinutely:
       r.freq = ICAL_MINUTELY_RECURRENCE;
       datetime = true;
       break;
     case Recurrence::rHourly:
       r.freq = ICAL_HOURLY_RECURRENCE;
       datetime = true;
       break;
     case Recurrence::rDaily:
       r.freq = ICAL_DAILY_RECURRENCE;
       break;
     case Recurrence::rWeekly:
       r.freq = ICAL_WEEKLY_RECURRENCE;
       r.week_start = static_cast<icalrecurrencetype_weekday>(recur->weekStart()%7 + 1);
       for (i = 0; i < 7; i++) {
         if (recur->days().testBit(i)) {
           day = (i + 1)%7 + 1;     // convert from Monday=0 to Sunday=1
           r.by_day[index++] = icalrecurrencetype_day_day_of_week(day);
         }
       }
 //      r.by_day[index] = ICAL_RECURRENCE_ARRAY_MAX;
       break;
     case Recurrence::rMonthlyPos:
       r.freq = ICAL_MONTHLY_RECURRENCE;
 
       tmpPositions = recur->monthPositions();
       for (tmpPos = tmpPositions.first();
            tmpPos;
            tmpPos = tmpPositions.next()) {
         for (i = 0; i < 7; i++) {
           if (tmpPos->rDays.testBit(i)) {
             day = (i + 1)%7 + 1;     // convert from Monday=0 to Sunday=1
             day += tmpPos->rPos*8;
             if (tmpPos->negative) day = -day;
             r.by_day[index++] = day;
           }
         }
       }
 //      r.by_day[index] = ICAL_RECURRENCE_ARRAY_MAX;
       break;
     case Recurrence::rMonthlyDay:
       r.freq = ICAL_MONTHLY_RECURRENCE;
 
       tmpDays = recur->monthDays();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         r.by_month_day[index++] = icalrecurrencetype_day_position(*tmpDay*8);//*tmpDay);
       }
 //      r.by_day[index] = ICAL_RECURRENCE_ARRAY_MAX;
       break;
     case Recurrence::rYearlyMonth:
     case Recurrence::rYearlyPos:
       r.freq = ICAL_YEARLY_RECURRENCE;
 
       tmpDays = recur->yearNums();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         r.by_month[index++] = *tmpDay;
       }
 //      r.by_set_pos[index] = ICAL_RECURRENCE_ARRAY_MAX;
       if (recur->doesRecur() == Recurrence::rYearlyPos) {
         tmpPositions = recur->monthPositions();
         for (tmpPos = tmpPositions.first();
              tmpPos;
              tmpPos = tmpPositions.next()) {
           for (i = 0; i < 7; i++) {
             if (tmpPos->rDays.testBit(i)) {
               day = (i + 1)%7 + 1;     // convert from Monday=0 to Sunday=1
               day += tmpPos->rPos*8;
               if (tmpPos->negative) day = -day;
               r.by_day[index2++] = day;
             }
           }
         }
 //        r.by_day[index2] = ICAL_RECURRENCE_ARRAY_MAX;
       }
       break;
     case Recurrence::rYearlyDay:
       r.freq = ICAL_YEARLY_RECURRENCE;
 
       tmpDays = recur->yearNums();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         r.by_year_day[index++] = *tmpDay;
       }
 //      r.by_year_day[index] = ICAL_RECURRENCE_ARRAY_MAX;
       break;
     default:
       r.freq = ICAL_NO_RECURRENCE;
       kdDebug(5800) << "ICalFormatImpl::writeRecurrence(): no recurrence" << endl;
       break;
   }
 
   r.interval = recur->frequency();
 
   if (recur->duration() > 0) {
     r.count = recur->duration();
   } else if (recur->duration() == -1) {
     r.count = 0;
   } else {
     if (datetime)
       r.until = writeICalDateTime(recur->endDateTime());
     else
       r.until = writeICalDate(recur->endDate());
   }
 
 // Debug output
 #if 0
   const char *str = icalrecurrencetype_as_string(&r);
   if (str) {
     kdDebug(5800) << " String: " << str << endl;
   } else {
     kdDebug(5800) << " No String" << endl;
   }
 #endif
 
   return icalproperty_new_rrule(r);
 }
 
 icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm)
 {
   icalcomponent *a = icalcomponent_new(ICAL_VALARM_COMPONENT);
 
   icalproperty_action action;
-  icalattachtype *attach = 0;
+  icalattach *attach = 0;
 
   switch (alarm->type()) {
     case Alarm::Procedure:
       action = ICAL_ACTION_PROCEDURE;
-      attach = icalattachtype_new();
-      icalattachtype_set_url(attach,QFile::encodeName(alarm->programFile()).data());
+      attach = icalattach_new_from_url( QFile::encodeName(alarm->programFile()).data() );
       icalcomponent_add_property(a,icalproperty_new_attach(attach));
-      icalattachtype_free(attach);
       if (!alarm->programArguments().isEmpty()) {
         icalcomponent_add_property(a,icalproperty_new_description(alarm->programArguments().utf8()));
       }
       break;
     case Alarm::Audio:
       action = ICAL_ACTION_AUDIO;
       if (!alarm->audioFile().isEmpty()) {
-        attach = icalattachtype_new();
-        icalattachtype_set_url(attach,QFile::encodeName( alarm->audioFile() ).data());
+          attach = icalattach_new_from_url(QFile::encodeName( alarm->audioFile() ).data());
         icalcomponent_add_property(a,icalproperty_new_attach(attach));
-        icalattachtype_free(attach);
       }
       break;
     case Alarm::Email: {
       action = ICAL_ACTION_EMAIL;
       QValueList<Person> addresses = alarm->mailAddresses();
       for (QValueList<Person>::Iterator ad = addresses.begin();  ad != addresses.end();  ++ad) {
         icalproperty *p = icalproperty_new_attendee("MAILTO:" + (*ad).email().utf8());
         if (!(*ad).name().isEmpty()) {
           icalproperty_add_parameter(p,icalparameter_new_cn((*ad).name().utf8()));
         }
         icalcomponent_add_property(a,p);
       }
       icalcomponent_add_property(a,icalproperty_new_summary(alarm->mailSubject().utf8()));
       icalcomponent_add_property(a,icalproperty_new_description(alarm->text().utf8()));
       QStringList attachments = alarm->mailAttachments();
       if (attachments.count() > 0) {
         for (QStringList::Iterator at = attachments.begin();  at != attachments.end();  ++at) {
-          attach = icalattachtype_new();
-          icalattachtype_set_url(attach,QFile::encodeName( *at ).data());
+            attach = icalattach_new_from_url(QFile::encodeName( *at ).data());
           icalcomponent_add_property(a,icalproperty_new_attach(attach));
-          icalattachtype_free(attach);
         }
       }
       break;
     }
     case Alarm::Display:
       action = ICAL_ACTION_DISPLAY;
       icalcomponent_add_property(a,icalproperty_new_description(alarm->text().utf8()));
       break;
     case Alarm::Invalid:
     default:
       kdDebug(5800) << "Unknown type of alarm" << endl;
       action = ICAL_ACTION_NONE;
       break;
   }
   icalcomponent_add_property(a,icalproperty_new_action(action));
 
   // Trigger time
   icaltriggertype trigger;
   if ( alarm->hasTime() ) {
     trigger.time = writeICalDateTime(alarm->time());
     trigger.duration = icaldurationtype_null_duration();
   } else {
     trigger.time = icaltime_null_time();
     Duration offset;
     if ( alarm->hasStartOffset() )
       offset = alarm->startOffset();
     else
       offset = alarm->endOffset();
     trigger.duration = icaldurationtype_from_int( offset.asSeconds() );
   }
   icalproperty *p = icalproperty_new_trigger(trigger);
   if ( alarm->hasEndOffset() )
     icalproperty_add_parameter(p,icalparameter_new_related(ICAL_RELATED_END));
   icalcomponent_add_property(a,p);
 
   // Repeat count and duration
   if (alarm->repeatCount()) {
     icalcomponent_add_property(a,icalproperty_new_repeat(alarm->repeatCount()));
     icalcomponent_add_property(a,icalproperty_new_duration(
                              icaldurationtype_from_int(alarm->snoozeTime()*60)));
   }
 
   // Custom properties
   QMap<QCString, QString> custom = alarm->customProperties();
   for (QMap<QCString, QString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
     icalproperty *p = icalproperty_new_x(c.data().utf8());
     icalproperty_set_x_name(p,c.key());
     icalcomponent_add_property(a,p);
   }
 
   return a;
 }
 
 Todo *ICalFormatImpl::readTodo(icalcomponent *vtodo)
 {
   Todo *todo = new Todo;
 
   readIncidence(vtodo,todo);
 
   icalproperty *p = icalcomponent_get_first_property(vtodo,ICAL_ANY_PROPERTY);
 
 //  int intvalue;
   icaltimetype icaltime;
 
   QStringList categories;
 
   while (p) {
     icalproperty_kind kind = icalproperty_isa(p);
     switch (kind) {
 
       case ICAL_DUE_PROPERTY:  // due date
         icaltime = icalproperty_get_due(p);
         if (icaltime.is_date) {
           todo->setDtDue(QDateTime(readICalDate(icaltime),QTime(0,0,0)));
           todo->setFloats(true);
 
         } else {
           todo->setDtDue(readICalDateTime(icaltime));
           todo->setFloats(false);
         }
         todo->setHasDueDate(true);
         break;
 
       case ICAL_COMPLETED_PROPERTY:  // completion date
         icaltime = icalproperty_get_completed(p);
         todo->setCompleted(readICalDateTime(icaltime));
         break;
 
       case ICAL_PERCENTCOMPLETE_PROPERTY:  // Percent completed
         todo->setPercentComplete(icalproperty_get_percentcomplete(p));
         break;
 
       case ICAL_RELATEDTO_PROPERTY:  // related todo (parent)
         todo->setRelatedToUid(QString::fromUtf8(icalproperty_get_relatedto(p)));
         mTodosRelate.append(todo);
         break;
 
       case ICAL_DTSTART_PROPERTY:
         // Flag that todo has start date. Value is read in by readIncidence().
         todo->setHasStartDate(true);
         break;
 
       default:
 //        kdDebug(5800) << "ICALFormat::readTodo(): Unknown property: " << kind
 //                  << endl;
         break;
     }
 
     p = icalcomponent_get_next_property(vtodo,ICAL_ANY_PROPERTY);
   }
 
   return todo;
 }
 
 Event *ICalFormatImpl::readEvent(icalcomponent *vevent)
 {
   Event *event = new Event;
   event->setFloats(false);
 
   readIncidence(vevent,event);
 
   icalproperty *p = icalcomponent_get_first_property(vevent,ICAL_ANY_PROPERTY);
 
 //  int intvalue;
   icaltimetype icaltime;
 
   QStringList categories;
   QString transparency;
 
   while (p) {
     icalproperty_kind kind = icalproperty_isa(p);
     switch (kind) {
 
       case ICAL_DTEND_PROPERTY:  // start date and time
         icaltime = icalproperty_get_dtend(p);
         if (icaltime.is_date) {
           event->setFloats( true );
           // End date is non-inclusive
           QDate endDate = readICalDate( icaltime ).addDays( -1 );
           mCompat->fixFloatingEnd( endDate );
           if ( endDate < event->dtStart().date() ) {
             endDate = event->dtStart().date();
           }
           event->setDtEnd( QDateTime( endDate, QTime( 0, 0, 0 ) ) );
         } else {
           event->setDtEnd(readICalDateTime(icaltime));
         }
         break;
 
 // TODO:
   // at this point, there should be at least a start or end time.
   // fix up for events that take up no time but have a time associated
 #if 0
   if (!(vo = isAPropertyOf(vevent, VCDTstartProp)))
     anEvent->setDtStart(anEvent->dtEnd());
   if (!(vo = isAPropertyOf(vevent, VCDTendProp)))
     anEvent->setDtEnd(anEvent->dtStart());
 #endif
 
 // TODO: exdates
 #if 0
   // recurrence exceptions
   if ((vo = isAPropertyOf(vevent, VCExDateProp)) != 0) {
     anEvent->setExDates(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   }
 #endif
 
 #if 0
   // secrecy
   if ((vo = isAPropertyOf(vevent, VCClassProp)) != 0) {
     anEvent->setSecrecy(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   }
   else
     anEvent->setSecrecy("PUBLIC");
 
   // attachments
   tmpStrList.clear();
   initPropIterator(&voi, vevent);
   while (moreIteration(&voi)) {
     vo = nextVObject(&voi);
     if (strcmp(vObjectName(vo), VCAttachProp) == 0) {
       tmpStrList.append(s = fakeCString(vObjectUStringZValue(vo)));
       deleteStr(s);
     }
   }
   anEvent->setAttachments(tmpStrList);
 
   // resources
   if ((vo = isAPropertyOf(vevent, VCResourcesProp)) != 0) {
     QString resources = (s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
     tmpStrList.clear();
     index1 = 0;
     index2 = 0;
     QString resource;
     while ((index2 = resources.find(';', index1)) != -1) {
       resource = resources.mid(index1, (index2 - index1));
       tmpStrList.append(resource);
       index1 = index2;
     }
     anEvent->setResources(tmpStrList);
   }
 #endif
 
       case ICAL_RELATEDTO_PROPERTY:  // releated event (parent)
         event->setRelatedToUid(QString::fromUtf8(icalproperty_get_relatedto(p)));
         mEventsRelate.append(event);
         break;
 
-
       case ICAL_TRANSP_PROPERTY:  // Transparency
-        transparency = QString::fromUtf8(icalproperty_get_transp(p));
-        if( transparency == "TRANSPARENT" )
+        if(icalproperty_get_transp(p) == ICAL_TRANSP_TRANSPARENT )
           event->setTransparency( Event::Transparent );
         else
           event->setTransparency( Event::Opaque );
         break;
 
       default:
 //        kdDebug(5800) << "ICALFormat::readEvent(): Unknown property: " << kind
 //                  << endl;
         break;
     }
 
     p = icalcomponent_get_next_property(vevent,ICAL_ANY_PROPERTY);
   }
 
   QString msade = event->nonKDECustomProperty("X-MICROSOFT-CDO-ALLDAYEVENT");
   if (!msade.isNull()) {
     bool floats = (msade == QString::fromLatin1("TRUE"));
     kdDebug(5800) << "ICALFormat::readEvent(): all day event: " << floats << endl;
     event->setFloats(floats);
     if (floats) {
       QDateTime endDate = event->dtEnd();
       event->setDtEnd(endDate.addDays(-1));
     }
   }
 
   // some stupid vCal exporters ignore the standard and use Description
   // instead of Summary for the default field.  Correct for this.
   if (event->summary().isEmpty() &&
       !(event->description().isEmpty())) {
     QString tmpStr = event->description().simplifyWhiteSpace();
     event->setDescription("");
     event->setSummary(tmpStr);
   }
 
   return event;
 }
 
 FreeBusy *ICalFormatImpl::readFreeBusy(icalcomponent *vfreebusy)
 {
   FreeBusy *freebusy = new FreeBusy;
 
   readIncidenceBase(vfreebusy,freebusy);
 
   icalproperty *p = icalcomponent_get_first_property(vfreebusy,ICAL_ANY_PROPERTY);
 
   icaltimetype icaltime;
   icalperiodtype icalperiod;
   QDateTime period_start, period_end;
 
   while (p) {
     icalproperty_kind kind = icalproperty_isa(p);
     switch (kind) {
 
       case ICAL_DTSTART_PROPERTY:  // start date and time
         icaltime = icalproperty_get_dtstart(p);
         freebusy->setDtStart(readICalDateTime(icaltime));
         break;
 
       case ICAL_DTEND_PROPERTY:  // start End Date and Time
         icaltime = icalproperty_get_dtend(p);
         freebusy->setDtEnd(readICalDateTime(icaltime));
         break;
 
       case ICAL_FREEBUSY_PROPERTY:  //Any FreeBusy Times
         icalperiod = icalproperty_get_freebusy(p);
         period_start = readICalDateTime(icalperiod.start);
         period_end = readICalDateTime(icalperiod.end);
         freebusy->addPeriod(period_start, period_end);
         break;
 
       default:
         kdDebug(5800) << "ICALFormat::readIncidence(): Unknown property: " << kind
                   << endl;
       break;
     }
     p = icalcomponent_get_next_property(vfreebusy,ICAL_ANY_PROPERTY);
   }
 
   return freebusy;
 }
 
 Journal *ICalFormatImpl::readJournal(icalcomponent *vjournal)
 {
   Journal *journal = new Journal;
 
   readIncidence(vjournal,journal);
 
   return journal;
 }
 
 Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee)
 {
   icalparameter *p = 0;
 
   QString email = QString::fromUtf8(icalproperty_get_attendee(attendee));
 
   QString name;
   QString uid = QString::null;
   p = icalproperty_get_first_parameter(attendee,ICAL_CN_PARAMETER);
   if (p) {
     name = QString::fromUtf8(icalparameter_get_cn(p));
   } else {
   }
 
   bool rsvp=false;
   p = icalproperty_get_first_parameter(attendee,ICAL_RSVP_PARAMETER);
   if (p) {
     icalparameter_rsvp rsvpParameter = icalparameter_get_rsvp(p);
     if (rsvpParameter == ICAL_RSVP_TRUE) rsvp = true;
   }
 
   Attendee::PartStat status = Attendee::NeedsAction;
   p = icalproperty_get_first_parameter(attendee,ICAL_PARTSTAT_PARAMETER);
   if (p) {
     icalparameter_partstat partStatParameter = icalparameter_get_partstat(p);
     switch(partStatParameter) {
       default:
       case ICAL_PARTSTAT_NEEDSACTION:
         status = Attendee::NeedsAction;
         break;
       case ICAL_PARTSTAT_ACCEPTED:
         status = Attendee::Accepted;
         break;
       case ICAL_PARTSTAT_DECLINED:
         status = Attendee::Declined;
         break;
       case ICAL_PARTSTAT_TENTATIVE:
         status = Attendee::Tentative;
         break;
       case ICAL_PARTSTAT_DELEGATED:
         status = Attendee::Delegated;
         break;
       case ICAL_PARTSTAT_COMPLETED:
         status = Attendee::Completed;
         break;
       case ICAL_PARTSTAT_INPROCESS:
         status = Attendee::InProcess;
         break;
     }
   }
 
   Attendee::Role role = Attendee::ReqParticipant;
   p = icalproperty_get_first_parameter(attendee,ICAL_ROLE_PARAMETER);
   if (p) {
     icalparameter_role roleParameter = icalparameter_get_role(p);
     switch(roleParameter) {
       case ICAL_ROLE_CHAIR:
         role = Attendee::Chair;
         break;
       default:
       case ICAL_ROLE_REQPARTICIPANT:
         role = Attendee::ReqParticipant;
         break;
       case ICAL_ROLE_OPTPARTICIPANT:
         role = Attendee::OptParticipant;
         break;
       case ICAL_ROLE_NONPARTICIPANT:
         role = Attendee::NonParticipant;
         break;
     }
   }
 
   p = icalproperty_get_first_parameter(attendee,ICAL_X_PARAMETER);
   uid = icalparameter_get_xvalue(p);
   // This should be added, but there seems to be a libical bug here.
   /*while (p) {
    // if (icalparameter_get_xname(p) == "X-UID") {
     uid = icalparameter_get_xvalue(p);
     p = icalproperty_get_next_parameter(attendee,ICAL_X_PARAMETER);
   } */
 
   return new Attendee( name, email, rsvp, status, role, uid );
 }
 
 Attachment *ICalFormatImpl::readAttachment(icalproperty *attach)
 {
-  icalattachtype *a = icalproperty_get_attach(attach);
+  icalattach *a = icalproperty_get_attach(attach);
   icalparameter_value v = ICAL_VALUE_NONE;
   icalparameter_encoding e = ICAL_ENCODING_NONE;
  
   Attachment *attachment = 0;
-
+  /*
   icalparameter *vp = icalproperty_get_first_parameter(attach, ICAL_VALUE_PARAMETER);
   if (vp)
     v = icalparameter_get_value(vp);
 
   icalparameter *ep = icalproperty_get_first_parameter(attach, ICAL_ENCODING_PARAMETER);
   if (ep)
     e = icalparameter_get_encoding(ep);
-
-  if (v == ICAL_VALUE_BINARY && e == ICAL_ENCODING_BASE64)
-    attachment = new Attachment(icalattachtype_get_base64(a));
-  else if ((v == ICAL_VALUE_NONE || v == ICAL_VALUE_URI) && (e == ICAL_ENCODING_NONE || e == ICAL_ENCODING_8BIT)) {
-    attachment = new Attachment(QString(icalattachtype_get_url(a)));
-  } else {
-    kdWarning(5800) << "Unsupported attachment format, discarding it!" << endl;
-    return 0;
+  */
+  int isurl = icalattach_get_is_url (a);
+  if (isurl == 0)
+      attachment = new Attachment((const char*)icalattach_get_data(a));
+  else {
+    attachment = new Attachment(QString(icalattach_get_url(a)));
   }
 
   icalparameter *p = icalproperty_get_first_parameter(attach, ICAL_FMTTYPE_PARAMETER);
   if (p)
     attachment->setMimeType(QString(icalparameter_get_fmttype(p)));
 
   return attachment;
 }
 #include <qtextcodec.h> 
 void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence)
 {
   readIncidenceBase(parent,incidence);
 
   icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY);
   bool readrec = false;
   const char *text;
   int intvalue;
   icaltimetype icaltime;
   icaldurationtype icalduration;
   struct icalrecurrencetype rectype;
   QStringList categories;
 
   while (p) {
     icalproperty_kind kind = icalproperty_isa(p);
     switch (kind) {
 
       case ICAL_CREATED_PROPERTY:
         icaltime = icalproperty_get_created(p);
         incidence->setCreated(readICalDateTime(icaltime));
         break;
 
       case ICAL_SEQUENCE_PROPERTY:  // sequence
         intvalue = icalproperty_get_sequence(p);
         incidence->setRevision(intvalue);
         break;
 
       case ICAL_LASTMODIFIED_PROPERTY:  // last modification date
         icaltime = icalproperty_get_lastmodified(p);
         incidence->setLastModified(readICalDateTime(icaltime));
         break;
 
       case ICAL_DTSTART_PROPERTY:  // start date and time
         icaltime = icalproperty_get_dtstart(p);
         if (icaltime.is_date) {
           incidence->setDtStart(QDateTime(readICalDate(icaltime),QTime(0,0,0)));
           incidence->setFloats(true);
         } else {
           incidence->setDtStart(readICalDateTime(icaltime));
         }
         break;
 
       case ICAL_DURATION_PROPERTY:  // start date and time
         icalduration = icalproperty_get_duration(p);
         incidence->setDuration(readICalDuration(icalduration));
         break;
 
       case ICAL_DESCRIPTION_PROPERTY:  // description
         text = icalproperty_get_description(p);
         incidence->setDescription(QString::fromUtf8(text));
         break;
 
       case ICAL_SUMMARY_PROPERTY:  // summary
           {
               text = icalproperty_get_summary(p);
               incidence->setSummary(QString::fromUtf8(text));
           }
         break;
        case ICAL_STATUS_PROPERTY:  // summary
         {
             if ( ICAL_STATUS_CANCELLED == icalproperty_get_status(p) )
                 incidence->setCancelled( true );
         }
         break;
 
       case ICAL_LOCATION_PROPERTY:  // location
         text = icalproperty_get_location(p);
         incidence->setLocation(QString::fromUtf8(text));
         break;
 
 #if 0
   // status
   if ((vo = isAPropertyOf(vincidence, VCStatusProp)) != 0) {
     incidence->setStatus(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   }
   else
     incidence->setStatus("NEEDS ACTION");
 #endif
 
       case ICAL_PRIORITY_PROPERTY:  // priority
         intvalue = icalproperty_get_priority(p);
         incidence->setPriority(intvalue);
         break;
 
       case ICAL_CATEGORIES_PROPERTY:  // categories
         text = icalproperty_get_categories(p);
         categories.append(QString::fromUtf8(text));
         break;
         //*******************************************
       case ICAL_RRULE_PROPERTY:
           // we do need (maybe )start datetime of incidence for recurrence
           // such that we can read recurrence only after we read incidence completely
           readrec = true;
           rectype = icalproperty_get_rrule(p);
         break;
 
       case ICAL_EXDATE_PROPERTY:
         icaltime = icalproperty_get_exdate(p);
         incidence->addExDate(readICalDate(icaltime));
         break;
 
-      case ICAL_CLASS_PROPERTY:
-        text = icalproperty_get_class(p);
-        if (strcmp(text,"PUBLIC") == 0) {
+    case ICAL_CLASS_PROPERTY: {
+        int inttext = icalproperty_get_class(p);
+        if (inttext == ICAL_CLASS_PUBLIC ) {
           incidence->setSecrecy(Incidence::SecrecyPublic);
-        } else if (strcmp(text,"CONFIDENTIAL") == 0) {
+        } else if (inttext == ICAL_CLASS_CONFIDENTIAL ) {
           incidence->setSecrecy(Incidence::SecrecyConfidential);
         } else {
           incidence->setSecrecy(Incidence::SecrecyPrivate);
         }
+    }
         break;
 
       case ICAL_ATTACH_PROPERTY:  // attachments
         incidence->addAttachment(readAttachment(p));
         break;
  
       default:
 //        kdDebug(5800) << "ICALFormat::readIncidence(): Unknown property: " << kind
 //                  << endl;
         break;
     }
 
     p = icalcomponent_get_next_property(parent,ICAL_ANY_PROPERTY);
   }
   if ( readrec ) {
       readRecurrenceRule(rectype,incidence);
   }
   // kpilot stuff
 // TODO: move this application-specific code to kpilot
   QString kp = incidence->nonKDECustomProperty("X-PILOTID");
   if (!kp.isNull()) {
     incidence->setPilotId(kp.toInt());
   }
   kp = incidence->nonKDECustomProperty("X-PILOTSTAT");
   if (!kp.isNull()) {
     incidence->setSyncStatus(kp.toInt());
   }
   kp = incidence->nonKDECustomProperty("X-ZAURUSID");
   if (!kp.isNull()) {
     incidence->setZaurusId(kp.toInt());
   }
 
   kp = incidence->nonKDECustomProperty("X-ZAURUSUID");
   if (!kp.isNull()) {
     incidence->setZaurusUid(kp.toInt());
   }
 
   kp = incidence->nonKDECustomProperty("X-ZAURUSSTAT");
   if (!kp.isNull()) {
     incidence->setZaurusStat(kp.toInt());
   }
 
   // Cancel backwards compatibility mode for subsequent changes by the application
   incidence->recurrence()->setCompatVersion();
 
   // add categories
   incidence->setCategories(categories);
 
   // iterate through all alarms
   for (icalcomponent *alarm = icalcomponent_get_first_component(parent,ICAL_VALARM_COMPONENT);
        alarm;
        alarm = icalcomponent_get_next_component(parent,ICAL_VALARM_COMPONENT)) {
     readAlarm(alarm,incidence);
   }
 }
 
 void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase)
 {
   icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY);
 
   while (p) {
     icalproperty_kind kind = icalproperty_isa(p);
     switch (kind) {
 
       case ICAL_UID_PROPERTY:  // unique id
         incidenceBase->setUid(QString::fromUtf8(icalproperty_get_uid(p)));
         break;
 
       case ICAL_ORGANIZER_PROPERTY:  // organizer
         incidenceBase->setOrganizer(QString::fromUtf8(icalproperty_get_organizer(p)));
         break;
 
       case ICAL_ATTENDEE_PROPERTY:  // attendee
         incidenceBase->addAttendee(readAttendee(p));
         break;
 
       default:
         break;
     }
 
     p = icalcomponent_get_next_property(parent,ICAL_ANY_PROPERTY);
   }
 
   // custom properties
   readCustomProperties(parent, incidenceBase);
 }
 
 void ICalFormatImpl::readCustomProperties(icalcomponent *parent,CustomProperties *properties)
 {
   QMap<QCString, QString> customProperties;
 
   icalproperty *p = icalcomponent_get_first_property(parent,ICAL_X_PROPERTY);
 
   while (p) {
-
     QString value = QString::fromUtf8(icalproperty_get_x(p));
-    customProperties[icalproperty_get_name(p)] = value;
+    customProperties[icalproperty_get_x_name(p)] = value;
+    //qDebug("ICalFormatImpl::readCustomProperties %s %s",value.latin1(), icalproperty_get_x_name(p) );
 
     p = icalcomponent_get_next_property(parent,ICAL_X_PROPERTY);
   }
 
   properties->setCustomProperties(customProperties);
 }
 
 void ICalFormatImpl::readRecurrenceRule(struct icalrecurrencetype rrule,Incidence *incidence)
 {
 //  kdDebug(5800) << "Read recurrence for " << incidence->summary() << endl;
 
   Recurrence *recur = incidence->recurrence();
   recur->setCompatVersion(mCalendarVersion);
   recur->unsetRecurs();
 
   struct icalrecurrencetype r = rrule;
 
   dumpIcalRecurrence(r);
   readRecurrence( r, recur, incidence);
 }
 
 void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurrence* recur, Incidence *incidence)
 {
     int wkst;
     int index = 0;
     short day = 0;
     QBitArray qba(7);
     int frequ = r.freq;
     int interv = r.interval;
     // preprocessing for odd recurrence definitions
     
     if ( r.freq == ICAL_MONTHLY_RECURRENCE ) {
         if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX) {
             interv = 12;
         }
     }
     if ( r.freq == ICAL_YEARLY_RECURRENCE ) {
         if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX && r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX ) {
             frequ = ICAL_MONTHLY_RECURRENCE;
             interv = 12;
         }
     }
   
     switch (frequ) {
     case ICAL_MINUTELY_RECURRENCE:
         if (!icaltime_is_null_time(r.until)) {
             recur->setMinutely(interv,readICalDateTime(r.until));
         } else {
             if (r.count == 0)
                 recur->setMinutely(interv,-1);
             else
                 recur->setMinutely(interv,r.count);
         }
         break;
     case ICAL_HOURLY_RECURRENCE:
         if (!icaltime_is_null_time(r.until)) {
             recur->setHourly(interv,readICalDateTime(r.until));
         } else {
             if (r.count == 0)
                 recur->setHourly(interv,-1);
             else
                 recur->setHourly(interv,r.count);
         }
         break;
     case ICAL_DAILY_RECURRENCE:
         if (!icaltime_is_null_time(r.until)) {
             recur->setDaily(interv,readICalDate(r.until));
         } else {
             if (r.count == 0)
                 recur->setDaily(interv,-1);
             else
                 recur->setDaily(interv,r.count);
         }
         break;
     case ICAL_WEEKLY_RECURRENCE:
         //      kdDebug(5800) << "WEEKLY_RECURRENCE" << endl;
         wkst = (r.week_start + 5)%7 + 1;
         if (!icaltime_is_null_time(r.until)) {
             recur->setWeekly(interv,qba,readICalDate(r.until),wkst);
         } else {
             if (r.count == 0)
                 recur->setWeekly(interv,qba,-1,wkst);
             else
                 recur->setWeekly(interv,qba,r.count,wkst);
         } 
         if ( r.by_day[0] == ICAL_RECURRENCE_ARRAY_MAX) {
             int wday = incidence->dtStart().date().dayOfWeek ()-1;
             //qDebug("weekly error found ");
             qba.setBit(wday);  
         } else {
             while((day = r.by_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
                 //        kdDebug(5800) << " " << day << endl;
                 qba.setBit((day+5)%7);    // convert from Sunday=1 to Monday=0
             }
         }
         break;
     case ICAL_MONTHLY_RECURRENCE:
        
         if (r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
             if (!icaltime_is_null_time(r.until)) {
                 recur->setMonthly(Recurrence::rMonthlyPos,interv,
                                   readICalDate(r.until));
             } else {
                 if (r.count == 0)
                     recur->setMonthly(Recurrence::rMonthlyPos,interv,-1);
                 else
                     recur->setMonthly(Recurrence::rMonthlyPos,interv,r.count);
             }
             bool useSetPos = false;
             short pos = 0;
             while((day = r.by_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
                 //          kdDebug(5800) << "----a " << index << ": " << day << endl;
                 pos = icalrecurrencetype_day_position(day);
                 if (pos) {
                     day = icalrecurrencetype_day_day_of_week(day);
                     QBitArray ba(7);          // don't wipe qba
                     ba.setBit((day+5)%7);     // convert from Sunday=1 to Monday=0
                     recur->addMonthlyPos(pos,ba);
                 } else {
                     qba.setBit((day+5)%7);    // convert from Sunday=1 to Monday=0
                     useSetPos = true;
                 }
             }
             if (useSetPos) {
                 if (r.by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX) {
                     recur->addMonthlyPos(r.by_set_pos[0],qba);
                 }
             }
         } else if (r.by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
             if (!icaltime_is_null_time(r.until)) {
                 recur->setMonthly(Recurrence::rMonthlyDay,interv,
                                   readICalDate(r.until));
             } else {
                 if (r.count == 0)
                     recur->setMonthly(Recurrence::rMonthlyDay,interv,-1);
                 else
                     recur->setMonthly(Recurrence::rMonthlyDay,interv,r.count);
             }
             while((day = r.by_month_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
                 //          kdDebug(5800) << "----b " << day << endl;
                 recur->addMonthlyDay(day);
             }
         }
         break;
     case ICAL_YEARLY_RECURRENCE:
         if (r.by_year_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
             if (!icaltime_is_null_time(r.until)) {
                 recur->setYearly(Recurrence::rYearlyDay,interv,
                                  readICalDate(r.until));
             } else {
                 if (r.count == 0)
                     recur->setYearly(Recurrence::rYearlyDay,interv,-1);
                 else
                     recur->setYearly(Recurrence::rYearlyDay,interv,r.count);
             }
             while((day = r.by_year_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
                 recur->addYearlyNum(day);
             }
         } else if ( true /*r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX*/) {
             if (r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
                 if (!icaltime_is_null_time(r.until)) {
                     recur->setYearly(Recurrence::rYearlyPos,interv,
                                      readICalDate(r.until));
                 } else {
                     if (r.count == 0)
                         recur->setYearly(Recurrence::rYearlyPos,interv,-1);
                     else
                         recur->setYearly(Recurrence::rYearlyPos,interv,r.count);
                 }
                 bool useSetPos = false;
                 short pos = 0;
                 while((day = r.by_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
                     //            kdDebug(5800) << "----a " << index << ": " << day << endl;
                     pos = icalrecurrencetype_day_position(day);
                     if (pos) {
                         day = icalrecurrencetype_day_day_of_week(day);
                         QBitArray ba(7);          // don't wipe qba
                         ba.setBit((day+5)%7);     // convert from Sunday=1 to Monday=0
                         recur->addYearlyMonthPos(pos,ba);
                     } else {
                         qba.setBit((day+5)%7);    // convert from Sunday=1 to Monday=0
                         useSetPos = true;
                     }
                 }
                 if (useSetPos) {
                     if (r.by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX) {
                         recur->addYearlyMonthPos(r.by_set_pos[0],qba);
                     }
                 }
             } else { 
                 if (!icaltime_is_null_time(r.until)) {
                     recur->setYearly(Recurrence::rYearlyMonth,interv,
                                      readICalDate(r.until));
                 } else {
                     if (r.count == 0)
                         recur->setYearly(Recurrence::rYearlyMonth,interv,-1);
                     else
                         recur->setYearly(Recurrence::rYearlyMonth,interv,r.count);
                 }
             }
             if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX ) {
                 index = 0;
                 while((day = r.by_month[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
                     recur->addYearlyNum(day);
                 }
             } else {
                 recur->addYearlyNum(incidence->dtStart().date().month());
             }
         }
       break;
   default:
       ;
       break;
   }
 }
 
 void ICalFormatImpl::readAlarm(icalcomponent *alarm,Incidence *incidence)
 {
   //kdDebug(5800) << "Read alarm for " << incidence->summary() << endl;
 
   Alarm* ialarm = incidence->newAlarm();
   ialarm->setRepeatCount(0);
   ialarm->setEnabled(true);
 
   // Determine the alarm's action type
   icalproperty *p = icalcomponent_get_first_property(alarm,ICAL_ACTION_PROPERTY);
   if ( !p ) {
     return;
   }
 
   icalproperty_action action = icalproperty_get_action(p);
   Alarm::Type type = Alarm::Display;
   switch ( action ) {
     case ICAL_ACTION_DISPLAY:   type = Alarm::Display;  break;
     case ICAL_ACTION_AUDIO:     type = Alarm::Audio;  break;
     case ICAL_ACTION_PROCEDURE: type = Alarm::Procedure;  break;
     case ICAL_ACTION_EMAIL:     type = Alarm::Email;  break;
     default:
         ;
       return;
   }
   ialarm->setType(type);
 
   p = icalcomponent_get_first_property(alarm,ICAL_ANY_PROPERTY);
   while (p) {
     icalproperty_kind kind = icalproperty_isa(p);
 
     switch (kind) {
       case ICAL_TRIGGER_PROPERTY: {
         icaltriggertype trigger = icalproperty_get_trigger(p);
         if (icaltime_is_null_time(trigger.time)) {
           if (icaldurationtype_is_null_duration(trigger.duration)) {
             kdDebug(5800) << "ICalFormatImpl::readAlarm(): Trigger has no time and no duration." << endl;
           } else {
             Duration duration = icaldurationtype_as_int( trigger.duration );
             icalparameter *param = icalproperty_get_first_parameter(p,ICAL_RELATED_PARAMETER);
             if (param && icalparameter_get_related(param) == ICAL_RELATED_END)
               ialarm->setEndOffset(duration);
             else
               ialarm->setStartOffset(duration);
           }
         } else {
           ialarm->setTime(readICalDateTime(trigger.time));
         }
         break;
       }
       case ICAL_DURATION_PROPERTY: {
         icaldurationtype duration = icalproperty_get_duration(p);
         ialarm->setSnoozeTime(icaldurationtype_as_int(duration)/60);
         break;
       }
       case ICAL_REPEAT_PROPERTY:
         ialarm->setRepeatCount(icalproperty_get_repeat(p));
         break;
 
       // Only in DISPLAY and EMAIL and PROCEDURE alarms
       case ICAL_DESCRIPTION_PROPERTY: {
         QString description = QString::fromUtf8(icalproperty_get_description(p));
         switch ( action ) {
           case ICAL_ACTION_DISPLAY:
             ialarm->setText( description );
             break;
           case ICAL_ACTION_PROCEDURE:
             ialarm->setProgramArguments( description );
             break;
           case ICAL_ACTION_EMAIL:
             ialarm->setMailText( description );
             break;
           default:
             break;
         }
         break;
       }
       // Only in EMAIL alarm
       case ICAL_SUMMARY_PROPERTY:
         ialarm->setMailSubject(QString::fromUtf8(icalproperty_get_summary(p)));
         break;
 
       // Only in EMAIL alarm
       case ICAL_ATTENDEE_PROPERTY: {
         QString email = QString::fromUtf8(icalproperty_get_attendee(p));
         QString name;
         icalparameter *param = icalproperty_get_first_parameter(p,ICAL_CN_PARAMETER);
         if (param) {
           name = QString::fromUtf8(icalparameter_get_cn(param));
         }
         ialarm->addMailAddress(Person(name, email));
         break;
       }
       // Only in AUDIO and EMAIL and PROCEDURE alarms
       case ICAL_ATTACH_PROPERTY: {
-        icalattachtype *attach = icalproperty_get_attach(p);
-        QString url = QFile::decodeName(icalattachtype_get_url(attach));
+        icalattach *attach = icalproperty_get_attach(p);
+        QString url = QFile::decodeName(icalattach_get_url(attach));
         switch ( action ) {
           case ICAL_ACTION_AUDIO:
             ialarm->setAudioFile( url );
             break;
           case ICAL_ACTION_PROCEDURE:
             ialarm->setProgramFile( url );
             break;
           case ICAL_ACTION_EMAIL:
             ialarm->addMailAttachment( url );
             break;
           default:
             break;
         }
         break;
       }
       default:
         break;
     }
 
     p = icalcomponent_get_next_property(alarm,ICAL_ANY_PROPERTY);
   }
 
   // custom properties
   readCustomProperties(alarm, ialarm);
 
   // TODO: check for consistency of alarm properties
 }
 
 icaltimetype ICalFormatImpl::writeICalDate(const QDate &date)
 {
   icaltimetype t;
 
   t.year = date.year();
   t.month = date.month();
   t.day = date.day();
 
   t.hour = 0;
   t.minute = 0;
   t.second = 0;
 
   t.is_date = 1;
 
   t.is_utc = 0;
 
   t.zone = 0;
 
   return t;
 }
 
 icaltimetype ICalFormatImpl::writeICalDateTime(const QDateTime &dt )
 {
   icaltimetype t;
   t.is_date = 0;
   t.zone = 0;
   QDateTime  datetime;
   if ( mParent->utc() ) {
       int offset =  KGlobal::locale()->localTimeOffset( dt );
       datetime =  dt.addSecs ( -offset*60);
       t.is_utc = 1;
   }
   else {
       datetime = dt;
       t.is_utc = 0;
 
   }
   t.year = datetime.date().year();
   t.month = datetime.date().month();
   t.day = datetime.date().day();
 
   t.hour = datetime.time().hour();
   t.minute = datetime.time().minute();
   t.second = datetime.time().second();
 
   //qDebug("*** time %s   localtime %s ",dt .toString().latin1()     ,datetime .toString().latin1() );
 
 //   if ( mParent->utc() ) {
 //      datetime =  KGlobal::locale()->localTime( dt );
 //      qDebug("*** time %s   localtime %s ",dt .toString().latin1()     ,datetime .toString().latin1() );
 //     if (mParent->timeZoneId().isEmpty())
 //       t = icaltime_as_utc(t, 0);
 //     else
 //       t = icaltime_as_utc(t,mParent->timeZoneId().local8Bit());
 //   }
 
   return t;
 }
 
 QDateTime ICalFormatImpl::readICalDateTime(icaltimetype t)
 {
     QDateTime dt (QDate(t.year,t.month,t.day),
                   QTime(t.hour,t.minute,t.second) );
 
   if (t.is_utc) {
       int offset = KGlobal::locale()->localTimeOffset( dt );
        dt = dt.addSecs ( offset*60);
   }
 
   return dt;
 }
 
 QDate ICalFormatImpl::readICalDate(icaltimetype t)
 {
   return QDate(t.year,t.month,t.day);
 }
 
 icaldurationtype ICalFormatImpl::writeICalDuration(int seconds)
 {
   icaldurationtype d;
 
   d.weeks    = seconds   % gSecondsPerWeek;
   seconds   -= d.weeks   * gSecondsPerWeek;
   d.days     = seconds   % gSecondsPerDay;
   seconds   -= d.days    * gSecondsPerDay;
   d.hours    = seconds   % gSecondsPerHour;
   seconds   -= d.hours   * gSecondsPerHour;
   d.minutes  = seconds   % gSecondsPerMinute;
   seconds   -= d.minutes * gSecondsPerMinute;
   d.seconds  = seconds;
   d.is_neg = 0;
 
   return d;
 }
 
 int ICalFormatImpl::readICalDuration(icaldurationtype d)
 {
   int result = 0;
 
   result += d.weeks   * gSecondsPerWeek;
   result += d.days    * gSecondsPerDay;
   result += d.hours   * gSecondsPerHour;
   result += d.minutes * gSecondsPerMinute;
   result += d.seconds;
 
   if (d.is_neg) result *= -1;
 
   return result;
 } 
 
 icalcomponent *ICalFormatImpl::createCalendarComponent(Calendar *cal)
 {
   icalcomponent *calendar;
 
   // Root component
   calendar = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
 
   icalproperty *p;
 
   // Product Identifier
   p = icalproperty_new_prodid(CalFormat::productId().utf8());
   icalcomponent_add_property(calendar,p);
 
   // TODO: Add time zone
 
   // iCalendar version (2.0)
   p = icalproperty_new_version(const_cast<char *>(_ICAL_VERSION));
   icalcomponent_add_property(calendar,p);
 
   // Custom properties
   if( cal != 0 )
     writeCustomProperties(calendar, cal);
 
   return calendar;
 }
 
 
 
 // take a raw vcalendar (i.e. from a file on disk, clipboard, etc. etc.
 // and break it down from its tree-like format into the dictionary format
 // that is used internally in the ICalFormatImpl.
 bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar)
 {
   // this function will populate the caldict dictionary and other event
   // lists. It turns vevents into Events and then inserts them.
 
     if (!calendar) return false;
 
 // TODO: check for METHOD
 #if 0
   if ((curVO = isAPropertyOf(vcal, ICMethodProp)) != 0) {
     char *methodType = 0;
     methodType = fakeCString(vObjectUStringZValue(curVO));
     if (mEnableDialogs)
       KMessageBox::information(mTopWidget,
                                i18n("This calendar is an iTIP transaction of type \"%1\".")
                                .arg(methodType),
                                i18n("%1: iTIP Transaction").arg(CalFormat::application()));
     delete methodType;
   }
 #endif
 
   icalproperty *p;
 
   p = icalcomponent_get_first_property(calendar,ICAL_PRODID_PROPERTY);
   if (!p) {
 // TODO: does no PRODID really matter?
 //    mParent->setException(new ErrorFormat(ErrorFormat::CalVersionUnknown));
 //    return false;
     mLoadedProductId = "";
     mCalendarVersion = 0;
   } else {
     mLoadedProductId = QString::fromUtf8(icalproperty_get_prodid(p));
     mCalendarVersion = CalFormat::calendarVersion(mLoadedProductId);
 
     delete mCompat;
     mCompat = CompatFactory::createCompat( mLoadedProductId );
   }
 
 // TODO: check for unknown PRODID
 #if 0
   if (!mCalendarVersion
   &&  CalFormat::productId() != mLoadedProductId) {
     // warn the user that we might have trouble reading non-known calendar.
     if (mEnableDialogs)
       KMessageBox::information(mTopWidget,
                              i18n("This vCalendar file was not created by KOrganizer "
                                      "or any other product we support. Loading anyway..."),
                              i18n("%1: Unknown vCalendar Vendor").arg(CalFormat::application()));
   }
 #endif
 
   p = icalcomponent_get_first_property(calendar,ICAL_VERSION_PROPERTY);
   if (!p) {
     mParent->setException(new ErrorFormat(ErrorFormat::CalVersionUnknown));
     return false;
   } else {
     const char *version = icalproperty_get_version(p);
 
     if (strcmp(version,"1.0") == 0) {
       mParent->setException(new ErrorFormat(ErrorFormat::CalVersion1,
                             i18n("Expected iCalendar format")));
       return false;
     } else if (strcmp(version,"2.0") != 0) {
       mParent->setException(new ErrorFormat(ErrorFormat::CalVersionUnknown));
       return false;
     }
   }
 
 
 // TODO: check for calendar format version
 #if 0
   // warn the user we might have trouble reading this unknown version.
   if ((curVO = isAPropertyOf(vcal, VCVersionProp)) != 0) {
     char *s = fakeCString(vObjectUStringZValue(curVO));
     if (strcmp(_VCAL_VERSION, s) != 0)
       if (mEnableDialogs)
         KMessageBox::sorry(mTopWidget,
                              i18n("This vCalendar file has version %1.\n"
                                   "We only support %2.")
                              .arg(s).arg(_VCAL_VERSION),
                              i18n("%1: Unknown vCalendar Version").arg(CalFormat::application()));
     deleteStr(s);
   }
 #endif
 
   // custom properties
   readCustomProperties(calendar, cal);
 
 // TODO: set time zone
 #if 0
   // set the time zone
   if ((curVO = isAPropertyOf(vcal, VCTimeZoneProp)) != 0) {
     char *s = fakeCString(vObjectUStringZValue(curVO));
     cal->setTimeZone(s);
     deleteStr(s);
   }
 #endif
 
   // Store all events with a relatedTo property in a list for post-processing
   mEventsRelate.clear();
   mTodosRelate.clear();
   // TODO: make sure that only actually added ecvens go to this lists.
 
   icalcomponent *c;
 
   // Iterate through all todos
   c = icalcomponent_get_first_component(calendar,ICAL_VTODO_COMPONENT);
   while (c) {
 //    kdDebug(5800) << "----Todo found" << endl;
     Todo *todo = readTodo(c);
     if (!cal->todo(todo->uid())) cal->addTodo(todo);
     c = icalcomponent_get_next_component(calendar,ICAL_VTODO_COMPONENT);
   }
 
   // Iterate through all events
   c = icalcomponent_get_first_component(calendar,ICAL_VEVENT_COMPONENT);
   while (c) {
 //    kdDebug(5800) << "----Event found" << endl;
     Event *event = readEvent(c);
     if (!cal->event(event->uid())) cal->addEvent(event);
     c = icalcomponent_get_next_component(calendar,ICAL_VEVENT_COMPONENT);
   }
 
   // Iterate through all journals
   c = icalcomponent_get_first_component(calendar,ICAL_VJOURNAL_COMPONENT);
   while (c) {
 //    kdDebug(5800) << "----Journal found" << endl;
     Journal *journal = readJournal(c);
     if (!cal->journal(journal->uid())) cal->addJournal(journal);
     c = icalcomponent_get_next_component(calendar,ICAL_VJOURNAL_COMPONENT);
   }
 
 #if 0
   initPropIterator(&i, vcal);
 
   // go through all the vobjects in the vcal
   while (moreIteration(&i)) {
     curVO = nextVObject(&i);
 
     /************************************************************************/
 
     // now, check to see that the object is an event or todo.
     if (strcmp(vObjectName(curVO), VCEventProp) == 0) {
 
       if ((curVOProp = isAPropertyOf(curVO, KPilotStatusProp)) != 0) {
         char *s;
         s = fakeCString(vObjectUStringZValue(curVOProp));
         // check to see if event was deleted by the kpilot conduit
         if (atoi(s) == Event::SYNCDEL) {
           deleteStr(s);
           goto SKIP;
         }
         deleteStr(s);
       }
 
       // this code checks to see if we are trying to read in an event
       // that we already find to be in the calendar.  If we find this
       // to be the case, we skip the event.
       if ((curVOProp = isAPropertyOf(curVO, VCUniqueStringProp)) != 0) {
         char *s = fakeCString(vObjectUStringZValue(curVOProp));
         QString tmpStr(s);
         deleteStr(s);
 
         if (cal->event(tmpStr)) {
           goto SKIP;
         }
         if (cal->todo(tmpStr)) {
           goto SKIP;
         }
       }
 
       if ((!(curVOProp = isAPropertyOf(curVO, VCDTstartProp))) &&
           (!(curVOProp = isAPropertyOf(curVO, VCDTendProp)))) {
         kdDebug(5800) << "found a VEvent with no DTSTART and no DTEND! Skipping..." << endl;
         goto SKIP;
       }
 
       anEvent = VEventToEvent(curVO);
       // we now use addEvent instead of insertEvent so that the
       // signal/slot get connected.
       if (anEvent)
         cal->addEvent(anEvent);
       else {
         // some sort of error must have occurred while in translation.
         goto SKIP;
       }
     } else if (strcmp(vObjectName(curVO), VCTodoProp) == 0) {
       anEvent = VTodoToEvent(curVO);
       cal->addTodo(anEvent);
     } else if ((strcmp(vObjectName(curVO), VCVersionProp) == 0) ||
                (strcmp(vObjectName(curVO), VCProdIdProp) == 0) ||
                (strcmp(vObjectName(curVO), VCTimeZoneProp) == 0)) {
       // do nothing, we know these properties and we want to skip them.
       // we have either already processed them or are ignoring them.
       ;
     } else {
         ;
     }
   SKIP:
     ;
   } // while
 #endif
 
   // Post-Process list of events with relations, put Event objects in relation
   Event *ev;
   for ( ev=mEventsRelate.first(); ev != 0; ev=mEventsRelate.next() ) {
     ev->setRelatedTo(cal->event(ev->relatedToUid()));
   }
   Todo *todo;
   for ( todo=mTodosRelate.first(); todo != 0; todo=mTodosRelate.next() ) {
     todo->setRelatedTo(cal->todo(todo->relatedToUid()));
   }
 
   return true;
 }
 
 QString ICalFormatImpl::extractErrorProperty(icalcomponent *c)
 {
 //  kdDebug(5800) << "ICalFormatImpl:extractErrorProperty: "
 //            << icalcomponent_as_ical_string(c) << endl;
 
   QString errorMessage;
 
   icalproperty *error;
   error = icalcomponent_get_first_property(c,ICAL_XLICERROR_PROPERTY);
   while(error) {
     errorMessage += icalproperty_get_xlicerror(error);
     errorMessage += "\n";
     error = icalcomponent_get_next_property(c,ICAL_XLICERROR_PROPERTY);
   }
 
 //  kdDebug(5800) << "ICalFormatImpl:extractErrorProperty: " << errorMessage << endl;
 
   return errorMessage;
 }
 
 void ICalFormatImpl::dumpIcalRecurrence(icalrecurrencetype r)
 {
   int i;
 
  
   if (r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
     int index = 0;
     QString out = " By Day: ";
     while((i = r.by_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
       out.append(QString::number(i) + " ");
     }
   }
   if (r.by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
     int index = 0;
     QString out = " By Month Day: ";
     while((i = r.by_month_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
       out.append(QString::number(i) + " ");
     }
   }
   if (r.by_year_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
     int index = 0;
     QString out = " By Year Day: ";
     while((i = r.by_year_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
       out.append(QString::number(i) + " ");
     }
   }
   if (r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX) {
     int index = 0;
     QString out = " By Month: ";
     while((i = r.by_month[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
       out.append(QString::number(i) + " ");
     }
   }
   if (r.by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX) {
     int index = 0;
     QString out = " By Set Pos: ";
     while((i = r.by_set_pos[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
       out.append(QString::number(i) + " ");
     }
   }
 }
 
 icalcomponent *ICalFormatImpl::createScheduleComponent(IncidenceBase *incidence,
                                                    Scheduler::Method method)
 {
   icalcomponent *message = createCalendarComponent();
 
   icalproperty_method icalmethod = ICAL_METHOD_NONE;
 
   switch (method) {
     case Scheduler::Publish:
       icalmethod = ICAL_METHOD_PUBLISH;
       break;
     case Scheduler::Request:
       icalmethod = ICAL_METHOD_REQUEST;
       break;
     case Scheduler::Refresh:
       icalmethod = ICAL_METHOD_REFRESH;
       break;
     case Scheduler::Cancel:
       icalmethod = ICAL_METHOD_CANCEL;
       break;
     case Scheduler::Add:
       icalmethod = ICAL_METHOD_ADD;
       break;
     case Scheduler::Reply:
       icalmethod = ICAL_METHOD_REPLY;
       break;
     case Scheduler::Counter:
       icalmethod = ICAL_METHOD_COUNTER;
       break;
     case Scheduler::Declinecounter:
       icalmethod = ICAL_METHOD_DECLINECOUNTER;
       break;
     default:
       
       return message;
   }
 
   icalcomponent_add_property(message,icalproperty_new_method(icalmethod));
 
   // TODO: check, if dynamic cast is required
   if(incidence->type() == "Todo") {
     Todo *todo = static_cast<Todo *>(incidence);
     icalcomponent_add_component(message,writeTodo(todo));
   }
   if(incidence->type() == "Event") {
     Event *event = static_cast<Event *>(incidence);
     icalcomponent_add_component(message,writeEvent(event));
   }
   if(incidence->type() == "FreeBusy") {
     FreeBusy *freebusy = static_cast<FreeBusy *>(incidence);
     icalcomponent_add_component(message,writeFreeBusy(freebusy, method));
   }
 
   return message;
 }
diff --git a/libkcal/icalformatimpl.h b/libkcal/icalformatimpl.h
index 2f32365..203c302 100644
--- a/libkcal/icalformatimpl.h
+++ b/libkcal/icalformatimpl.h
@@ -1,109 +1,109 @@
 /*
     This file is part of libkcal.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef ICALFORMATIMPL_H
 #define ICALFORMATIMPL_H
 
 #include <qstring.h>
 
 #include "scheduler.h"
 #include "freebusy.h"
 
 extern "C" {
   #include <ical.h>
   #include <icalss.h>
 }
 
 namespace KCal {
 
 class Compat;
 
 /**
   This class provides the libical dependent functions for ICalFormat.
 */
 class ICalFormatImpl {
   public:
     /** Create new iCal format for calendar object */
     ICalFormatImpl( ICalFormat *parent );
     virtual ~ICalFormatImpl();
 
     bool populate( Calendar *, icalcomponent *fs);
 
     icalcomponent *writeIncidence(Incidence *incidence);
     icalcomponent *writeTodo(Todo *todo);
     icalcomponent *writeEvent(Event *event);
     icalcomponent *writeFreeBusy(FreeBusy *freebusy,
                                  Scheduler::Method method);
     icalcomponent *writeJournal(Journal *journal);
     void writeIncidence(icalcomponent *parent,Incidence *incidence);
     icalproperty *writeAttendee(Attendee *attendee);
     icalproperty *writeAttachment(Attachment *attach);
     icalproperty *writeRecurrenceRule(Recurrence *);
-    icalproperty *writeAlarm(Alarm *alarm);
+    icalcomponent *writeAlarm(Alarm *alarm);
 
     QString extractErrorProperty(icalcomponent *);
     Todo *readTodo(icalcomponent *vtodo);
     Event *readEvent(icalcomponent *vevent);
     FreeBusy *readFreeBusy(icalcomponent *vfreebusy);
     Journal *readJournal(icalcomponent *vjournal);
     Attendee *readAttendee(icalproperty *attendee);
     Attachment *readAttachment(icalproperty *attach);
     void readIncidence(icalcomponent *parent,Incidence *incidence);
     void readRecurrenceRule(struct icalrecurrencetype rrule,Incidence *event);
     void readRecurrence( const struct icalrecurrencetype &r, Recurrence* recur,Incidence *event );
     void readAlarm(icalcomponent *alarm,Incidence *incidence);
     /** Return the PRODID string loaded from calendar file */
     const QString &loadedProductId()  { return mLoadedProductId; }
 
     icaltimetype writeICalDate(const QDate &);
     QDate readICalDate(icaltimetype);
     icaltimetype writeICalDateTime(const QDateTime &);
     QDateTime readICalDateTime(icaltimetype);
     icaldurationtype writeICalDuration(int seconds);
     int readICalDuration(icaldurationtype);
     icalcomponent *createCalendarComponent(Calendar * = 0);
     icalcomponent *createScheduleComponent(IncidenceBase *,Scheduler::Method);
 
   private:
     void writeIncidenceBase(icalcomponent *parent,IncidenceBase *);
     void readIncidenceBase(icalcomponent *parent,IncidenceBase *);
     void writeCustomProperties(icalcomponent *parent,CustomProperties *);
     void readCustomProperties(icalcomponent *parent,CustomProperties *);
     void dumpIcalRecurrence(icalrecurrencetype);
 
     ICalFormat *mParent;
     Calendar *mCalendar;
 
     QString mLoadedProductId;         // PRODID string loaded from calendar file
     int mCalendarVersion;             // determines backward compatibility mode on read
 
     QPtrList<Event> mEventsRelate;           // events with relations
     QPtrList<Todo> mTodosRelate;             // todos with relations
 
     static const int mSecondsPerWeek;
     static const int mSecondsPerDay;
     static const int mSecondsPerHour;
     static const int mSecondsPerMinute;
 
     Compat *mCompat;
 };
 
 }
 
 #endif
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 59030d5..72a781a 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -1,1678 +1,1678 @@
 /*
     This file is part of libkcal.
     Copyright (c) 1998 Preston Brwon
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qapplication.h>
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qptrlist.h>
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qdialog.h>
 #include <qfile.h>
 
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
 #include "vcc.h"
 #include "vobject.h"
 
 #include "vcaldrag.h"
 #include "calendar.h"
 
 #include "vcalformat.h"
 
 using namespace KCal;
 
 VCalFormat::VCalFormat()
 {
 }
 
 VCalFormat::~VCalFormat()
 {
 }
 
 bool VCalFormat::load(Calendar *calendar, const QString &fileName)
 {
   mCalendar = calendar;
 
   clearException();
 
   kdDebug(5800) << "VCalFormat::load() " << fileName << endl;
 
   VObject *vcal = 0;
 
   // this is not necessarily only 1 vcal.  Could be many vcals, or include
   // a vcard...
   vcal = Parse_MIME_FromFileName(const_cast<char *>(QFile::encodeName(fileName).data()));
 
   if (!vcal) {
     setException(new ErrorFormat(ErrorFormat::CalVersionUnknown));
     return FALSE;
   }
 
   // any other top-level calendar stuff should be added/initialized here
 
   // put all vobjects into their proper places
   populate(vcal);
 
   // clean up from vcal API stuff
   cleanVObjects(vcal);
   cleanStrTbl();
 
   return true;
 }
 
 
 bool VCalFormat::save(Calendar *calendar, const QString &fileName)
 {
   mCalendar = calendar;
 
   QString tmpStr;
   VObject *vcal, *vo;
 
   kdDebug(5800) << "VCalFormat::save(): " << fileName << endl;
 
   vcal = newVObject(VCCalProp);
 
   //  addPropValue(vcal,VCLocationProp, "0.0");
   addPropValue(vcal,VCProdIdProp, productId());
   tmpStr = mCalendar->getTimeZoneStr();
   //qDebug("mCalendar->getTimeZoneStr() %s",tmpStr.latin1() );
   addPropValue(vcal,VCTimeZoneProp, tmpStr.local8Bit());
   addPropValue(vcal,VCVersionProp, _VCAL_VERSION);
 
   // TODO STUFF
   QPtrList<Todo> todoList = mCalendar->rawTodos();
   QPtrListIterator<Todo> qlt(todoList);
   for (; qlt.current(); ++qlt) {
     vo = eventToVTodo(qlt.current());
     addVObjectProp(vcal, vo);
   }
 
   // EVENT STUFF
   QPtrList<Event> events = mCalendar->rawEvents();
   Event *ev;
   for(ev=events.first();ev;ev=events.next()) {
     vo = eventToVEvent(ev);
     addVObjectProp(vcal, vo);
   }
 
   writeVObjectToFile(QFile::encodeName(fileName).data() ,vcal);
   cleanVObjects(vcal);
   cleanStrTbl();
 
   if (QFile::exists(fileName)) {
     kdDebug(5800) << "No error" << endl;
     return true;
   } else  {
     kdDebug(5800) << "Error" << endl;
     return false; // error
   }
 }
 
 bool VCalFormat::fromString( Calendar *calendar, const QString &text )
 {
   // TODO: Factor out VCalFormat::fromString()
 
   QCString data = text.utf8();
 
   if ( !data.size() ) return false;
 
   VObject *vcal = Parse_MIME( data.data(), data.size());
   if ( !vcal ) return false;
 
   VObjectIterator i;
   VObject *curvo;
   initPropIterator( &i, vcal );
 
   // we only take the first object. TODO: parse all incidences.
   do  {
     curvo = nextVObject( &i );
   } while ( strcmp( vObjectName( curvo ), VCEventProp ) &&
             strcmp( vObjectName( curvo ), VCTodoProp ) );
 
   if ( strcmp( vObjectName( curvo ), VCEventProp ) == 0 ) {
     Event *event = VEventToEvent( curvo );
     calendar->addEvent( event );
   } else {
     kdDebug(5800) << "VCalFormat::fromString(): Unknown object type." << endl;
     deleteVObject( vcal );
     return false;
   }
 
   deleteVObject( vcal );
 
   return true;
 }
 
 QString VCalFormat::toString( Calendar *calendar )
 {
   // TODO: Factor out VCalFormat::asString()
 
   VObject *vcal = newVObject(VCCalProp);
 
   addPropValue( vcal, VCProdIdProp, CalFormat::productId() );
   QString tmpStr = mCalendar->getTimeZoneStr();
   addPropValue( vcal, VCTimeZoneProp, tmpStr.local8Bit() );
   addPropValue( vcal, VCVersionProp, _VCAL_VERSION );
 
   // TODO: Use all data.
   QPtrList<Event> events = calendar->events();
   Event *event = events.first();
   if ( !event ) return QString::null;
 
   VObject *vevent = eventToVEvent( event );
 
   addVObjectProp( vcal, vevent );
 
   char *buf = writeMemVObject( 0, 0, vcal );
 
   QString result( buf );
 
   cleanVObject( vcal );
 
   return result;
 }
 
 VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
 {
   VObject *vtodo;
   QString tmpStr;
   QStringList tmpStrList;
 
   vtodo = newVObject(VCTodoProp);
 
   // due date
   if (anEvent->hasDueDate()) {
     tmpStr = qDateTimeToISO(anEvent->dtDue(),
                             !anEvent->doesFloat());
     addPropValue(vtodo, VCDueProp, tmpStr.local8Bit());
   }
 
   // start date
   if (anEvent->hasStartDate()) {
     tmpStr = qDateTimeToISO(anEvent->dtStart(),
                             !anEvent->doesFloat());
     addPropValue(vtodo, VCDTstartProp, tmpStr.local8Bit());
   }
 
   // creation date
   tmpStr = qDateTimeToISO(anEvent->created());
   addPropValue(vtodo, VCDCreatedProp, tmpStr.local8Bit());
 
   // unique id
   addPropValue(vtodo, VCUniqueStringProp,
                anEvent->uid().local8Bit());
 
   // revision
   tmpStr.sprintf("%i", anEvent->revision());
   addPropValue(vtodo, VCSequenceProp, tmpStr.local8Bit());
 
   // last modification date
   tmpStr = qDateTimeToISO(anEvent->lastModified());
   addPropValue(vtodo, VCLastModifiedProp, tmpStr.local8Bit());
 
   // organizer stuff
   tmpStr = "MAILTO:" + anEvent->organizer();
   addPropValue(vtodo, ICOrganizerProp, tmpStr.local8Bit());
 
   // attendees
   if (anEvent->attendeeCount() != 0) {
     QPtrList<Attendee> al = anEvent->attendees();
     QPtrListIterator<Attendee> ai(al);
     Attendee *curAttendee;
 
     for (; ai.current(); ++ai) {
       curAttendee = ai.current();
       if (!curAttendee->email().isEmpty() &&
           !curAttendee->name().isEmpty())
         tmpStr = "MAILTO:" + curAttendee->name() + " <" +
                  curAttendee->email() + ">";
       else if (curAttendee->name().isEmpty())
         tmpStr = "MAILTO: " + curAttendee->email();
       else if (curAttendee->email().isEmpty())
         tmpStr = "MAILTO: " + curAttendee->name();
       else if (curAttendee->name().isEmpty() &&
                curAttendee->email().isEmpty())
         kdDebug(5800) << "warning! this Event has an attendee w/o name or email!" << endl;
       VObject *aProp = addPropValue(vtodo, VCAttendeeProp, tmpStr.local8Bit());
       addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE");
       addPropValue(aProp, VCStatusProp, writeStatus(curAttendee->status()));
     }
   }
 
   // description BL:
   if (!anEvent->description().isEmpty()) {
     VObject *d = addPropValue(vtodo, VCDescriptionProp,
                               anEvent->description().local8Bit());
     if (anEvent->description().find('\n') != -1)
       addProp(d, VCQuotedPrintableProp);
   }
 
   // summary
   if (!anEvent->summary().isEmpty())
     addPropValue(vtodo, VCSummaryProp, anEvent->summary().local8Bit());
 
   if (!anEvent->location().isEmpty())
     addPropValue(vtodo, VCLocationProp, anEvent->location().local8Bit());
 
   // completed
   // status
   // backward compatibility, KOrganizer used to interpret only these two values
   addPropValue(vtodo, VCStatusProp, anEvent->isCompleted() ? "COMPLETED" :
                                                              "NEEDS_ACTION");
   // completion date
   if (anEvent->hasCompletedDate()) {
     tmpStr = qDateTimeToISO(anEvent->completed());
     addPropValue(vtodo, VCCompletedProp, tmpStr.local8Bit());
   }
 
   // priority
   tmpStr.sprintf("%i",anEvent->priority());
   addPropValue(vtodo, VCPriorityProp, tmpStr.local8Bit());
 
   // related event
   if (anEvent->relatedTo()) {
     addPropValue(vtodo, VCRelatedToProp,
                  anEvent->relatedTo()->uid().local8Bit());
   }
 
   // categories
   tmpStrList = anEvent->categories();
   tmpStr = "";
   QString catStr;
   for ( QStringList::Iterator it = tmpStrList.begin();
         it != tmpStrList.end();
         ++it ) {
     catStr = *it;
     if (catStr[0] == ' ')
       tmpStr += catStr.mid(1);
     else
       tmpStr += catStr;
     // this must be a ';' character as the vCalendar specification requires!
     // vcc.y has been hacked to translate the ';' to a ',' when the vcal is
     // read in.
     tmpStr += ";";
   }
   if (!tmpStr.isEmpty()) {
     tmpStr.truncate(tmpStr.length()-1);
     addPropValue(vtodo, VCCategoriesProp, tmpStr.local8Bit());
   }
 
   // alarm stuff
   kdDebug(5800) << "vcalformat::eventToVTodo was called" << endl;
   QPtrList<Alarm> alarms = anEvent->alarms();
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
     if (alarm->enabled()) {
       VObject *a = addProp(vtodo, VCDAlarmProp);
       tmpStr = qDateTimeToISO(alarm->time());
       addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
       addPropValue(a, VCRepeatCountProp, "1");
       addPropValue(a, VCDisplayStringProp, "beep!");
       if (alarm->type() == Alarm::Audio) {
         a = addProp(vtodo, VCAAlarmProp);
         addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
         addPropValue(a, VCRepeatCountProp, "1");
         addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile()));
       }
       else if (alarm->type() == Alarm::Procedure) {
         a = addProp(vtodo, VCPAlarmProp);
         addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
         addPropValue(a, VCRepeatCountProp, "1");
         addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile()));
       }
     }
   }
 
   if (anEvent->pilotId()) {
     // pilot sync stuff
     tmpStr.sprintf("%i",anEvent->pilotId());
-    addPropValue(vtodo, KPilotIdProp, tmpStr.local8Bit());
+    addPropValue(vtodo, XPilotIdProp, tmpStr.local8Bit());
     tmpStr.sprintf("%i",anEvent->syncStatus());
-    addPropValue(vtodo, KPilotStatusProp, tmpStr.local8Bit());
+    addPropValue(vtodo, XPilotStatusProp, tmpStr.local8Bit());
   }
 
   return vtodo;
 }
 
 VObject* VCalFormat::eventToVEvent(const Event *anEvent)
 {
   VObject *vevent;
   QString tmpStr;
   QStringList tmpStrList;
 
   vevent = newVObject(VCEventProp);
 
   // start and end time
   tmpStr = qDateTimeToISO(anEvent->dtStart(),
                           !anEvent->doesFloat());
   addPropValue(vevent, VCDTstartProp, tmpStr.local8Bit());
 
   // events that have time associated but take up no time should
   // not have both DTSTART and DTEND.
   if (anEvent->dtStart() != anEvent->dtEnd()) {
     tmpStr = qDateTimeToISO(anEvent->dtEnd(),
                             !anEvent->doesFloat());
     addPropValue(vevent, VCDTendProp, tmpStr.local8Bit());
   }
 
   // creation date
   tmpStr = qDateTimeToISO(anEvent->created());
   addPropValue(vevent, VCDCreatedProp, tmpStr.local8Bit());
 
   // unique id
   addPropValue(vevent, VCUniqueStringProp,
                anEvent->uid().local8Bit());
 
   // revision
   tmpStr.sprintf("%i", anEvent->revision());
   addPropValue(vevent, VCSequenceProp, tmpStr.local8Bit());
 
   // last modification date
   tmpStr = qDateTimeToISO(anEvent->lastModified());
   addPropValue(vevent, VCLastModifiedProp, tmpStr.local8Bit());
 
   // attendee and organizer stuff
   tmpStr = "MAILTO:" + anEvent->organizer();
   addPropValue(vevent, ICOrganizerProp, tmpStr.local8Bit());
 
   if (anEvent->attendeeCount() != 0) {
     QPtrList<Attendee> al = anEvent->attendees();
     QPtrListIterator<Attendee> ai(al);
     Attendee *curAttendee;
 
     // TODO: Put this functionality into Attendee class
     for (; ai.current(); ++ai) {
       curAttendee = ai.current();
       if (!curAttendee->email().isEmpty() &&
           !curAttendee->name().isEmpty())
         tmpStr = "MAILTO:" + curAttendee->name() + " <" +
                  curAttendee->email() + ">";
       else if (curAttendee->name().isEmpty())
         tmpStr = "MAILTO: " + curAttendee->email();
       else if (curAttendee->email().isEmpty())
         tmpStr = "MAILTO: " + curAttendee->name();
       else if (curAttendee->name().isEmpty() &&
                curAttendee->email().isEmpty())
         kdDebug(5800) << "warning! this Event has an attendee w/o name or email!" << endl;
       VObject *aProp = addPropValue(vevent, VCAttendeeProp, tmpStr.local8Bit());
       addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE");;
       addPropValue(aProp, VCStatusProp, writeStatus(curAttendee->status()));
     }
   }
 
   // recurrence rule stuff
   if (anEvent->recurrence()->doesRecur()) {
     // some more variables
     QPtrList<Recurrence::rMonthPos> tmpPositions;
     QPtrList<int> tmpDays;
     int *tmpDay;
     Recurrence::rMonthPos *tmpPos;
     QString tmpStr2;
     int i;
 
     switch(anEvent->recurrence()->doesRecur()) {
     case Recurrence::rDaily:
       tmpStr.sprintf("D%i ",anEvent->recurrence()->frequency());
 //      if (anEvent->rDuration > 0)
         //tmpStr += "#";
       break;
     case Recurrence::rWeekly:
       tmpStr.sprintf("W%i ",anEvent->recurrence()->frequency());
       for (i = 0; i < 7; i++) {
         if (anEvent->recurrence()->days().testBit(i))
           tmpStr += dayFromNum(i);
       }
       break;
     case Recurrence::rMonthlyPos:
       tmpStr.sprintf("MP%i ", anEvent->recurrence()->frequency());
       // write out all rMonthPos's
       tmpPositions = anEvent->recurrence()->monthPositions();
       for (tmpPos = tmpPositions.first();
            tmpPos;
            tmpPos = tmpPositions.next()) {
 
         tmpStr2.sprintf("%i", tmpPos->rPos);
         if (tmpPos->negative)
           tmpStr2 += "- ";
         else
           tmpStr2 += "+ ";
         tmpStr += tmpStr2;
         for (i = 0; i < 7; i++) {
           if (tmpPos->rDays.testBit(i))
             tmpStr += dayFromNum(i);
         }
       } // loop for all rMonthPos's
       break;
     case Recurrence::rMonthlyDay:
       tmpStr.sprintf("MD%i ", anEvent->recurrence()->frequency());
       // write out all rMonthDays;
       tmpDays = anEvent->recurrence()->monthDays();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         tmpStr2.sprintf("%i ", *tmpDay);
         tmpStr += tmpStr2;
       }
       break;
     case Recurrence::rYearlyMonth:
       tmpStr.sprintf("YM%i ", anEvent->recurrence()->frequency());
       // write out all the rYearNums;
       tmpDays = anEvent->recurrence()->yearNums();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         tmpStr2.sprintf("%i ", *tmpDay);
         tmpStr += tmpStr2;
       }
       break;
     case Recurrence::rYearlyDay:
       tmpStr.sprintf("YD%i ", anEvent->recurrence()->frequency());
       // write out all the rYearNums;
       tmpDays = anEvent->recurrence()->yearNums();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         tmpStr2.sprintf("%i ", *tmpDay);
         tmpStr += tmpStr2;
       }
       break;
     default:
       kdDebug(5800) << "ERROR, it should never get here in eventToVEvent!" << endl;
       break;
     } // switch
 
     if (anEvent->recurrence()->duration() > 0) {
       tmpStr2.sprintf("#%i",anEvent->recurrence()->duration());
       tmpStr += tmpStr2;
     } else if (anEvent->recurrence()->duration() == -1) {
       tmpStr += "#0"; // defined as repeat forever
     } else {
       tmpStr += qDateTimeToISO(anEvent->recurrence()->endDate(), FALSE);
     }
     addPropValue(vevent,VCRRuleProp, tmpStr.local8Bit());
 
   } // event repeats
 
   // exceptions to recurrence
   DateList dateList = anEvent->exDates();
   DateList::ConstIterator it;
   QString tmpStr2;
 
   for (it = dateList.begin(); it != dateList.end(); ++it) {
     tmpStr = qDateToISO(*it) + ";";
     tmpStr2 += tmpStr;
   }
   if (!tmpStr2.isEmpty()) {
     tmpStr2.truncate(tmpStr2.length()-1);
-    addPropValue(vevent, VCExDateProp, tmpStr2.local8Bit());
+    addPropValue(vevent, VCExpDateProp, tmpStr2.local8Bit());
   }
 
   // description
   if (!anEvent->description().isEmpty()) {
     VObject *d = addPropValue(vevent, VCDescriptionProp,
                               anEvent->description().local8Bit());
     if (anEvent->description().find('\n') != -1)
       addProp(d, VCQuotedPrintableProp);
   }
 
   // summary
   if (!anEvent->summary().isEmpty())
     addPropValue(vevent, VCSummaryProp, anEvent->summary().local8Bit());
 
   if (!anEvent->location().isEmpty())
     addPropValue(vevent, VCLocationProp, anEvent->location().local8Bit());
 
   // status
 // TODO: define Event status
 //  addPropValue(vevent, VCStatusProp, anEvent->statusStr().local8Bit());
 
   // secrecy
   const char *text = 0;
   switch (anEvent->secrecy()) {
     case Incidence::SecrecyPublic:
       text = "PUBLIC";
       break;
     case Incidence::SecrecyPrivate:
       text = "PRIVATE";
       break;
     case Incidence::SecrecyConfidential:
       text = "CONFIDENTIAL";
       break;
   }
   if (text) {
     addPropValue(vevent, VCClassProp, text);
   }
 
   // categories
   tmpStrList = anEvent->categories();
   tmpStr = "";
   QString catStr;
   for ( QStringList::Iterator it = tmpStrList.begin();
         it != tmpStrList.end();
         ++it ) {
     catStr = *it;
     if (catStr[0] == ' ')
       tmpStr += catStr.mid(1);
     else
       tmpStr += catStr;
     // this must be a ';' character as the vCalendar specification requires!
     // vcc.y has been hacked to translate the ';' to a ',' when the vcal is
     // read in.
     tmpStr += ";";
   }
   if (!tmpStr.isEmpty()) {
     tmpStr.truncate(tmpStr.length()-1);
     addPropValue(vevent, VCCategoriesProp, tmpStr.local8Bit());
   }
 
   // attachments 
   // TODO: handle binary attachments!
   QPtrList<Attachment> attachments = anEvent->attachments();
   for ( Attachment *at = attachments.first(); at; at = attachments.next() )
     addPropValue(vevent, VCAttachProp, at->uri().local8Bit());
 
   // resources
   tmpStrList = anEvent->resources();
   tmpStr = tmpStrList.join(";");
   if (!tmpStr.isEmpty())
     addPropValue(vevent, VCResourcesProp, tmpStr.local8Bit());
 
   // alarm stuff
   QPtrList<Alarm> alarms = anEvent->alarms();
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
     if (alarm->enabled()) {
       VObject *a = addProp(vevent, VCDAlarmProp);
       tmpStr = qDateTimeToISO(alarm->time());
       addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
       addPropValue(a, VCRepeatCountProp, "1");
       addPropValue(a, VCDisplayStringProp, "beep!");
       if (alarm->type() == Alarm::Audio) {
         a = addProp(vevent, VCAAlarmProp);
         addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
         addPropValue(a, VCRepeatCountProp, "1");
         addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile()));
       }
       if (alarm->type() == Alarm::Procedure) {
         a = addProp(vevent, VCPAlarmProp);
         addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
         addPropValue(a, VCRepeatCountProp, "1");
         addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile()));
       }
     }
   }
 
   // priority
   tmpStr.sprintf("%i",anEvent->priority());
   addPropValue(vevent, VCPriorityProp, tmpStr.local8Bit());
 
   // transparency
   tmpStr.sprintf("%i",anEvent->transparency());
   addPropValue(vevent, VCTranspProp, tmpStr.local8Bit());
 
   // related event
   if (anEvent->relatedTo()) {
     addPropValue(vevent, VCRelatedToProp,
                  anEvent->relatedTo()->uid().local8Bit());
   }
 
   if (anEvent->pilotId()) {
     // pilot sync stuff
     tmpStr.sprintf("%i",anEvent->pilotId());
-    addPropValue(vevent, KPilotIdProp, tmpStr.local8Bit());
+    addPropValue(vevent, XPilotIdProp, tmpStr.local8Bit());
     tmpStr.sprintf("%i",anEvent->syncStatus());
-    addPropValue(vevent, KPilotStatusProp, tmpStr.local8Bit());
+    addPropValue(vevent, XPilotStatusProp, tmpStr.local8Bit());
   }
 
   return vevent;
 }
 
 Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
 {
   VObject *vo;
   VObjectIterator voi;
   char *s;
 
   Todo *anEvent = new Todo;
 
   // creation date
   if ((vo = isAPropertyOf(vtodo, VCDCreatedProp)) != 0) {
       anEvent->setCreated(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
       deleteStr(s);
   }
 
   // unique id
   vo = isAPropertyOf(vtodo, VCUniqueStringProp);
   // while the UID property is preferred, it is not required.  We'll use the
   // default Event UID if none is given.
   if (vo) {
     anEvent->setUid(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   }
 
   // last modification date
   if ((vo = isAPropertyOf(vtodo, VCLastModifiedProp)) != 0) {
     anEvent->setLastModified(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setLastModified(QDateTime(QDate::currentDate(),
                                        QTime::currentTime()));
 
   // organizer
   // if our extension property for the event's ORGANIZER exists, add it.
   if ((vo = isAPropertyOf(vtodo, ICOrganizerProp)) != 0) {
     anEvent->setOrganizer(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   } else {
     anEvent->setOrganizer(mCalendar->getEmail());
   }
 
   // attendees.
   initPropIterator(&voi, vtodo);
   while (moreIteration(&voi)) {
     vo = nextVObject(&voi);
     if (strcmp(vObjectName(vo), VCAttendeeProp) == 0) {
       Attendee *a;
       VObject *vp;
       s = fakeCString(vObjectUStringZValue(vo));
       QString tmpStr = QString::fromLocal8Bit(s);
       deleteStr(s);
       tmpStr = tmpStr.simplifyWhiteSpace();
       int emailPos1, emailPos2;
       if ((emailPos1 = tmpStr.find('<')) > 0) {
         // both email address and name
         emailPos2 = tmpStr.findRev('>');
         a = new Attendee(tmpStr.left(emailPos1 - 1),
                          tmpStr.mid(emailPos1 + 1,
                                     emailPos2 - (emailPos1 + 1)));
       } else if (tmpStr.find('@') > 0) {
         // just an email address
         a = new Attendee(0, tmpStr);
       } else {
         // just a name
         QString email = tmpStr.replace( QRegExp(" "), "." );
         a = new Attendee(tmpStr,email);
       }
 
       // is there an RSVP property?
       if ((vp = isAPropertyOf(vo, VCRSVPProp)) != 0)
         a->setRSVP(vObjectStringZValue(vp));
       // is there a status property?
       if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
         a->setStatus(readStatus(vObjectStringZValue(vp)));
       // add the attendee
       anEvent->addAttendee(a);
     }
   }
 
   // description for todo
   if ((vo = isAPropertyOf(vtodo, VCDescriptionProp)) != 0) {
     s = fakeCString(vObjectUStringZValue(vo));
     anEvent->setDescription(QString::fromLocal8Bit(s));
     deleteStr(s);
   }
 
   // summary
   if ((vo = isAPropertyOf(vtodo, VCSummaryProp))) {
     s = fakeCString(vObjectUStringZValue(vo));
     anEvent->setSummary(QString::fromLocal8Bit(s));
     deleteStr(s);
   }
   if ((vo = isAPropertyOf(vtodo, VCLocationProp))) {
     s = fakeCString(vObjectUStringZValue(vo));
     anEvent->setLocation(QString::fromLocal8Bit(s));
     deleteStr(s);
   }
 
 
   // completed
   // was: status
   if ((vo = isAPropertyOf(vtodo, VCStatusProp)) != 0) {
     s = fakeCString(vObjectUStringZValue(vo));
     if (strcmp(s,"COMPLETED") == 0) {
       anEvent->setCompleted(true);
     } else {
       anEvent->setCompleted(false);
     }
     deleteStr(s);
   }
   else
     anEvent->setCompleted(false);
 
   // completion date
   if ((vo = isAPropertyOf(vtodo, VCCompletedProp)) != 0) {
     anEvent->setCompleted(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
 
   // priority
   if ((vo = isAPropertyOf(vtodo, VCPriorityProp))) {
     anEvent->setPriority(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
 
   // due date
   if ((vo = isAPropertyOf(vtodo, VCDueProp)) != 0) {
     anEvent->setDtDue(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
     anEvent->setHasDueDate(true);
   } else {
     anEvent->setHasDueDate(false);
   }
 
   // start time
   if ((vo = isAPropertyOf(vtodo, VCDTstartProp)) != 0) {
     anEvent->setDtStart(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
             //    kdDebug(5800) << "s is " << //  s << ", ISO is " << ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl;
     deleteStr(s);
     anEvent->setHasStartDate(true);
   } else {
     anEvent->setHasStartDate(false);
   }
 
   /* alarm stuff */
   //kdDebug(5800) << "vcalformat::VTodoToEvent called" << endl;
   if ((vo = isAPropertyOf(vtodo, VCDAlarmProp))) {
     Alarm* alarm = anEvent->newAlarm();
     VObject *a;
     if ((a = isAPropertyOf(vo, VCRunTimeProp))) {
       alarm->setTime(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(a))));
       deleteStr(s);
     }
     alarm->setEnabled(true);
     if ((vo = isAPropertyOf(vtodo, VCPAlarmProp))) {
       if ((a = isAPropertyOf(vo, VCProcedureNameProp))) {
         s = fakeCString(vObjectUStringZValue(a));
         alarm->setProcedureAlarm(QFile::decodeName(s));
         deleteStr(s);
       }
     }
     if ((vo = isAPropertyOf(vtodo, VCAAlarmProp))) {
       if ((a = isAPropertyOf(vo, VCAudioContentProp))) {
         s = fakeCString(vObjectUStringZValue(a));
         alarm->setAudioAlarm(QFile::decodeName(s));
         deleteStr(s);
       }
     }
   }
 
   // related todo
   if ((vo = isAPropertyOf(vtodo, VCRelatedToProp)) != 0) {
     anEvent->setRelatedToUid(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
     mTodosRelate.append(anEvent);
   }
 
   // categories
   QStringList tmpStrList;
   int index1 = 0;
   int index2 = 0;
   if ((vo = isAPropertyOf(vtodo, VCCategoriesProp)) != 0) {
     s = fakeCString(vObjectUStringZValue(vo));
     QString categories = QString::fromLocal8Bit(s);
     deleteStr(s);
     //const char* category;
     QString category;
     while ((index2 = categories.find(',', index1)) != -1) {
         //category = (const char *) categories.mid(index1, (index2 - index1));
       category = categories.mid(index1, (index2 - index1));
       tmpStrList.append(category);
       index1 = index2+1;
     }
     // get last category
     category = categories.mid(index1, (categories.length()-index1));
     tmpStrList.append(category);
     anEvent->setCategories(tmpStrList);
   }
 
   /* PILOT SYNC STUFF */
-  if ((vo = isAPropertyOf(vtodo, KPilotIdProp))) {
+  if ((vo = isAPropertyOf(vtodo, XPilotIdProp))) {
     anEvent->setPilotId(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setPilotId(0);
 
-  if ((vo = isAPropertyOf(vtodo, KPilotStatusProp))) {
+  if ((vo = isAPropertyOf(vtodo, XPilotStatusProp))) {
     anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setSyncStatus(Event::SYNCMOD);
 
   return anEvent;
 }
 
 Event* VCalFormat::VEventToEvent(VObject *vevent)
 {
   VObject *vo;
   VObjectIterator voi;
   char *s;
 
   Event *anEvent = new Event;
 
   // creation date
   if ((vo = isAPropertyOf(vevent, VCDCreatedProp)) != 0) {
       anEvent->setCreated(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
       deleteStr(s);
   }
 
   // unique id
   vo = isAPropertyOf(vevent, VCUniqueStringProp);
   // while the UID property is preferred, it is not required.  We'll use the
   // default Event UID if none is given.
   if (vo) {
     anEvent->setUid(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   }
 
   // revision
   // again NSCAL doesn't give us much to work with, so we improvise...
   if ((vo = isAPropertyOf(vevent, VCSequenceProp)) != 0) {
     anEvent->setRevision(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setRevision(0);
 
   // last modification date
   if ((vo = isAPropertyOf(vevent, VCLastModifiedProp)) != 0) {
     anEvent->setLastModified(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setLastModified(QDateTime(QDate::currentDate(),
                                        QTime::currentTime()));
 
   // organizer
   // if our extension property for the event's ORGANIZER exists, add it.
   if ((vo = isAPropertyOf(vevent, ICOrganizerProp)) != 0) {
     anEvent->setOrganizer(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   } else {
     anEvent->setOrganizer(mCalendar->getEmail());
   }
 
   // deal with attendees.
   initPropIterator(&voi, vevent);
   while (moreIteration(&voi)) {
     vo = nextVObject(&voi);
     if (strcmp(vObjectName(vo), VCAttendeeProp) == 0) {
       Attendee *a;
       VObject *vp;
       s = fakeCString(vObjectUStringZValue(vo));
       QString tmpStr = QString::fromLocal8Bit(s);
       deleteStr(s);
       tmpStr = tmpStr.simplifyWhiteSpace();
       int emailPos1, emailPos2;
       if ((emailPos1 = tmpStr.find('<')) > 0) {
         // both email address and name
         emailPos2 = tmpStr.findRev('>');
         a = new Attendee(tmpStr.left(emailPos1 - 1),
                          tmpStr.mid(emailPos1 + 1,
                                     emailPos2 - (emailPos1 + 1)));
       } else if (tmpStr.find('@') > 0) {
         // just an email address
         a = new Attendee(0, tmpStr);
       } else {
         // just a name
         QString email = tmpStr.replace( QRegExp(" "), "." );
         a = new Attendee(tmpStr,email);
       }
 
       // is there an RSVP property?
       if ((vp = isAPropertyOf(vo, VCRSVPProp)) != 0)
         a->setRSVP(vObjectStringZValue(vp));
       // is there a status property?
       if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
         a->setStatus(readStatus(vObjectStringZValue(vp)));
       // add the attendee
       anEvent->addAttendee(a);
     }
   }
 
   // This isn't strictly true.  An event that doesn't have a start time
   // or an end time doesn't "float", it has an anchor in time but it doesn't
   // "take up" any time.
   /*if ((isAPropertyOf(vevent, VCDTstartProp) == 0) ||
       (isAPropertyOf(vevent, VCDTendProp) == 0)) {
     anEvent->setFloats(TRUE);
     } else {
     }*/
 
   anEvent->setFloats(FALSE);
 
   // start time
   if ((vo = isAPropertyOf(vevent, VCDTstartProp)) != 0) {
     anEvent->setDtStart(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
             //    kdDebug(5800) << "s is " << //  s << ", ISO is " << ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl;
     deleteStr(s);
     if (anEvent->dtStart().time().isNull())
       anEvent->setFloats(TRUE);
   }
 
   // stop time
   if ((vo = isAPropertyOf(vevent, VCDTendProp)) != 0) {
     anEvent->setDtEnd(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
       deleteStr(s);
       if (anEvent->dtEnd().time().isNull())
         anEvent->setFloats(TRUE);
   }
 
   // at this point, there should be at least a start or end time.
   // fix up for events that take up no time but have a time associated
   if (!(vo = isAPropertyOf(vevent, VCDTstartProp)))
     anEvent->setDtStart(anEvent->dtEnd());
   if (!(vo = isAPropertyOf(vevent, VCDTendProp)))
     anEvent->setDtEnd(anEvent->dtStart());
 
   ///////////////////////////////////////////////////////////////////////////
 
   // repeat stuff
   if ((vo = isAPropertyOf(vevent, VCRRuleProp)) != 0) {
     QString tmpStr = (s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
     tmpStr.simplifyWhiteSpace();
     tmpStr = tmpStr.upper();
 
     /********************************* DAILY ******************************/
     if (tmpStr.left(1) == "D") {
       int index = tmpStr.find(' ');
       int rFreq = tmpStr.mid(1, (index-1)).toInt();
       index = tmpStr.findRev(' ') + 1; // advance to last field
       if (tmpStr.mid(index,1) == "#") index++;
       if (tmpStr.find('T', index) != -1) {
         QDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date();
         anEvent->recurrence()->setDaily(rFreq, rEndDate);
       } else {
         int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt();
         if (rDuration == 0) // VEvents set this to 0 forever, we use -1
           anEvent->recurrence()->setDaily(rFreq, -1);
         else
           anEvent->recurrence()->setDaily(rFreq, rDuration);
       }
     }
     /********************************* WEEKLY ******************************/
     else if (tmpStr.left(1) == "W") {
       int index = tmpStr.find(' ');
       int last = tmpStr.findRev(' ') + 1;
       int rFreq = tmpStr.mid(1, (index-1)).toInt();
       index += 1; // advance to beginning of stuff after freq
       QBitArray qba(7);
       QString dayStr;
       if( index == last ) {
         // e.g. W1 #0
         qba.setBit(anEvent->dtStart().date().dayOfWeek() - 1);
       }
       else {
         // e.g. W1 SU #0
         while (index < last) {
           dayStr = tmpStr.mid(index, 3);
           int dayNum = numFromDay(dayStr);
           qba.setBit(dayNum);
           index += 3; // advance to next day, or possibly "#"
         }
       }
       index = last; if (tmpStr.mid(index,1) == "#") index++;
       if (tmpStr.find('T', index) != -1) {
         QDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date();
         anEvent->recurrence()->setWeekly(rFreq, qba, rEndDate);
       } else {
         int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt();
         if (rDuration == 0)
           anEvent->recurrence()->setWeekly(rFreq, qba, -1);
         else
           anEvent->recurrence()->setWeekly(rFreq, qba, rDuration);
       }
     }
     /**************************** MONTHLY-BY-POS ***************************/
     else if (tmpStr.left(2) == "MP") {
       int index = tmpStr.find(' ');
       int last = tmpStr.findRev(' ') + 1;
       int rFreq = tmpStr.mid(2, (index-1)).toInt();
       index += 1; // advance to beginning of stuff after freq
       QBitArray qba(7);
       short tmpPos;
       if( index == last ) {
         // e.g. MP1 #0
         tmpPos = anEvent->dtStart().date().day()/7 + 1;
         if( tmpPos == 5 )
           tmpPos = -1;
         qba.setBit(anEvent->dtStart().date().dayOfWeek() - 1);
         anEvent->recurrence()->addMonthlyPos(tmpPos, qba);
       }
       else {
         // e.g. MP1 1+ SU #0
         while (index < last) {
           tmpPos = tmpStr.mid(index,1).toShort();
           index += 1;
           if (tmpStr.mid(index,1) == "-")
             // convert tmpPos to negative
             tmpPos = 0 - tmpPos;
           index += 2; // advance to day(s)
           while (numFromDay(tmpStr.mid(index,3)) >= 0) {
             int dayNum = numFromDay(tmpStr.mid(index,3));
             qba.setBit(dayNum);
             index += 3; // advance to next day, or possibly pos or "#"
           }
           anEvent->recurrence()->addMonthlyPos(tmpPos, qba);
           qba.detach();
           qba.fill(FALSE); // clear out
         } // while != "#"
       }
       index = last; if (tmpStr.mid(index,1) == "#") index++;
       if (tmpStr.find('T', index) != -1) {
         QDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length() -
                                                     index))).date();
         anEvent->recurrence()->setMonthly(Recurrence::rMonthlyPos, rFreq, rEndDate);
       } else {
         int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt();
         if (rDuration == 0)
           anEvent->recurrence()->setMonthly(Recurrence::rMonthlyPos, rFreq, -1);
         else
           anEvent->recurrence()->setMonthly(Recurrence::rMonthlyPos, rFreq, rDuration);
       }
     }
 
     /**************************** MONTHLY-BY-DAY ***************************/
     else if (tmpStr.left(2) == "MD") {
       int index = tmpStr.find(' ');
       int last = tmpStr.findRev(' ') + 1;
       int rFreq = tmpStr.mid(2, (index-1)).toInt();
       index += 1;
       short tmpDay;
       if( index == last ) {
         // e.g. MD1 #0
         tmpDay = anEvent->dtStart().date().day();
         anEvent->recurrence()->addMonthlyDay(tmpDay);
       }
       else {
         // e.g. MD1 3 #0
         while (index < last) {
           int index2 = tmpStr.find(' ', index);
           tmpDay = tmpStr.mid(index, (index2-index)).toShort();
           index = index2-1;
           if (tmpStr.mid(index, 1) == "-")
             tmpDay = 0 - tmpDay;
           index += 2; // advance the index;
           anEvent->recurrence()->addMonthlyDay(tmpDay);
         } // while != #
       }
       index = last; if (tmpStr.mid(index,1) == "#") index++;
       if (tmpStr.find('T', index) != -1) {
         QDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date();
         anEvent->recurrence()->setMonthly(Recurrence::rMonthlyDay, rFreq, rEndDate);
       } else {
         int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt();
         if (rDuration == 0)
           anEvent->recurrence()->setMonthly(Recurrence::rMonthlyDay, rFreq, -1);
         else
           anEvent->recurrence()->setMonthly(Recurrence::rMonthlyDay, rFreq, rDuration);
       }
     }
 
     /*********************** YEARLY-BY-MONTH *******************************/
     else if (tmpStr.left(2) == "YM") {
       int index = tmpStr.find(' ');
       int last = tmpStr.findRev(' ') + 1;
       int rFreq = tmpStr.mid(2, (index-1)).toInt();
       index += 1;
       short tmpMonth;
       if( index == last ) {
         // e.g. YM1 #0
         tmpMonth = anEvent->dtStart().date().month();
         anEvent->recurrence()->addYearlyNum(tmpMonth);
       }
       else {
         // e.g. YM1 3 #0
         while (index < last) {
           int index2 = tmpStr.find(' ', index);
           tmpMonth = tmpStr.mid(index, (index2-index)).toShort();
           index = index2+1;
           anEvent->recurrence()->addYearlyNum(tmpMonth);
         } // while != #
       }
       index = last; if (tmpStr.mid(index,1) == "#") index++;
       if (tmpStr.find('T', index) != -1) {
         QDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date();
         anEvent->recurrence()->setYearly(Recurrence::rYearlyMonth, rFreq, rEndDate);
       } else {
         int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt();
         if (rDuration == 0)
           anEvent->recurrence()->setYearly(Recurrence::rYearlyMonth, rFreq, -1);
         else
           anEvent->recurrence()->setYearly(Recurrence::rYearlyMonth, rFreq, rDuration);
       }
     }
 
     /*********************** YEARLY-BY-DAY *********************************/
     else if (tmpStr.left(2) == "YD") {
       int index = tmpStr.find(' ');
       int last = tmpStr.findRev(' ') + 1;
       int rFreq = tmpStr.mid(2, (index-1)).toInt();
       index += 1;
       short tmpDay;
       if( index == last ) {
         // e.g. YD1 #0
         tmpDay = anEvent->dtStart().date().dayOfYear();
         anEvent->recurrence()->addYearlyNum(tmpDay);
       }
       else {
         // e.g. YD1 123 #0
         while (index < last) {
           int index2 = tmpStr.find(' ', index);
           tmpDay = tmpStr.mid(index, (index2-index)).toShort();
           index = index2+1;
           anEvent->recurrence()->addYearlyNum(tmpDay);
         } // while != #
       }
       index = last; if (tmpStr.mid(index,1) == "#") index++;
       if (tmpStr.find('T', index) != -1) {
         QDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date();
         anEvent->recurrence()->setYearly(Recurrence::rYearlyDay, rFreq, rEndDate);
       } else {
         int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt();
         if (rDuration == 0)
           anEvent->recurrence()->setYearly(Recurrence::rYearlyDay, rFreq, -1);
         else
           anEvent->recurrence()->setYearly(Recurrence::rYearlyDay, rFreq, rDuration);
       }
     } else {
       kdDebug(5800) << "we don't understand this type of recurrence!" << endl;
     } // if
   } // repeats
 
 
   // recurrence exceptions
-  if ((vo = isAPropertyOf(vevent, VCExDateProp)) != 0) {
+  if ((vo = isAPropertyOf(vevent, VCExpDateProp)) != 0) {
     s = fakeCString(vObjectUStringZValue(vo));
     QStringList exDates = QStringList::split(",",s);
     QStringList::ConstIterator it;
     for(it = exDates.begin(); it != exDates.end(); ++it ) {
       anEvent->addExDate(ISOToQDate(*it));
     }
     deleteStr(s);
   }
 
   // summary
   if ((vo = isAPropertyOf(vevent, VCSummaryProp))) {
     s = fakeCString(vObjectUStringZValue(vo));
     anEvent->setSummary(QString::fromLocal8Bit(s));
     deleteStr(s);
   }
   if ((vo = isAPropertyOf(vevent, VCLocationProp))) {
     s = fakeCString(vObjectUStringZValue(vo));
     anEvent->setLocation(QString::fromLocal8Bit(s));
     deleteStr(s);
   }
 
   // description
   if ((vo = isAPropertyOf(vevent, VCDescriptionProp)) != 0) {
     s = fakeCString(vObjectUStringZValue(vo));
     if (!anEvent->description().isEmpty()) {
       anEvent->setDescription(anEvent->description() + "\n" +
                               QString::fromLocal8Bit(s));
     } else {
       anEvent->setDescription(QString::fromLocal8Bit(s));
     }
     deleteStr(s);
   }
 
   // some stupid vCal exporters ignore the standard and use Description
   // instead of Summary for the default field.  Correct for this.
   if (anEvent->summary().isEmpty() &&
       !(anEvent->description().isEmpty())) {
     QString tmpStr = anEvent->description().simplifyWhiteSpace();
     anEvent->setDescription("");
     anEvent->setSummary(tmpStr);
   }
 
 #if 0
   // status
   if ((vo = isAPropertyOf(vevent, VCStatusProp)) != 0) {
     QString tmpStr(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
 // TODO: Define Event status
 //    anEvent->setStatus(tmpStr);
   }
   else
 //    anEvent->setStatus("NEEDS ACTION");
 #endif
 
   // secrecy
   int secrecy = Incidence::SecrecyPublic;
   if ((vo = isAPropertyOf(vevent, VCClassProp)) != 0) {
     s = fakeCString(vObjectUStringZValue(vo));
     if (strcmp(s,"PRIVATE") == 0) {
       secrecy = Incidence::SecrecyPrivate;
     } else if (strcmp(s,"CONFIDENTIAL") == 0) {
       secrecy = Incidence::SecrecyConfidential;
     }
     deleteStr(s);
   }
   anEvent->setSecrecy(secrecy);
 
   // categories
   QStringList tmpStrList;
   int index1 = 0;
   int index2 = 0;
   if ((vo = isAPropertyOf(vevent, VCCategoriesProp)) != 0) {
     s = fakeCString(vObjectUStringZValue(vo));
     QString categories = QString::fromLocal8Bit(s);
     deleteStr(s);
     //const char* category;
     QString category;
     while ((index2 = categories.find(',', index1)) != -1) {
         //category = (const char *) categories.mid(index1, (index2 - index1));
       category = categories.mid(index1, (index2 - index1));
       tmpStrList.append(category);
       index1 = index2+1;
     }
     // get last category
     category = categories.mid(index1, (categories.length()-index1));
     tmpStrList.append(category);
     anEvent->setCategories(tmpStrList);
   }
 
   // attachments
   tmpStrList.clear();
   initPropIterator(&voi, vevent);
   while (moreIteration(&voi)) {
     vo = nextVObject(&voi);
     if (strcmp(vObjectName(vo), VCAttachProp) == 0) {
       s = fakeCString(vObjectUStringZValue(vo));
       anEvent->addAttachment(new Attachment(QString(s)));
       deleteStr(s);
     }
   }
 
   // resources
   if ((vo = isAPropertyOf(vevent, VCResourcesProp)) != 0) {
     QString resources = (s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
     tmpStrList.clear();
     index1 = 0;
     index2 = 0;
     QString resource;
     while ((index2 = resources.find(';', index1)) != -1) {
       resource = resources.mid(index1, (index2 - index1));
       tmpStrList.append(resource);
       index1 = index2;
     }
     anEvent->setResources(tmpStrList);
   }
 
   /* alarm stuff */
   if ((vo = isAPropertyOf(vevent, VCDAlarmProp))) {
     Alarm* alarm = anEvent->newAlarm();
     VObject *a;
     if ((a = isAPropertyOf(vo, VCRunTimeProp))) {
       alarm->setTime(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(a))));
       deleteStr(s);
     }
     alarm->setEnabled(true);
     if ((vo = isAPropertyOf(vevent, VCPAlarmProp))) {
       if ((a = isAPropertyOf(vo, VCProcedureNameProp))) {
         s = fakeCString(vObjectUStringZValue(a));
         alarm->setProcedureAlarm(QFile::decodeName(s));
         deleteStr(s);
       }
     }
     if ((vo = isAPropertyOf(vevent, VCAAlarmProp))) {
       if ((a = isAPropertyOf(vo, VCAudioContentProp))) {
         s = fakeCString(vObjectUStringZValue(a));
         alarm->setAudioAlarm(QFile::decodeName(s));
         deleteStr(s);
       }
     }
   }
 
   // priority
   if ((vo = isAPropertyOf(vevent, VCPriorityProp))) {
     anEvent->setPriority(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
 
   // transparency
   if ((vo = isAPropertyOf(vevent, VCTranspProp)) != 0) {
     int i = atoi(s = fakeCString(vObjectUStringZValue(vo)));
     anEvent->setTransparency( i == 1 ? Event::Transparent : Event::Opaque );
     deleteStr(s);
   }
 
   // related event
   if ((vo = isAPropertyOf(vevent, VCRelatedToProp)) != 0) {
     anEvent->setRelatedToUid(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
     mEventsRelate.append(anEvent);
   }
 
   /* PILOT SYNC STUFF */
-  if ((vo = isAPropertyOf(vevent, KPilotIdProp))) {
+  if ((vo = isAPropertyOf(vevent, XPilotIdProp))) {
     anEvent->setPilotId(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setPilotId(0);
 
-  if ((vo = isAPropertyOf(vevent, KPilotStatusProp))) {
+  if ((vo = isAPropertyOf(vevent, XPilotStatusProp))) {
     anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setSyncStatus(Event::SYNCMOD);
 
   return anEvent;
 }
 
 
 QString VCalFormat::qDateToISO(const QDate &qd)
 {
   QString tmpStr;
 
   ASSERT(qd.isValid());
 
   tmpStr.sprintf("%.2d%.2d%.2d",
                  qd.year(), qd.month(), qd.day());
   return tmpStr;
 
 }
 
 QString VCalFormat::qDateTimeToISO(const QDateTime &qdt, bool zulu)
 {
   QString tmpStr;
 
   ASSERT(qdt.date().isValid());
   ASSERT(qdt.time().isValid());
   if (zulu) {
     QDateTime tmpDT(qdt);
     tmpDT = tmpDT.addSecs(60*(-mCalendar->getTimeZone())); // correct to GMT.
     tmpStr.sprintf("%.2d%.2d%.2dT%.2d%.2d%.2dZ",
                    tmpDT.date().year(), tmpDT.date().month(),
                    tmpDT.date().day(), tmpDT.time().hour(),
                    tmpDT.time().minute(), tmpDT.time().second());
   } else {
     tmpStr.sprintf("%.2d%.2d%.2dT%.2d%.2d%.2d",
                    qdt.date().year(), qdt.date().month(),
                    qdt.date().day(), qdt.time().hour(),
                    qdt.time().minute(), qdt.time().second());
   }
   return tmpStr;
 }
 
 QDateTime VCalFormat::ISOToQDateTime(const QString & dtStr)
 {
   QDate tmpDate;
   QTime tmpTime;
   QString tmpStr;
   int year, month, day, hour, minute, second;
 
   tmpStr = dtStr;
   year = tmpStr.left(4).toInt();
   month = tmpStr.mid(4,2).toInt();
   day = tmpStr.mid(6,2).toInt();
   hour = tmpStr.mid(9,2).toInt();
   minute = tmpStr.mid(11,2).toInt();
   second = tmpStr.mid(13,2).toInt();
   tmpDate.setYMD(year, month, day);
   tmpTime.setHMS(hour, minute, second);
 
   ASSERT(tmpDate.isValid());
   ASSERT(tmpTime.isValid());
   QDateTime tmpDT(tmpDate, tmpTime);
   // correct for GMT if string is in Zulu format
   if (dtStr.at(dtStr.length()-1) == 'Z')
     tmpDT = tmpDT.addSecs(60*mCalendar->getTimeZone());
   return tmpDT;
 }
 
 QDate VCalFormat::ISOToQDate(const QString &dateStr)
 {
   int year, month, day;
 
   year = dateStr.left(4).toInt();
   month = dateStr.mid(4,2).toInt();
   day = dateStr.mid(6,2).toInt();
 
   return(QDate(year, month, day));
 }
 
 // take a raw vcalendar (i.e. from a file on disk, clipboard, etc. etc.
 // and break it down from it's tree-like format into the dictionary format
 // that is used internally in the VCalFormat.
 void VCalFormat::populate(VObject *vcal)
 {
   // this function will populate the caldict dictionary and other event
   // lists. It turns vevents into Events and then inserts them.
 
   VObjectIterator i;
   VObject *curVO, *curVOProp;
   Event *anEvent;
 
   if ((curVO = isAPropertyOf(vcal, ICMethodProp)) != 0) {
     char *methodType = 0;
     methodType = fakeCString(vObjectUStringZValue(curVO));
     kdDebug() << "This calendar is an iTIP transaction of type '"
               << methodType << "'" << endl;
     delete methodType;
   }
 
   // warn the user that we might have trouble reading non-known calendar.
   if ((curVO = isAPropertyOf(vcal, VCProdIdProp)) != 0) {
     char *s = fakeCString(vObjectUStringZValue(curVO));
     if (strcmp(productId().local8Bit(), s) != 0)
       kdDebug() << "This vCalendar file was not created by KOrganizer "
                    "or any other product we support. Loading anyway..." << endl;
     mLoadedProductId = s;
     deleteStr(s);
   }
 
   // warn the user we might have trouble reading this unknown version.
   if ((curVO = isAPropertyOf(vcal, VCVersionProp)) != 0) {
     char *s = fakeCString(vObjectUStringZValue(curVO));
     if (strcmp(_VCAL_VERSION, s) != 0)
       kdDebug() << "This vCalendar file has version " << s
                 << "We only support " << _VCAL_VERSION << endl;
     deleteStr(s);
   }
 
   // set the time zone
   if ((curVO = isAPropertyOf(vcal, VCTimeZoneProp)) != 0) {
     char *s = fakeCString(vObjectUStringZValue(curVO));
     mCalendar->setTimeZone(s);
     deleteStr(s);
   }
 
 
   // Store all events with a relatedTo property in a list for post-processing
   mEventsRelate.clear();
   mTodosRelate.clear();
 
   initPropIterator(&i, vcal);
 
   // go through all the vobjects in the vcal
   while (moreIteration(&i)) {
     curVO = nextVObject(&i);
 
     /************************************************************************/
 
     // now, check to see that the object is an event or todo.
     if (strcmp(vObjectName(curVO), VCEventProp) == 0) {
 
-      if ((curVOProp = isAPropertyOf(curVO, KPilotStatusProp)) != 0) {
+      if ((curVOProp = isAPropertyOf(curVO, XPilotStatusProp)) != 0) {
         char *s;
         s = fakeCString(vObjectUStringZValue(curVOProp));
         // check to see if event was deleted by the kpilot conduit
         if (atoi(s) == Event::SYNCDEL) {
           deleteStr(s);
           kdDebug(5800) << "skipping pilot-deleted event" << endl;
           goto SKIP;
         }
         deleteStr(s);
       }
 
       // this code checks to see if we are trying to read in an event
       // that we already find to be in the calendar.  If we find this
       // to be the case, we skip the event.
       if ((curVOProp = isAPropertyOf(curVO, VCUniqueStringProp)) != 0) {
         char *s = fakeCString(vObjectUStringZValue(curVOProp));
         QString tmpStr(s);
         deleteStr(s);
 
         if (mCalendar->event(tmpStr)) {
           goto SKIP;
         }
         if (mCalendar->todo(tmpStr)) {
           goto SKIP;
         }
       }
 
       if ((!(curVOProp = isAPropertyOf(curVO, VCDTstartProp))) &&
           (!(curVOProp = isAPropertyOf(curVO, VCDTendProp)))) {
         kdDebug(5800) << "found a VEvent with no DTSTART and no DTEND! Skipping..." << endl;
         goto SKIP;
       }
 
       anEvent = VEventToEvent(curVO);
       // we now use addEvent instead of insertEvent so that the
       // signal/slot get connected.
       if (anEvent) {
               if ( !anEvent->dtStart().isValid() || !anEvent->dtEnd().isValid() ) {
           kdDebug() << "VCalFormat::populate(): Event has invalid dates."
                     << endl;
         } else {
           mCalendar->addEvent(anEvent);
               }
       } else {
         // some sort of error must have occurred while in translation.
         goto SKIP;
       }
     } else if (strcmp(vObjectName(curVO), VCTodoProp) == 0) {
       Todo *aTodo = VTodoToEvent(curVO);
       mCalendar->addTodo(aTodo);
     } else if ((strcmp(vObjectName(curVO), VCVersionProp) == 0) ||
                (strcmp(vObjectName(curVO), VCProdIdProp) == 0) ||
                (strcmp(vObjectName(curVO), VCTimeZoneProp) == 0)) {
       // do nothing, we know these properties and we want to skip them.
       // we have either already processed them or are ignoring them.
       ;
     } else {
       kdDebug(5800) << "Ignoring unknown vObject \"" << vObjectName(curVO) << "\"" << endl;
     }
   SKIP:
     ;
   } // while
 
   // Post-Process list of events with relations, put Event objects in relation
   Event *ev;
   for ( ev=mEventsRelate.first(); ev != 0; ev=mEventsRelate.next() ) {
     ev->setRelatedTo(mCalendar->event(ev->relatedToUid()));
   }
   Todo *todo;
   for ( todo=mTodosRelate.first(); todo != 0; todo=mTodosRelate.next() ) {
     todo->setRelatedTo(mCalendar->todo(todo->relatedToUid()));
   }
 }
 
 const char *VCalFormat::dayFromNum(int day)
 {
   const char *days[7] = { "MO ", "TU ", "WE ", "TH ", "FR ", "SA ", "SU " };
 
   return days[day];
 }
 
 int VCalFormat::numFromDay(const QString &day)
 {
   if (day == "MO ") return 0;
   if (day == "TU ") return 1;
   if (day == "WE ") return 2;
   if (day == "TH ") return 3;
   if (day == "FR ") return 4;
   if (day == "SA ") return 5;
   if (day == "SU ") return 6;
 
   return -1; // something bad happened. :)
 }
 
 Attendee::PartStat VCalFormat::readStatus(const char *s) const
 {
   QString statStr = s;
   statStr = statStr.upper();
   Attendee::PartStat status;
 
   if (statStr == "X-ACTION")
     status = Attendee::NeedsAction;
   else if (statStr == "NEEDS ACTION")
     status = Attendee::NeedsAction;
   else if (statStr== "ACCEPTED")
     status = Attendee::Accepted;
   else if (statStr== "SENT")
     status = Attendee::NeedsAction;
   else if (statStr== "TENTATIVE")
     status = Attendee::Tentative;
   else if (statStr== "CONFIRMED")
     status = Attendee::Accepted;
   else if (statStr== "DECLINED")
     status = Attendee::Declined;
   else if (statStr== "COMPLETED")
     status = Attendee::Completed;
   else if (statStr== "DELEGATED")
     status = Attendee::Delegated;
   else {
     kdDebug(5800) << "error setting attendee mStatus, unknown mStatus!" << endl;
     status = Attendee::NeedsAction;
   }
 
   return status;
 }
 
 QCString VCalFormat::writeStatus(Attendee::PartStat status) const
 {
   switch(status) {
     default:
     case Attendee::NeedsAction:
       return "NEEDS ACTION";
       break;
     case Attendee::Accepted:
       return "ACCEPTED";
       break;
     case Attendee::Declined:
       return "DECLINED";
       break;
     case Attendee::Tentative:
       return "TENTATIVE";
       break;
     case Attendee::Delegated:
       return "DELEGATED";
       break;
     case Attendee::Completed:
       return "COMPLETED";
       break;
     case Attendee::InProcess:
       return "NEEDS ACTION";
       break;
   }
 }
diff --git a/libkcal/versit/port.h b/libkcal/versit/port.h
index afc16dd..1768bee 100644
--- a/libkcal/versit/port.h
+++ b/libkcal/versit/port.h
@@ -1,75 +1,88 @@
 /***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International
-Business Machines Corporation and Siemens Rolm Communications Inc.
-
-For purposes of this license notice, the term Licensors shall mean,
-collectively, Apple Computer, Inc., AT&T Corp., International
-Business Machines Corporation and Siemens Rolm Communications Inc.
-The term Licensor shall mean any of the Licensors.
-
-Subject to acceptance of the following conditions, permission is hereby
-granted by Licensors without the need for written agreement and without
-license or royalty fees, to use, copy, modify and distribute this
-software for any purpose.
-
-The above copyright notice and the following four paragraphs must be
-reproduced in all copies of this software and any software including
-this software.
-
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
-MODIFICATIONS.
-
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or
-disclosure by the government are subject to restrictions set forth in
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
+(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
+Business Machines Corporation and Siemens Rolm Communications Inc.             
+                                                                               
+For purposes of this license notice, the term Licensors shall mean,            
+collectively, Apple Computer, Inc., AT&T Corp., International                  
+Business Machines Corporation and Siemens Rolm Communications Inc.             
+The term Licensor shall mean any of the Licensors.                             
+                                                                               
+Subject to acceptance of the following conditions, permission is hereby        
+granted by Licensors without the need for written agreement and without        
+license or royalty fees, to use, copy, modify and distribute this              
+software for any purpose.                                                      
+                                                                               
+The above copyright notice and the following four paragraphs must be           
+reproduced in all copies of this software and any software including           
+this software.                                                                 
+                                                                               
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
+ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
+MODIFICATIONS.                                                                 
+                                                                               
+IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
+INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
+OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
+DAMAGE.                                                                        
+                                                                               
+EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
+PURPOSE.                                                                       
+
+The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
+disclosure by the government are subject to restrictions set forth in          
+DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
 
 ***************************************************************************/
 
 #ifndef __PORT_H__
 #define __PORT_H__ 1
 
+
 #if defined(__CPLUSPLUS__) || defined(__cplusplus)
 extern "C" {
 #endif
-
-#define vCardClipboardFormat            "+//ISBN 1-887687-00-9::versit::PDI//vCard"
-#define vCalendarClipboardFormat        "+//ISBN 1-887687-00-9::versit::PDI//vCalendar"
-
-/* The above strings vCardClipboardFormat and vCalendarClipboardFormat
-are globally unique IDs which can be used to generate clipboard format
-ID's as per the requirements of a specific platform. For example, in
-Windows they are used as the parameter in a call to RegisterClipboardFormat.
+                     
+/* some of these #defines are commented out because */
+/* Visual C++ sets them on the compiler command line instead */
+
+/* #define _DEBUG */
+/* #define WIN32 */
+/* #define WIN16 */
+/* #define _WINDOWS */
+/* #define __MWERKS__ */
+/* #define INCLUDEMFC */
+
+        #define         vCardClipboardFormat    "+//ISBN 1-887687-00-9::versit::PDI//vCard"
+        #define         vCalendarClipboardFormat"+//ISBN 1-887687-00-9::versit::PDI//vCalendar"
+
+/* The above strings vCardClipboardFormat and vCalendarClipboardFormat 
+are globally unique IDs which can be used to generate clipboard format 
+ID's as per the requirements of a specific platform. For example, in 
+Windows they are used as the parameter in a call to RegisterClipboardFormat. 
 For example:
 
   CLIPFORMAT foo = RegisterClipboardFormat(vCardClipboardFormat);
 
 */
 
-#define vCardMimeType           "text/x-vCard"
-#define vCalendarMimeType       "text/x-vCalendar"
+        #define vCardMimeType   "text/x-vCard"
+        #define vCalendarMimeType"text/x-vCalendar"
+
+#define DLLEXPORT(t) t
 
 #ifndef FALSE
-#define FALSE   0
+        #define FALSE0
 #endif
 #ifndef TRUE
-#define TRUE    1
+        #define TRUE1
 #endif
 
-#define Parse_Debug(t)
-
+#define stricmp strcasecmp
+        
 #if defined(__CPLUSPLUS__) || defined(__cplusplus)
 }
 #endif
 
 #endif /* __PORT_H__ */
diff --git a/libkcal/versit/vcc.c b/libkcal/versit/vcc.c
index 350cac3..9be752d 100644
--- a/libkcal/versit/vcc.c
+++ b/libkcal/versit/vcc.c
@@ -1,2162 +1,2319 @@
-
-/*  A Bison parser, made from ./vcc.y
-    by GNU Bison version 1.28  */
+/* A Bison parser, made from vcc.y
+   by GNU bison 1.35.  */
 
 #define YYBISON 1  /* Identify Bison output.  */
 
-#ifdef _WIN32_
-#define strcasecmp _stricmp
-#endif
-
-        #define         EQ257
-        #define         COLON258
-        #define         DOT259
-        #define         SEMICOLON260
-        #define         SPACE261
-        #define         HTAB262
-        #define         LINESEP263
-        #define         NEWLINE264
-        #define         BEGIN_VCARD265
-        #define         END_VCARD266
-        #define         BEGIN_VCAL267
-        #define         END_VCAL268
-        #define         BEGIN_VEVENT269
-        #define         END_VEVENT270
-        #define         BEGIN_VTODO271
-        #define         END_VTODO272
-        #define         ID273
-        #define         STRING274
-
-#line 1 "./vcc.y"
+        # define        EQ257
+        # define        COLON258
+        # define        DOT259
+        # define        SEMICOLON260
+        # define        SPACE261
+        # define        HTAB262
+        # define        LINESEP263
+        # define        NEWLINE264
+        # define        BEGIN_VCARD265
+        # define        END_VCARD266
+        # define        BEGIN_VCAL267
+        # define        END_VCAL268
+        # define        BEGIN_VEVENT269
+        # define        END_VEVENT270
+        # define        BEGIN_VTODO271
+        # define        END_VTODO272
+        # define        ID273
+        # define        STRING274
+
+#line 1 "vcc.y"
 
 
 /***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
+(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International
+Business Machines Corporation and Siemens Rolm Communications Inc.
+
+For purposes of this license notice, the term Licensors shall mean,
+collectively, Apple Computer, Inc., AT&T Corp., International
+Business Machines Corporation and Siemens Rolm Communications Inc.
+The term Licensor shall mean any of the Licensors.
+
+Subject to acceptance of the following conditions, permission is hereby
+granted by Licensors without the need for written agreement and without
+license or royalty fees, to use, copy, modify and distribute this
+software for any purpose.
+
+The above copyright notice and the following four paragraphs must be
+reproduced in all copies of this software and any software including
+this software.
+
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE
+ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
+MODIFICATIONS.
+
+IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,
+INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
+OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.
+
+The software is provided with RESTRICTED RIGHTS.  Use, duplication, or
+disclosure by the government are subject to restrictions set forth in
+DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 
 ***************************************************************************/
 
 /*
  * src: vcc.c
  * doc: Parser for vCard and vCalendar. Note that this code is
  * generated by a yacc parser generator. Generally it should not
  * be edited by hand. The real source is vcc.y. The #line directives
  * can be commented out here to make it easier to trace through
- * in a debugger. However, if a bug is found it should 
+ * in a debugger. However, if a bug is found it should
  * be fixed in vcc.y and this file regenerated.
  */
 
 
 /* debugging utilities */
 #if __DEBUG
 #define DBG_(x) printf x
 #else
 #define DBG_(x)
 #endif
 
+#ifdef WIN32
+#define snprintf   _snprintf
+#define strcasecmp stricmp
+#endif
+
 /****  External Functions  ****/
 
 /* assign local name to parser variables and functions so that
    we can use more than one yacc based parser.
 */
 
 #define yyparse mime_parse
 #define yylex mime_lex
 #define yyerror mime_error
 #define yychar mime_char
 /* #define p_yyval p_mime_val */
 #undef yyval
 #define yyval mime_yyval
 /* #define p_yylval p_mime_lval */
 #undef yylval
 #define yylval mime_yylval
 #define yydebug mime_debug
 #define yynerrs mime_nerrs
 #define yyerrflag mime_errflag
 #define yyss mime_ss
 #define yyssp mime_ssp
 #define yyvs mime_vs
 #define yyvsp mime_vsp
 #define yylhs mime_lhs
 #define yylen mime_len
 #define yydefred mime_defred
 #define yydgoto mime_dgoto
 #define yysindex mime_sindex
 #define yyrindex mime_rindex
 #define yygindex mime_gindex
 #define yytable mime_table
 #define yycheck mime_check
 #define yyname mime_name
 #define yyrule mime_rule
-#undef YYPREFIX
 #define YYPREFIX "mime_"
 
 
 #ifndef _NO_LINE_FOLDING
 #define _SUPPORT_LINE_FOLDING 1
 #endif
 
-#include <string.h>
-#ifndef __FreeBSD__
-#include <malloc.h>
+/* undef below if compile with MFC */
+/* #define INCLUDEMFC 1 */
+
+#if defined(WIN32) || defined(_WIN32)
+#ifdef INCLUDEMFC
+#include <afx.h>
 #endif
+#endif
+
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include "vcc.h"
 
-/* The following is a hack that I hope will get things compiling
- * on SunOS 4.1.x systems 
- */
-#ifndef SEEK_SET
-#define SEEK_SET        0       /* Seek from beginning of file.  */
-#define SEEK_CUR        1       /* Seek from current position.  */
-#define SEEK_END        2       /* Seek from end of file.  */
-#endif
-
 /****  Types, Constants  ****/
 
-        #define YYDEBUG                 0/* 1 to compile in some debugging code */
+        #define YYDEBUG                 1/* 1 to compile in some debugging code */
         #define MAXTOKEN        256/* maximum token (line) length */
-        #define YYSTACKSIZE     1000/* ~unref ? */
+        #define YYSTACKSIZE     50/* ~unref ? */
         #define MAXLEVEL        10/* max # of nested objects parseable */
                                 /* (includes outermost) */
 
 
 /****  Global Variables  ****/
 int mime_lineNum, mime_numErrors; /* yyerror() can use these */
 static VObject* vObjList;
 static VObject *curProp;
 static VObject *curObj;
 static VObject* ObjStack[MAXLEVEL];
 static int ObjStackTop;
 
 
 /* A helpful utility for the rest of the app. */
 #if __CPLUSPLUS__
 extern "C" {
 #endif
 
-  /*    static void Parse_Debug(const char *s);*/
+    extern void Parse_Debug(const char *s);
     static void yyerror(char *s);
 
 #if __CPLUSPLUS__
     };
 #endif
 
 int yyparse();
-static int yylex();
+
 enum LexMode {
         L_NORMAL,
         L_VCARD,
         L_VCAL,
         L_VEVENT,
         L_VTODO,
         L_VALUES,
         L_BASE64,
         L_QUOTED_PRINTABLE
         };
 
 /****  Private Forward Declarations  ****/
 static int pushVObject(const char *prop);
 static VObject* popVObject();
-char* lexDataFromBase64();
 static void lexPopMode(int top);
 static int lexWithinMode(enum LexMode mode);
 static void lexPushMode(enum LexMode mode);
 static void enterProps(const char *s);
 static void enterAttr(const char *s1, const char *s2);
-/* static void enterValues(const char *value); */
-static void appendValue(const char *value);
+static void enterValues(const char *value);
 static void mime_error_(char *s);
 
 
-#line 181 "./vcc.y"
+#line 180 "vcc.y"
+#ifndef YYSTYPE
 typedef union {
     char *str;
     VObject *vobj;
-    } YYSTYPE;
-#include <stdio.h>
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
+    } yystype;
+# define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
+#ifndef YYDEBUG
+# define YYDEBUG 0
 #endif
 
 
 
         #define         YYFINAL         62
         #define         YYFLAG  -32768
         #define         YYNTBASE21
 
+/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
 #define YYTRANSLATE(x) ((unsigned)(x) <= 274 ? yytranslate[x] : 51)
 
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
-     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-    17,    18,    19,    20
+/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
+static const char yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20
 };
 
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     2,     3,     7,     9,    11,    13,    14,    19,    20,
-    24,    27,    29,    30,    36,    38,    39,    43,    45,    48,
-    50,    53,    55,    59,    61,    62,    67,    69,    71,    72,
-    73,    78,    79,    83,    86,    88,    90,    92,    94,    95,
-   100,   101,   105,   106,   111,   112
+#if YYDEBUG
+static const short yyprhs[] =
+{
+       0,     0,     2,     3,     7,     9,    11,    13,    14,    19,
+      20,    24,    27,    29,    30,    36,    38,    39,    43,    45,
+      48,    50,    53,    55,    59,    61,    62,    67,    69,    71,
+      72,    73,    78,    79,    83,    86,    88,    90,    92,    94,
+      95,   100,   101,   105,   106,   111,   112
 };
-
-static const short yyrhs[] = {    22,
-     0,     0,    24,    23,    22,     0,    24,     0,    25,     0,
-    40,     0,     0,    11,    26,    28,    12,     0,     0,    11,
-    27,    12,     0,    29,    28,     0,    29,     0,     0,    31,
-     4,    30,    37,     9,     0,     1,     0,     0,    36,    32,
-    33,     0,    36,     0,    34,    33,     0,    34,     0,     6,
-    35,     0,    36,     0,    36,     3,    36,     0,    19,     0,
-     0,    39,     6,    38,    37,     0,    39,     0,    20,     0,
-     0,     0,    13,    41,    43,    14,     0,     0,    13,    42,
-    14,     0,    44,    43,     0,    44,     0,    45,     0,    48,
-     0,    28,     0,     0,    15,    46,    28,    16,     0,     0,
-    15,    47,    16,     0,     0,    17,    49,    28,    18,     0,
-     0,    17,    50,    18,     0
+static const short yyrhs[] =
+{
+      22,     0,     0,    24,    23,    22,     0,    24,     0,    25,
+       0,    40,     0,     0,    11,    26,    28,    12,     0,     0,
+      11,    27,    12,     0,    29,    28,     0,    29,     0,     0,
+      31,     4,    30,    37,     9,     0,     1,     0,     0,    36,
+      32,    33,     0,    36,     0,    34,    33,     0,    34,     0,
+       6,    35,     0,    36,     0,    36,     3,    36,     0,    19,
+       0,     0,    39,     6,    38,    37,     0,    39,     0,    20,
+       0,     0,     0,    13,    41,    43,    14,     0,     0,    13,
+      42,    14,     0,    44,    43,     0,    44,     0,    45,     0,
+      48,     0,    28,     0,     0,    15,    46,    28,    16,     0,
+       0,    15,    47,    16,     0,     0,    17,    49,    28,    18,
+       0,     0,    17,    50,    18,     0
 };
 
 #endif
 
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-   209,   212,   215,   215,   219,   220,   223,   229,   234,   240,
-   246,   247,   250,   254,   260,   263,   268,   268,   274,   275,
-   278,   281,   285,   292,   295,   296,   296,   300,   301,   305,
-   309,   311,   314,   317,   318,   321,   323,   324,   327,   334,
-   339,   345,   351,   358,   363,   369
+#if YYDEBUG
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const short yyrline[] =
+{
+       0,   208,   211,   211,   214,   218,   219,   222,   222,   233,
+     233,   245,   246,   249,   249,   259,   262,   262,   267,   273,
+     274,   277,   280,   284,   291,   294,   294,   295,   299,   300,
+     303,   303,   309,   309,   315,   316,   319,   321,   322,   325,
+     325,   337,   337,   349,   349,   361,   361
 };
 #endif
 
 
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+#if (YYDEBUG) || defined YYERROR_VERBOSE
 
-static const char * const yytname[] = {   "$","error","$undefined.","EQ","COLON",
-"DOT","SEMICOLON","SPACE","HTAB","LINESEP","NEWLINE","BEGIN_VCARD","END_VCARD",
-"BEGIN_VCAL","END_VCAL","BEGIN_VEVENT","END_VEVENT","BEGIN_VTODO","END_VTODO",
-"ID","STRING","mime","vobjects","@1","vobject","vcard","@2","@3","items","item",
-"@4","prop","@5","attr_params","attr_param","attr","name","values","@6","value",
-"vcal","@7","@8","calitems","calitem","eventitem","@9","@10","todoitem","@11",
-"@12", NULL
+/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
+static const char *const yytname[] =
+{
+  "$", "error", "$undefined.", "EQ", "COLON", "DOT", "SEMICOLON", "SPACE", 
+  "HTAB", "LINESEP", "NEWLINE", "BEGIN_VCARD", "END_VCARD", "BEGIN_VCAL", 
+  "END_VCAL", "BEGIN_VEVENT", "END_VEVENT", "BEGIN_VTODO", "END_VTODO", 
+  "ID", "STRING", "mime", "vobjects", "@1", "vobject", "vcard", "@2", 
+  "@3", "items", "item", "@4", "prop", "@5", "attr_params", "attr_param", 
+  "attr", "name", "values", "@6", "value", "vcal", "@7", "@8", "calitems", 
+  "calitem", "eventitem", "@9", "@10", "todoitem", "@11", "@12", 0
 };
 #endif
 
-static const short yyr1[] = {     0,
-    21,    23,    22,    22,    24,    24,    26,    25,    27,    25,
-    28,    28,    30,    29,    29,    32,    31,    31,    33,    33,
-    34,    35,    35,    36,    38,    37,    37,    39,    39,    41,
-    40,    42,    40,    43,    43,    44,    44,    44,    46,    45,
-    47,    45,    49,    48,    50,    48
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const short yyr1[] =
+{
+       0,    21,    23,    22,    22,    24,    24,    26,    25,    27,
+      25,    28,    28,    30,    29,    29,    32,    31,    31,    33,
+      33,    34,    35,    35,    36,    38,    37,    37,    39,    39,
+      41,    40,    42,    40,    43,    43,    44,    44,    44,    46,
+      45,    47,    45,    49,    48,    50,    48
 };
 
-static const short yyr2[] = {     0,
-     1,     0,     3,     1,     1,     1,     0,     4,     0,     3,
-     2,     1,     0,     5,     1,     0,     3,     1,     2,     1,
-     2,     1,     3,     1,     0,     4,     1,     1,     0,     0,
-     4,     0,     3,     2,     1,     1,     1,     1,     0,     4,
-     0,     3,     0,     4,     0,     3
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const short yyr2[] =
+{
+       0,     1,     0,     3,     1,     1,     1,     0,     4,     0,
+       3,     2,     1,     0,     5,     1,     0,     3,     1,     2,
+       1,     2,     1,     3,     1,     0,     4,     1,     1,     0,
+       0,     4,     0,     3,     2,     1,     1,     1,     1,     0,
+       4,     0,     3,     0,     4,     0,     3
 };
 
-static const short yydefact[] = {     0,
-     7,    30,     1,     2,     5,     6,     0,     0,     0,     0,
-     0,    15,    24,     0,     0,     0,    16,    10,    39,    43,
-    38,     0,     0,    36,    37,    33,     3,     8,    11,    13,
-     0,     0,     0,     0,     0,    31,    34,    29,     0,    17,
-    20,     0,    42,     0,    46,    28,     0,    27,    21,    22,
-    19,    40,    44,    14,    25,     0,    29,    23,    26,     0,
-     0,     0
+/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
+   doesn't specify something else to do.  Zero means the default is an
+   error. */
+static const short yydefact[] =
+{
+       0,     7,    30,     1,     2,     5,     6,     0,     0,     0,
+       0,     0,    15,    24,     0,     0,     0,    16,    10,    39,
+      43,    38,     0,     0,    36,    37,    33,     3,     8,    11,
+      13,     0,     0,     0,     0,     0,    31,    34,    29,     0,
+      17,    20,     0,    42,     0,    46,    28,     0,    27,    21,
+      22,    19,    40,    44,    14,    25,     0,    29,    23,    26,
+       0,     0,     0
 };
 
-static const short yydefgoto[] = {    60,
-     3,    11,     4,     5,     7,     8,    21,    15,    38,    16,
-    31,    40,    41,    49,    17,    47,    57,    48,     6,     9,
-    10,    22,    23,    24,    32,    33,    25,    34,    35
+static const short yydefgoto[] =
+{
+      60,     3,    11,     4,     5,     7,     8,    21,    15,    38,
+      16,    31,    40,    41,    49,    17,    47,    57,    48,     6,
+       9,    10,    22,    23,    24,    32,    33,    25,    34,    35
 };
 
-static const short yypact[] = {    -9,
-    -6,    -5,-32768,     7,-32768,-32768,     2,    -1,    19,    15,
-    -9,-32768,-32768,     1,     0,    26,    27,-32768,    16,    17,
--32768,    23,     9,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-    33,     2,    24,     2,    25,-32768,-32768,    13,    22,-32768,
-    33,    28,-32768,    29,-32768,-32768,    36,    40,-32768,    39,
--32768,-32768,-32768,-32768,-32768,    22,    13,-32768,-32768,    48,
-    49,-32768
+static const short yypact[] =
+{
+      -9,    -6,    -5,-32768,     7,-32768,-32768,     2,    -1,    19,
+      15,    -9,-32768,-32768,     1,     0,    26,    27,-32768,    16,
+      17,-32768,    23,     9,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,    33,     2,    24,     2,    25,-32768,-32768,    13,    22,
+  -32768,    33,    28,-32768,    29,-32768,-32768,    36,    40,-32768,
+      39,-32768,-32768,-32768,-32768,-32768,    22,    13,-32768,-32768,
+      48,    49,-32768
 };
 
-static const short yypgoto[] = {-32768,
-    41,-32768,-32768,-32768,-32768,-32768,    -7,-32768,-32768,-32768,
--32768,    10,-32768,-32768,   -34,    -4,-32768,-32768,-32768,-32768,
--32768,    31,-32768,-32768,-32768,-32768,-32768,-32768,-32768
+static const short yypgoto[] =
+{
+  -32768,    41,-32768,-32768,-32768,-32768,-32768,    -7,-32768,-32768,
+  -32768,-32768,    10,-32768,-32768,   -34,    -4,-32768,-32768,-32768,
+  -32768,-32768,    31,-32768,-32768,-32768,-32768,-32768,-32768,-32768
 };
 
 
         #define         YYLAST  54
 
 
-static const short yytable[] = {    14,
-    12,     1,    12,     2,    50,    -9,    -4,    29,   -32,    12,
-    18,   -12,    28,   -12,   -12,   -12,   -12,   -12,    13,    12,
-    13,    58,   -35,    19,    42,    20,    44,    13,    26,    30,
-   -18,   -41,    46,    19,   -45,    20,    36,    13,    39,    43,
-    13,    56,    45,    52,    54,    55,    53,    61,    62,     0,
-    51,    27,    59,    37
+static const short yytable[] =
+{
+      14,    12,     1,    12,     2,    50,    -9,    -4,    29,   -32,
+      12,    18,   -12,    28,   -12,   -12,   -12,   -12,   -12,    13,
+      12,    13,    58,   -35,    19,    42,    20,    44,    13,    26,
+      30,   -18,   -41,    46,    19,   -45,    20,    36,    13,    39,
+      43,    13,    56,    45,    52,    54,    55,    53,    61,    62,
+       0,    51,    27,    59,    37
 };
 
-static const short yycheck[] = {     7,
-     1,    11,     1,    13,    39,    12,     0,    15,    14,     1,
-    12,    12,    12,    14,    15,    16,    17,    18,    19,     1,
-    19,    56,    14,    15,    32,    17,    34,    19,    14,     4,
-     4,    16,    20,    15,    18,    17,    14,    19,     6,    16,
-    19,     3,    18,    16,     9,     6,    18,     0,     0,    -1,
-    41,    11,    57,    23
+static const short yycheck[] =
+{
+       7,     1,    11,     1,    13,    39,    12,     0,    15,    14,
+       1,    12,    12,    12,    14,    15,    16,    17,    18,    19,
+       1,    19,    56,    14,    15,    32,    17,    34,    19,    14,
+       4,     4,    16,    20,    15,    18,    17,    14,    19,     6,
+      16,    19,     3,    18,    16,     9,     6,    18,     0,     0,
+      -1,    41,    11,    57,    23
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison.simple"
-/* This file comes from bison-1.28.  */
+#line 3 "/usr/share/bison/bison.simple"
 
 /* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
    This special exception was added by the Free Software Foundation
    in version 1.24 of Bison.  */
 
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
+/* This is the parser code that is written into each bison parser when
+   the %semantic_parser declaration is not specified in the grammar.
+   It was written by Richard Stallman by simplifying the hairy parser
+   used when %semantic_parser is specified.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
+# else
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
+#    define YYSTACK_ALLOC alloca
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
+#  endif
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
+# endif
+#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+
+
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+         || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  short yyss;
+  YYSTYPE yyvs;
+# if YYLSP_NEEDED
+  YYLTYPE yyls;
+# endif
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# if YYLSP_NEEDED
+#  define YYSTACK_BYTES(N) \
+             ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))\
+      + 2 * YYSTACK_GAP_MAX)
+# else
+#  define YYSTACK_BYTES(N) \
+             ((N) * (sizeof (short) + sizeof (YYSTYPE))                         \
+      + YYSTACK_GAP_MAX)
+# endif
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+        #   define YYCOPY(To, From, Count)      \
+              do                                \
+                {                               \
+                  register YYSIZE_T yyi;        \
+                  for (yyi = 0; yyi < (Count); yyi++)\
+                    (To)[yyi] = (From)[yyi];    \
+                }                               \
+      while (0)
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+        # define YYSTACK_RELOCATE(Stack)                                \
+            do                                                          \
+              {                                                                 \
+                YYSIZE_T yynewbytes;                                    \
+                YYCOPY (&yyptr->Stack, Stack, yysize);                  \
+                Stack = &yyptr->Stack;                                  \
+                yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;\
+                yyptr += yynewbytes / sizeof (*yyptr);                  \
+              }                                                                 \
+    while (0)
 
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-         instead, just don't use alloca.  */
-#include <malloc.h>
 #endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-                 and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
+
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
 #endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
 #endif
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
 
         #define yyerrok         (yyerrstatus = 0)
         #define yyclearin(yychar = YYEMPTY)
         #define YYEMPTY         -2
         #define YYEOF   0
         #define YYACCEPTgoto yyacceptlab
         #define YYABORT goto yyabortlab
         #define YYERROR         goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
         #define YYFAIL  goto yyerrlab
 #define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
+        #define YYBACKUP(Token, Value)                          \
         do                                                      \
           if (yychar == YYEMPTY && yylen == 1)                  \
-            { yychar = (token), yylval = (value);               \
+            {                                                   \
+              yychar = (Token);                                         \
+              yylval = (Value);                                         \
               yychar1 = YYTRANSLATE (yychar);                   \
               YYPOPSTACK;                                       \
               goto yybackup;                                    \
             }                                                   \
           else                                                  \
-            { yyerror ("syntax error: cannot back up"); YYERROR; }\
+            {                                                   \
+              yyerror ("syntax error: cannot back up");                 \
+              YYERROR;                                          \
+            }                                                   \
 while (0)
 
         #define YYTERROR1
         #define YYERRCODE256
 
-#ifndef YYPURE
-        #define YYLEX   yylex()
-#endif
 
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-        #define YYLEX   yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-        #define YYLEX   yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-        #define YYLEX   yylex(&yylval, YYLEX_PARAM)
-#else
-        #define YYLEX   yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+   are run).
 
-/* If nonreentrant, generate the variables here */
+   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
+   first token.  By default, to implement support for ranges, extend
+   its range to the last symbol.  */
 
-#ifndef YYPURE
-
-        int     yychar;                         /*  the lookahead symbol        */
-        YYSTYPE         yylval;                         /*  the semantic value of the   */
-                                        /*  lookahead symbol            */
-
-#ifdef YYLSP_NEEDED
-        YYLTYPE yylloc;                         /*  location data for the lookahead*/
-                                        /*  symbol                      */
+#ifndef YYLLOC_DEFAULT
+        # define YYLLOC_DEFAULT(Current, Rhs, N)       \
+           Current.last_line   = Rhs[N].last_line;\
+   Current.last_column = Rhs[N].last_column;
 #endif
 
-        int yynerrs;            /*  number of parse errors so far       */
-#endif  /* not YYPURE */
-
-#if YYDEBUG != 0
-        int yydebug;                    /*  nonzero means print parse trace*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
-
-        /*  YYINITDEPTH indicates the initial size of the parser's stacks*/
 
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#if YYPURE
+# if YYLSP_NEEDED
+#  ifdef YYLEX_PARAM
+        #   define YYLEX        yylex (&yylval, &yylloc, YYLEX_PARAM)
+#  else
+        #   define YYLEX        yylex (&yylval, &yylloc)
+#  endif
+# else /* !YYLSP_NEEDED */
+#  ifdef YYLEX_PARAM
+        #   define YYLEX        yylex (&yylval, YYLEX_PARAM)
+#  else
+        #   define YYLEX        yylex (&yylval)
+#  endif
+# endif /* !YYLSP_NEEDED */
+#else /* !YYPURE */
+        # define YYLEX          yylex ()
+#endif /* !YYPURE */
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+        # define YYDPRINTF(Args)                \
+        do {                                    \
+          if (yydebug)                          \
+            YYFPRINTF Args;                     \
+} while (0)
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+#endif /* !YYDEBUG */
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
         #ifndefYYINITDEPTH
-#define YYINITDEPTH 200
+# define YYINITDEPTH 200
 #endif
 
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
 
 #if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
+# undef YYMAXDEPTH
 #endif
 
 #ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
+# define YYMAXDEPTH 10000
 #endif
 
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-        #if __GNUC__ > 1        /* GNU C and GNU C++ define this.  */
-        #define __yy_memcpy(TO,FROM,COUNT)__builtin_memcpy(TO,FROM,COUNT)
-        #else                   /* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+#ifdef YYERROR_VERBOSE
 
-  while (i-- > 0)
-    *t++ = *f++;
-}
+# ifndef yystrlen
+#  if defined (__GLIBC__) && defined (_STRING_H)
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+#   if defined (__STDC__) || defined (__cplusplus)
+yystrlen (const char *yystr)
+#   else
+yystrlen (yystr)
+     const char *yystr;
+#   endif
+{
+  register const char *yys = yystr;
 
-#else /* __cplusplus */
+  while (*yys++ != '\0')
+    continue;
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
+  return yys - yystr - 1;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+#   if defined (__STDC__) || defined (__cplusplus)
+yystpcpy (char *yydest, const char *yysrc)
+#   else
+yystpcpy (yydest, yysrc)
+     char *yydest;
+     const char *yysrc;
+#   endif
 {
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
 
-  while (i-- > 0)
-    *t++ = *f++;
-}
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
 
-#endif
+  return yyd - 1;
+}
+#  endif
+# endif
 #endif
 
-#line 217 "/usr/share/bison.simple"
+#line 315 "/usr/share/bison/bison.simple"
+
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
    It should actually point to an object.
    Grammar actions can access the variable by casting it
    to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
+# if defined (__STDC__) || defined (__cplusplus)
+#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL
+# else
+#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+# endif
+#else /* !YYPARSE_PARAM */
+# define YYPARSE_PARAM_ARG
+# define YYPARSE_PARAM_DECL
+#endif /* !YYPARSE_PARAM */
 
 /* Prevent warning if -Wstrict-prototypes.  */
-#if defined (__GNUC__) && ! defined (__cplusplus)
-#ifdef YYPARSE_PARAM
+#ifdef __GNUC__
+# ifdef YYPARSE_PARAM
 int yyparse (void *);
-#else
+# else
 int yyparse (void);
+# endif
 #endif
+
+/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+   variables are global, or local to YYPARSE.  */
+
+        #define YY_DECL_NON_LSP_VARIABLES               \
+        /* The lookahead symbol.  */                    \
+        int yychar;                                     \
+                                                        \
+        /* The semantic value of the lookahead symbol. */\
+        YYSTYPE yylval;                                         \
+                                                        \
+        /* Number of parse errors so far.  */           \
+int yynerrs;
+
+#if YYLSP_NEEDED
+        # define YY_DECL_VARIABLES              \
+        YY_DECL_NON_LSP_VARIABLES               \
+                                                \
+        /* Location data for the lookahead symbol.  */\
+YYLTYPE yylloc;
+#else
+        # define YY_DECL_VARIABLES              \
+YY_DECL_NON_LSP_VARIABLES
 #endif
 
+
+/* If nonreentrant, generate the variables here. */
+
+#if !YYPURE
+YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
 int
-yyparse(YYPARSE_PARAM_ARG)
+yyparse (YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
+  /* If reentrant, generate the variables here. */
+#if YYPURE
+  YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
   register int yystate;
   register int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yychar1 = 0;
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack. */
+          shortyyssa[YYINITDEPTH];
+  short *yyss = yyssa;
   register short *yyssp;
-  register YYSTYPE *yyvsp;
-          int yyerrstatus;/*  number of tokens to shift before error messages enabled */
-          int yychar1 = 0;      /*  lookahead token as an internal (translated) token number */
 
-          short         yyssa[YYINITDEPTH];     /*  the state stack             */
-          YYSTYPE yyvsa[YYINITDEPTH];   /*  the semantic value stack    */
-
-          short *yyss = yyssa;  /*  refer to the stacks thru separate pointers */
-          YYSTYPE *yyvs = yyvsa;/*  to allow yyoverflow to reallocate them elsewhere */
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  register YYSTYPE *yyvsp;
 
-#ifdef YYLSP_NEEDED
-          YYLTYPE yylsa[YYINITDEPTH];   /*  the location stack          */
+#if YYLSP_NEEDED
+  /* The location stack.  */
+  YYLTYPE yylsa[YYINITDEPTH];
   YYLTYPE *yyls = yylsa;
   YYLTYPE *yylsp;
+#endif
 
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+#if YYLSP_NEEDED
+# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
 #else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+# define YYPOPSTACK   (yyvsp--, yyssp--)
 #endif
 
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
 
-          YYSTYPE yyval;                /*  the variable used to return         */
-                                        /*  semantic values from the action*/
-                                        /*  routines                    */
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+#if YYLSP_NEEDED
+  YYLTYPE yyloc;
+#endif
 
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule. */
   int yylen;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
           yychar = YYEMPTY;     /* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
-  yyssp = yyss - 1;
+  yyssp = yyss;
   yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp = yyls;
 #endif
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed. so pushing a state here evens the stacks.
+     */
+  yyssp++;
 
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
-
-  *++yyssp = yystate;
+ yysetstate:
+  *yyssp = yystate;
 
   if (yyssp >= yyss + yystacksize - 1)
     {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
       /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
+      YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-         the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-         but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-                 &yyss1, size * sizeof (*yyssp),
-                 &yyvs1, size * sizeof (*yyvsp),
-                 &yyls1, size * sizeof (*yylsp),
-                 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-                 &yyss1, size * sizeof (*yyssp),
-                 &yyvs1, size * sizeof (*yyvsp),
-                 &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
+      {
+        /* Give user a chance to reallocate the stack. Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        short *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  */
+# if YYLSP_NEEDED
+        YYLTYPE *yyls1 = yyls;
+        /* This used to be a conditional around just the two extra args,
+           but that might be undefined if yyoverflow is a macro.  */
+        yyoverflow ("parser stack overflow",
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yyls1, yysize * sizeof (*yylsp),
+                    &yystacksize);
+        yyls = yyls1;
+# else
+        yyoverflow ("parser stack overflow",
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+# endif
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
 #else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyoverflowlab;
+# else
       /* Extend the stack our own way.  */
       if (yystacksize >= YYMAXDEPTH)
-        {
-          yyerror("parser stack overflow");
-          if (yyfree_stacks)
-            {
-              free (yyss);
-              free (yyvs);
-#ifdef YYLSP_NEEDED
-              free (yyls);
-#endif
-            }
-          return 2;
-        }
+        goto yyoverflowlab;
       yystacksize *= 2;
       if (yystacksize > YYMAXDEPTH)
         yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif 
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-                   size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-                   size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-                   size * (unsigned int) sizeof (*yylsp));
-#endif
+
+      {
+        short *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyoverflowlab;
+        YYSTACK_RELOCATE (yyss);
+        YYSTACK_RELOCATE (yyvs);
+# if YYLSP_NEEDED
+        YYSTACK_RELOCATE (yyls);
+# endif
+# undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
 #endif /* no yyoverflow */
 
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+#if YYLSP_NEEDED
+      yylsp = yyls + yysize - 1;
 #endif
 
-#if YYDEBUG != 0
-      if (yydebug)
-        fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
 
       if (yyssp >= yyss + yystacksize - 1)
         YYABORT;
     }
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
   goto yybackup;
- yybackup:
+
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
 
 /* Do appropriate processing given the current state.  */
 /* Read a lookahead token if we need one and don't already have one.  */
 /* yyresume: */
 
   /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
   if (yyn == YYFLAG)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
 
   /* yychar is either YYEMPTY or YYEOF
      or a valid token in external form.  */
 
   if (yychar == YYEMPTY)
     {
-#if YYDEBUG != 0
-      if (yydebug)
-        fprintf(stderr, "Reading a token: ");
-#endif
+      YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
   /* Convert token to internal form (in yychar1) for indexing tables with */
 
           if (yychar <= 0)      /* This means end of input. */
     {
       yychar1 = 0;
               yychar = YYEOF;   /* Don't call YYLEX any more */
 
-#if YYDEBUG != 0
-      if (yydebug)
-        fprintf(stderr, "Now at end of input.\n");
-#endif
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yychar1 = YYTRANSLATE(yychar);
+      yychar1 = YYTRANSLATE (yychar);
 
-#if YYDEBUG != 0
+#if YYDEBUG
+     /* We have to keep this `#if YYDEBUG', since we use variables
+        which are defined only if `YYDEBUG' is set.  */
       if (yydebug)
         {
-          fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-          /* Give the individual parser a way to print the precise meaning
-             of a token, for further debugging info.  */
-#ifdef YYPRINT
+          YYFPRINTF (stderr, "Next token is %d (%s",
+                     yychar, yytname[yychar1]);
+          /* Give the individual parser a way to print the precise
+             meaning of a token, for further debugging info.  */
+# ifdef YYPRINT
           YYPRINT (stderr, yychar, yylval);
-#endif
-          fprintf (stderr, ")\n");
+# endif
+          YYFPRINTF (stderr, ")\n");
         }
 #endif
     }
 
   yyn += yychar1;
   if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
     goto yydefault;
 
   yyn = yytable[yyn];
 
   /* yyn is what to do for this token type in this state.
      Negative => reduce, -yyn is rule number.
      Positive => shift, yyn is new state.
        New state is final state => don't bother to shift,
        just return success.
      0, or most negative number => error.  */
 
   if (yyn < 0)
     {
       if (yyn == YYFLAG)
         goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
   else if (yyn == 0)
     goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
   /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
+  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
+              yychar, yytname[yychar1]));
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   *++yylsp = yylloc;
 #endif
 
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
 
   yystate = yyn;
   goto yynewstate;
 
-/* Do the default action for the current state.  */
-yydefault:
 
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;
+  goto yyreduce;
 
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
 yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
 
-#if YYDEBUG != 0
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to the semantic value of
+     the lookahead token.  This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+#if YYLSP_NEEDED
+  /* Similarly for the default location.  Let the user run additional
+     commands if for instance locations are ranges.  */
+  yyloc = yylsp[1-yylen];
+  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+#endif
+
+#if YYDEBUG
+  /* We have to keep this `#if YYDEBUG', since we use variables which
+     are defined only if `YYDEBUG' is set.  */
   if (yydebug)
     {
-      int i;
+      int yyi;
 
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-               yyn, yyrline[yyn]);
+      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
+                 yyn, yyrline[yyn]);
 
       /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-        fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
+        YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     }
 #endif
 
-
   switch (yyn) {
 
 case 2:
-#line 213 "./vcc.y"
-{ addList(&vObjList, yyvsp[0].vobj); curObj = 0; ;
-    break;}
+#line 212 "vcc.y"
+{ addList(&vObjList, yyvsp[0].vobj); curObj = 0; }
+    break;
 case 4:
-#line 216 "./vcc.y"
-{ addList(&vObjList, yyvsp[0].vobj); curObj = 0; ;
-    break;}
+#line 215 "vcc.y"
+{ addList(&vObjList, yyvsp[0].vobj); curObj = 0; }
+    break;
 case 7:
-#line 225 "./vcc.y"
+#line 224 "vcc.y"
 {
         lexPushMode(L_VCARD);
         if (!pushVObject(VCCardProp)) YYERROR;
-        ;
-    break;}
+        }
+    break;
 case 8:
-#line 230 "./vcc.y"
+#line 229 "vcc.y"
 {
         lexPopMode(0);
         yyval.vobj = popVObject();
-        ;
-    break;}
+        }
+    break;
 case 9:
-#line 235 "./vcc.y"
+#line 234 "vcc.y"
 {
         lexPushMode(L_VCARD);
         if (!pushVObject(VCCardProp)) YYERROR;
-        ;
-    break;}
+        }
+    break;
 case 10:
-#line 240 "./vcc.y"
+#line 239 "vcc.y"
 {
         lexPopMode(0);
         yyval.vobj = popVObject();
-        ;
-    break;}
+        }
+    break;
 case 13:
-#line 251 "./vcc.y"
+#line 250 "vcc.y"
 {
         lexPushMode(L_VALUES);
-        ;
-    break;}
+        }
+    break;
 case 14:
-#line 255 "./vcc.y"
+#line 254 "vcc.y"
 {
         if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE))
            lexPopMode(0);
         lexPopMode(0);
-        ;
-    break;}
+        }
+    break;
 case 16:
-#line 264 "./vcc.y"
+#line 263 "vcc.y"
 {
         enterProps(yyvsp[0].str);
-        ;
-    break;}
+        }
+    break;
 case 18:
-#line 269 "./vcc.y"
+#line 268 "vcc.y"
 {
         enterProps(yyvsp[0].str);
-        ;
-    break;}
+        }
+    break;
 case 22:
-#line 282 "./vcc.y"
+#line 281 "vcc.y"
 {
         enterAttr(yyvsp[0].str,0);
-        ;
-    break;}
+        }
+    break;
 case 23:
-#line 286 "./vcc.y"
+#line 285 "vcc.y"
 {
         enterAttr(yyvsp[-2].str,yyvsp[0].str);
 
-        ;
-    break;}
+        }
+    break;
 case 25:
-#line 295 "./vcc.y"
-{ appendValue(yyvsp[-1].str); ;
-    break;}
+#line 294 "vcc.y"
+{ enterValues(yyvsp[-1].str); }
+    break;
 case 27:
-#line 297 "./vcc.y"
-{ appendValue(yyvsp[0].str); ;
-    break;}
+#line 296 "vcc.y"
+{ enterValues(yyvsp[0].str); }
+    break;
 case 29:
-#line 302 "./vcc.y"
-{ yyval.str = 0; ;
-    break;}
+#line 300 "vcc.y"
+{ yyval.str = 0; }
+    break;
 case 30:
-#line 307 "./vcc.y"
-{ if (!pushVObject(VCCalProp)) YYERROR; ;
-    break;}
+#line 305 "vcc.y"
+{ if (!pushVObject(VCCalProp)) YYERROR; }
+    break;
 case 31:
-#line 310 "./vcc.y"
-{ yyval.vobj = popVObject(); ;
-    break;}
+#line 308 "vcc.y"
+{ yyval.vobj = popVObject(); }
+    break;
 case 32:
-#line 312 "./vcc.y"
-{ if (!pushVObject(VCCalProp)) YYERROR; ;
-    break;}
+#line 310 "vcc.y"
+{ if (!pushVObject(VCCalProp)) YYERROR; }
+    break;
 case 33:
-#line 314 "./vcc.y"
-{ yyval.vobj = popVObject(); ;
-    break;}
+#line 312 "vcc.y"
+{ yyval.vobj = popVObject(); }
+    break;
 case 39:
-#line 329 "./vcc.y"
+#line 327 "vcc.y"
 {
         lexPushMode(L_VEVENT);
         if (!pushVObject(VCEventProp)) YYERROR;
-        ;
-    break;}
+        }
+    break;
 case 40:
-#line 335 "./vcc.y"
+#line 333 "vcc.y"
 {
         lexPopMode(0);
         popVObject();
-        ;
-    break;}
+        }
+    break;
 case 41:
-#line 340 "./vcc.y"
+#line 338 "vcc.y"
 {
         lexPushMode(L_VEVENT);
         if (!pushVObject(VCEventProp)) YYERROR;
-        ;
-    break;}
+        }
+    break;
 case 42:
-#line 345 "./vcc.y"
+#line 343 "vcc.y"
 {
         lexPopMode(0);
         popVObject();
-        ;
-    break;}
+        }
+    break;
 case 43:
-#line 353 "./vcc.y"
+#line 351 "vcc.y"
 {
         lexPushMode(L_VTODO);
         if (!pushVObject(VCTodoProp)) YYERROR;
-        ;
-    break;}
+        }
+    break;
 case 44:
-#line 359 "./vcc.y"
+#line 357 "vcc.y"
 {
         lexPopMode(0);
         popVObject();
-        ;
-    break;}
+        }
+    break;
 case 45:
-#line 364 "./vcc.y"
+#line 362 "vcc.y"
 {
         lexPushMode(L_VTODO);
         if (!pushVObject(VCTodoProp)) YYERROR;
-        ;
-    break;}
+        }
+    break;
 case 46:
-#line 369 "./vcc.y"
+#line 367 "vcc.y"
 {
         lexPopMode(0);
         popVObject();
-        ;
-    break;}
+        }
+    break;
 }
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/share/bison.simple"
 
+#line 705 "/usr/share/bison/bison.simple"
+
+
   yyvsp -= yylen;
   yyssp -= yylen;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp -= yylen;
 #endif
 
-#if YYDEBUG != 0
+#if YYDEBUG
   if (yydebug)
     {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-        fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "state stack now");
+      while (yyssp1 != yyssp)
+        YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
     }
 #endif
 
   *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
+#if YYLSP_NEEDED
+  *++yylsp = yyloc;
 #endif
 
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
 
   yyn = yyr1[yyn];
 
   yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
   if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
     yystate = yydefgoto[yyn - YYNTBASE];
 
   goto yynewstate;
 
-yyerrlab:   /* here on detecting error */
 
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
       ++yynerrs;
 
 #ifdef YYERROR_VERBOSE
       yyn = yypact[yystate];
 
       if (yyn > YYFLAG && yyn < YYLAST)
         {
-          int size = 0;
-          char *msg;
-          int x, count;
-
-          count = 0;
-          /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-          for (x = (yyn < 0 ? -yyn : 0);
-               x < (sizeof(yytname) / sizeof(char *)); x++)
-            if (yycheck[x + yyn] == x)
-              size += strlen(yytname[x]) + 15, count++;
-          msg = (char *) malloc(size + 15);
-          if (msg != 0)
+          YYSIZE_T yysize = 0;
+          char *yymsg;
+          int yyx, yycount;
+
+          yycount = 0;
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  */
+          for (yyx = yyn < 0 ? -yyn : 0;
+               yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+            if (yycheck[yyx + yyn] == yyx)
+              yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+          yysize += yystrlen ("parse error, unexpected ") + 1;
+          yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
+          yymsg = (char *) YYSTACK_ALLOC (yysize);
+          if (yymsg != 0)
             {
-              strcpy(msg, "parse error");
+              char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
+              yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
 
-              if (count < 5)
+              if (yycount < 5)
                 {
-                  count = 0;
-                  for (x = (yyn < 0 ? -yyn : 0);
-                       x < (sizeof(yytname) / sizeof(char *)); x++)
-                    if (yycheck[x + yyn] == x)
+                  yycount = 0;
+                  for (yyx = yyn < 0 ? -yyn : 0;
+                       yyx < (int) (sizeof (yytname) / sizeof (char *));
+                       yyx++)
+                    if (yycheck[yyx + yyn] == yyx)
                       {
-                        strcat(msg, count == 0 ? ", expecting `" : " or `");
-                        strcat(msg, yytname[x]);
-                        strcat(msg, "'");
-                        count++;
+                        const char *yyq = ! yycount ? ", expecting " : " or ";
+                        yyp = yystpcpy (yyp, yyq);
+                        yyp = yystpcpy (yyp, yytname[yyx]);
+                        yycount++;
                       }
                 }
-              yyerror(msg);
-              free(msg);
+              yyerror (yymsg);
+              YYSTACK_FREE (yymsg);
             }
           else
-            yyerror ("parse error; also virtual memory exceeded");
+            yyerror ("parse error; also virtual memory exhausted");
         }
       else
-#endif /* YYERROR_VERBOSE */
-        yyerror("parse error");
+#endif /* defined (YYERROR_VERBOSE) */
+        yyerror ("parse error");
     }
-
   goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
 
+
+/*--------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action |
+`--------------------------------------------------*/
+yyerrlab1:
   if (yyerrstatus == 3)
     {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
 
       /* return failure if at end of input */
       if (yychar == YYEOF)
         YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-        fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
+      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
+                  yychar, yytname[yychar1]));
       yychar = YYEMPTY;
     }
 
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
 
           yyerrstatus = 3;      /* Each real token shifted decrements this */
 
   goto yyerrhandle;
 
-yyerrdefault:  /* current state does not do anything special for the error token. */
 
+/*-------------------------------------------------------------------.
+| yyerrdefault -- current state does not do anything special for the |
+| error token.                                                       |
+`-------------------------------------------------------------------*/
+yyerrdefault:
 #if 0
   /* This is wrong; only states that explicitly want error tokens
      should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
+
+  /* If its default is to accept any token, ok.  Otherwise pop it.  */
+  yyn = yydefact[yystate];
+  if (yyn)
+    goto yydefault;
 #endif
 
-yyerrpop:   /* pop the current state because it cannot handle the error token */
 
-  if (yyssp == yyss) YYABORT;
+/*---------------------------------------------------------------.
+| yyerrpop -- pop the current state because it cannot handle the |
+| error token                                                    |
+`---------------------------------------------------------------*/
+yyerrpop:
+  if (yyssp == yyss)
+    YYABORT;
   yyvsp--;
   yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp--;
 #endif
 
-#if YYDEBUG != 0
+#if YYDEBUG
   if (yydebug)
     {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-        fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "Error: state stack now");
+      while (yyssp1 != yyssp)
+        YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
     }
 #endif
 
+/*--------------.
+| yyerrhandle.  |
+`--------------*/
 yyerrhandle:
-
   yyn = yypact[yystate];
   if (yyn == YYFLAG)
     goto yyerrdefault;
 
   yyn += YYTERROR;
   if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
     goto yyerrdefault;
 
   yyn = yytable[yyn];
   if (yyn < 0)
     {
       if (yyn == YYFLAG)
         goto yyerrpop;
       yyn = -yyn;
       goto yyreduce;
     }
   else if (yyn == 0)
     goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
+  YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   *++yylsp = yylloc;
 #endif
 
   yystate = yyn;
   goto yynewstate;
 
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 0;
 
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+/*---------------------------------------------.
+| yyoverflowab -- parser overflow comes here.  |
+`---------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
+  yyresult = 2;
+  /* Fall through.  */
+
+yyreturn:
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
-    }
-  return 1;
+  return yyresult;
 }
-#line 375 "./vcc.y"
+#line 373 "vcc.y"
 
-/****************************************************************************/
 static int pushVObject(const char *prop)
     {
     VObject *newObj;
     if (ObjStackTop == MAXLEVEL)
         return FALSE;
 
     ObjStack[++ObjStackTop] = curObj;
 
     if (curObj) {
         newObj = addProp(curObj,prop);
         curObj = newObj;
         }
     else
         curObj = newVObject(prop);
 
     return TRUE;
     }
 
 
-/****************************************************************************/
 /* This pops the recently built vCard off the stack and returns it. */
 static VObject* popVObject()
     {
     VObject *oldObj;
     if (ObjStackTop < 0) {
         yyerror("pop on empty Object Stack\n");
         return 0;
         }
     oldObj = curObj;
     curObj = ObjStack[ObjStackTop--];
 
     return oldObj;
     }
 
 
-/* static void enterValues(const char *value) */
-/*     { */
-/*     if (fieldedProp && *fieldedProp) { */
-        /* if (value) { */
-        /*     addPropValue(curProp,*fieldedProp,value); */
-        /*     } */
-         /* else this field is empty, advance to next field */ 
-        /* fieldedProp++; */
-        /* } */
-/*     else { */
-        /* if (value) { */
-        /*     setVObjectUStringZValue_(curProp,fakeUnicode(value,0)); */
-        /*     } */
-        /* } */
-/*     deleteStr(value); */
-/*     } */
-
-static void appendValue(const char *value)
-{
-  char *p1, *p2;
-  wchar_t *p3;
-  int i;
-
-  if (fieldedProp && *fieldedProp) {
-    if (value) {
-      addPropValue(curProp, *fieldedProp, value);
+static void enterValues(const char *value)
+    {
+    if (fieldedProp && *fieldedProp) {
+        if (value) {
+            addPropValue(curProp,*fieldedProp,value);
+            }
+        /* else this field is empty, advance to next field */
+        fieldedProp++;
+        }
+    else {
+        if (value) {
+            char *p1, *p2;
+            wchar_t *p3;
+            int i;
+
+            /* If the property already has a string value, we append this one,
+               using ';' to separate the values. */
+            if (vObjectUStringZValue(curProp)) {
+                p1 = fakeCString(vObjectUStringZValue(curProp));
+                p2 = malloc((strlen(p1)+strlen(value)+1));
+                strcpy(p2, p1);
+                deleteStr(p1);
+
+                i = strlen(p2);
+                p2[i] = ';';
+                p2[i+1] = '\0';
+                p2 = strcat(p2, value);
+                p3 = (wchar_t *) vObjectUStringZValue(curProp);
+                free(p3);
+                setVObjectUStringZValue_(curProp,fakeUnicode(p2,0));
+                deleteStr(p2);
+            } else {
+            setVObjectUStringZValue_(curProp,fakeUnicode(value,0));
+            }
+        }
     }
-    /* else this field is empty, advance to next field */
-    fieldedProp++;
-  } else {
-    if (value) {
-      if (vObjectUStringZValue(curProp)) {
-        p1 = fakeCString(vObjectUStringZValue(curProp));
-        p2 = malloc(sizeof(char *) * (strlen(p1)+strlen(value)+1));
-        strcpy(p2, p1);
-        deleteStr(p1);
-
-        i = strlen(p2);
-        p2[i] = ',';
-        p2[i+1] = '\0';
-        p2 = strcat(p2, value);
-        p3 = (wchar_t *) vObjectUStringZValue(curProp);
-        free(p3);
-        setVObjectUStringZValue_(curProp,fakeUnicode(p2,0));
-        deleteStr(p2);
-      } else {
-        setVObjectUStringZValue_(curProp,fakeUnicode(value,0));
-      }
+    deleteStr(value);
     }
-  }
-  deleteStr(value);
-}
-      
 
 static void enterProps(const char *s)
     {
     curProp = addGroup(curObj,s);
     deleteStr(s);
     }
 
 static void enterAttr(const char *s1, const char *s2)
     {
-    const char *p1=0L, *p2=0L;
+    const char *p1, *p2;
     p1 = lookupProp_(s1);
     if (s2) {
         VObject *a;
         p2 = lookupProp_(s2);
         a = addProp(curProp,p1);
         setVObjectStringZValue(a,p2);
         }
     else
         addProp(curProp,p1);
-    if (strcasecmp(p1,VCBase64Prop) == 0 || (s2 && strcasecmp(p2,VCBase64Prop)==0))
+    if (stricmp(p1,VCBase64Prop) == 0 || (s2 && stricmp(p2,VCBase64Prop)==0))
         lexPushMode(L_BASE64);
-    else if (strcasecmp(p1,VCQuotedPrintableProp) == 0
-            || (s2 && strcasecmp(p2,VCQuotedPrintableProp)==0))
+    else if (stricmp(p1,VCQuotedPrintableProp) == 0
+            || (s2 && stricmp(p2,VCQuotedPrintableProp)==0))
         lexPushMode(L_QUOTED_PRINTABLE);
     deleteStr(s1); deleteStr(s2);
     }
 
 
 #define MAX_LEX_LOOKAHEAD_0 32
 #define MAX_LEX_LOOKAHEAD 64
 #define MAX_LEX_MODE_STACK_SIZE 10
 #define LEXMODE() (lexBuf.lexModeStack[lexBuf.lexModeStackTop])
 
 struct LexBuf {
         /* input */
+#ifdef INCLUDEMFC
+    CFile *inputFile;
+#else
     FILE *inputFile;
+#endif
     char *inputString;
     unsigned long curPos;
     unsigned long inputLen;
         /* lookahead buffer */
         /*   -- lookahead buffer is short instead of char so that EOF
          /      can be represented correctly.
         */
     unsigned long len;
     short buf[MAX_LEX_LOOKAHEAD];
     unsigned long getPtr;
         /* context stack */
     unsigned long lexModeStackTop;
     enum LexMode lexModeStack[MAX_LEX_MODE_STACK_SIZE];
         /* token buffer */
     unsigned long maxToken;
     char *strs;
     unsigned long strsLen;
     } lexBuf;
 
 static void lexPushMode(enum LexMode mode)
     {
     if (lexBuf.lexModeStackTop == (MAX_LEX_MODE_STACK_SIZE-1))
         yyerror("lexical context stack overflow");
     else {
         lexBuf.lexModeStack[++lexBuf.lexModeStackTop] = mode;
         }
     }
 
 static void lexPopMode(int top)
     {
     /* special case of pop for ease of error recovery -- this
         version will never underflow */
     if (top)
         lexBuf.lexModeStackTop = 0;
     else
         if (lexBuf.lexModeStackTop > 0) lexBuf.lexModeStackTop--;
     }
 
 static int lexWithinMode(enum LexMode mode) {
     unsigned long i;
     for (i=0;i<lexBuf.lexModeStackTop;i++)
         if (mode == lexBuf.lexModeStack[i]) return 1;
     return 0;
     }
 
-static int lexGetc_()
+static char lexGetc_()
     {
     /* get next char from input, no buffering. */
     if (lexBuf.curPos == lexBuf.inputLen)
         return EOF;
     else if (lexBuf.inputString)
         return *(lexBuf.inputString + lexBuf.curPos++);
     else {
-        if (!feof(lexBuf.inputFile))
-          return fgetc(lexBuf.inputFile);
-        else
-          return EOF;
+#ifdef INCLUDEMFC
+        char result;
+        return lexBuf.inputFile->Read(&result, 1) == 1 ? result : EOF;
+#else
+        return fgetc(lexBuf.inputFile);
+#endif
         }
     }
 
 static int lexGeta()
     {
     ++lexBuf.len;
     return (lexBuf.buf[lexBuf.getPtr] = lexGetc_());
     }
 
 static int lexGeta_(int i)
     {
     ++lexBuf.len;
     return (lexBuf.buf[(lexBuf.getPtr+i)%MAX_LEX_LOOKAHEAD] = lexGetc_());
     }
 
 static void lexSkipLookahead() {
     if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
         /* don't skip EOF. */
         lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
         lexBuf.len--;
         }
     }
 
 static int lexLookahead() {
     int c = (lexBuf.len)?
         lexBuf.buf[lexBuf.getPtr]:
         lexGeta();
     /* do the \r\n -> \n or \r -> \n translation here */
     if (c == '\r') {
         int a = (lexBuf.len>1)?
             lexBuf.buf[(lexBuf.getPtr+1)%MAX_LEX_LOOKAHEAD]:
             lexGeta_(1);
         if (a == '\n') {
             lexSkipLookahead();
             }
         lexBuf.buf[lexBuf.getPtr] = c = '\n';
         }
     else if (c == '\n') {
-        int a;
-        if (lexBuf.len > 1)
-          a = lexBuf.buf[lexBuf.getPtr];
-        else
-          a = lexGeta_(1);
+        int a = (lexBuf.len>1)?
+            lexBuf.buf[lexBuf.getPtr+1]:
+            lexGeta_(1);
         if (a == '\r') {
             lexSkipLookahead();
             }
         lexBuf.buf[lexBuf.getPtr] = '\n';
         }
     return c;
     }
 
 static int lexGetc() {
     int c = lexLookahead();
     if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
         /* EOF will remain in lookahead buffer */
         lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
         lexBuf.len--;
         }
     return c;
     }
 
 static void lexSkipLookaheadWord() {
     if (lexBuf.strsLen <= lexBuf.len) {
         lexBuf.len -= lexBuf.strsLen;
         lexBuf.getPtr = (lexBuf.getPtr + lexBuf.strsLen) % MAX_LEX_LOOKAHEAD;
         }
     }
 
 static void lexClearToken()
     {
     lexBuf.strsLen = 0;
     }
 
 static void lexAppendc(int c)
     {
-    /* not sure if I am doing this right to fix purify report  -- PGB */
-    lexBuf.strs = (char *) realloc(lexBuf.strs, (size_t) lexBuf.strsLen + 1);  
     lexBuf.strs[lexBuf.strsLen] = c;
     /* append up to zero termination */
     if (c == 0) return;
     lexBuf.strsLen++;
     if (lexBuf.strsLen > lexBuf.maxToken) {
         /* double the token string size */
         lexBuf.maxToken <<= 1;
         lexBuf.strs = (char*) realloc(lexBuf.strs,(size_t)lexBuf.maxToken);
         }
     }
 
 static char* lexStr() {
     return dupStr(lexBuf.strs,(size_t)lexBuf.strsLen+1);
     }
 
 static void lexSkipWhite() {
     int c = lexLookahead();
     while (c == ' ' || c == '\t') {
         lexSkipLookahead();
         c = lexLookahead();
         }
     }
 
 static char* lexGetWord() {
     int c;
     lexSkipWhite();
     lexClearToken();
     c = lexLookahead();
-    /* some "words" have a space in them, like "NEEDS ACTION".
-       this may be an oversight of the spec, but it is true nevertheless.
-       while (c != EOF && !strchr("\t\n ;:=",c)) { */
-    while (c != EOF && !strchr("\n;:=",c)) {
+    while (c != EOF && !strchr("\t\n ;:=",c)) {
         lexAppendc(c);
         lexSkipLookahead();
         c = lexLookahead();
         }
     lexAppendc(0);
     return lexStr();
     }
 
-void lexPushLookahead(char *s, int len) {
-    int putptr;
-    if (len == 0) len = strlen(s);
-    putptr = (int)lexBuf.getPtr - len;
-    /* this function assumes that length of word to push back
-     /  is not greater than MAX_LEX_LOOKAHEAD.
-     */
-    if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;
-    lexBuf.getPtr = putptr;
-    while (*s) {
-        lexBuf.buf[putptr] = *s++;
-        putptr = (putptr + 1) % MAX_LEX_LOOKAHEAD;
-        }
-    lexBuf.len += len;
-    }
-
 static void lexPushLookaheadc(int c) {
     int putptr;
     /* can't putback EOF, because it never leaves lookahead buffer */
     if (c == EOF) return;
     putptr = (int)lexBuf.getPtr - 1;
     if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;
     lexBuf.getPtr = putptr;
     lexBuf.buf[putptr] = c;
     lexBuf.len += 1;
     }
 
 static char* lexLookaheadWord() {
     /* this function can lookahead word with max size of MAX_LEX_LOOKAHEAD_0
      /  and thing bigger than that will stop the lookahead and return 0;
      / leading white spaces are not recoverable.
      */
     int c;
     int len = 0;
     int curgetptr = 0;
     lexSkipWhite();
     lexClearToken();
             curgetptr = (int)lexBuf.getPtr;/* remember! */
     while (len < (MAX_LEX_LOOKAHEAD_0)) {
         c = lexGetc();
         len++;
         if (c == EOF || strchr("\t\n ;:=", c)) {
             lexAppendc(0);
             /* restore lookahead buf. */
             lexBuf.len += len;
             lexBuf.getPtr = curgetptr;
             return lexStr();
             }
         else
             lexAppendc(c);
         }
             lexBuf.len += len;/* char that has been moved to lookahead buffer */
     lexBuf.getPtr = curgetptr;
     return 0;
     }
 
 #ifdef _SUPPORT_LINE_FOLDING
 static void handleMoreRFC822LineBreak(int c) {
     /* suport RFC 822 line break in cases like
              *ADR: foo;
      *    morefoo;
      *    more foo;
      */
     if (c == ';') {
         int a;
         lexSkipLookahead();
         /* skip white spaces */
         a = lexLookahead();
         while (a == ' ' || a == '\t') {
             lexSkipLookahead();
             a = lexLookahead();
             }
         if (a == '\n') {
             lexSkipLookahead();
             a = lexLookahead();
             if (a == ' ' || a == '\t') {
                 /* continuation, throw away all the \n and spaces read so
                  * far
                  */
                 lexSkipWhite();
                 lexPushLookaheadc(';');
                 }
             else {
                 lexPushLookaheadc('\n');
                 lexPushLookaheadc(';');
                 }
             }
         else {
             lexPushLookaheadc(';');
             }
         }
     }
 
 static char* lexGet1Value() {
     int c;
     lexSkipWhite();
     c = lexLookahead();
     lexClearToken();
     while (c != EOF && c != ';') {
         if (c == '\n') {
             int a;
             lexSkipLookahead();
             a  = lexLookahead();
             if (a == ' ' || a == '\t') {
                 lexAppendc(' ');
                 lexSkipLookahead();
                 }
             else {
                 lexPushLookaheadc('\n');
                 break;
                 }
             }
         else {
             lexAppendc(c);
             lexSkipLookahead();
             }
         c = lexLookahead();
         }
     lexAppendc(0);
     handleMoreRFC822LineBreak(c);
     return c==EOF?0:lexStr();
     }
 #endif
 
-char* lexGetStrUntil(char *termset) {
-    int c = lexLookahead();
-    lexClearToken();
-    while (c != EOF && !strchr(termset,c)) {
-        lexAppendc(c);
-        lexSkipLookahead();
-        c = lexLookahead();
-        }
-    lexAppendc(0);
-    return c==EOF?0:lexStr();
-    }
 
 static int match_begin_name(int end) {
     char *n = lexLookaheadWord();
     int token = ID;
     if (n) {
-        if (!strcasecmp(n,"vcard")) token = end?END_VCARD:BEGIN_VCARD;
-        else if (!strcasecmp(n,"vcalendar")) token = end?END_VCAL:BEGIN_VCAL;
-        else if (!strcasecmp(n,"vevent")) token = end?END_VEVENT:BEGIN_VEVENT;
-        else if (!strcasecmp(n,"vtodo")) token = end?END_VTODO:BEGIN_VTODO;
+        if (!stricmp(n,"vcard")) token = end?END_VCARD:BEGIN_VCARD;
+        else if (!stricmp(n,"vcalendar")) token = end?END_VCAL:BEGIN_VCAL;
+        else if (!stricmp(n,"vevent")) token = end?END_VEVENT:BEGIN_VEVENT;
+        else if (!stricmp(n,"vtodo")) token = end?END_VTODO:BEGIN_VTODO;
         deleteStr(n);
         return token;
         }
     return 0;
     }
 
 
+#ifdef INCLUDEMFC
+void initLex(const char *inputstring, unsigned long inputlen, CFile *inputfile)
+#else
 void initLex(const char *inputstring, unsigned long inputlen, FILE *inputfile)
+#endif
     {
     /* initialize lex mode stack */
     lexBuf.lexModeStack[lexBuf.lexModeStackTop=0] = L_NORMAL;
 
     /* iniatialize lex buffer. */
     lexBuf.inputString = (char*) inputstring;
     lexBuf.inputLen = inputlen;
     lexBuf.curPos = 0;
     lexBuf.inputFile = inputfile;
 
     lexBuf.len = 0;
     lexBuf.getPtr = 0;
 
     lexBuf.maxToken = MAXTOKEN;
     lexBuf.strs = (char*)malloc(MAXTOKEN);
     lexBuf.strsLen = 0;
 
     }
 
 static void finiLex() {
     free(lexBuf.strs);
     }
 
 
-/****************************************************************************/
 /* This parses and converts the base64 format for binary encoding into
  * a decoded buffer (allocated with new).  See RFC 1521.
  */
 static char * lexGetDataFromBase64()
     {
     unsigned long bytesLen = 0, bytesMax = 0;
     int quadIx = 0, pad = 0;
     unsigned long trip = 0;
     unsigned char b;
     int c;
     unsigned char *bytes = NULL;
     unsigned char *oldBytes = NULL;
 
     DBG_(("db: lexGetDataFromBase64\n"));
     while (1) {
         c = lexGetc();
         if (c == '\n') {
             ++mime_lineNum;
             if (lexLookahead() == '\n') {
                 /* a '\n' character by itself means end of data */
                 break;
                 }
             else continue; /* ignore '\n' */
             }
         else {
             if ((c >= 'A') && (c <= 'Z'))
                 b = (unsigned char)(c - 'A');
             else if ((c >= 'a') && (c <= 'z'))
                 b = (unsigned char)(c - 'a') + 26;
             else if ((c >= '0') && (c <= '9'))
                 b = (unsigned char)(c - '0') + 52;
             else if (c == '+')
                 b = 62;
             else if (c == '/')
                 b = 63;
             else if (c == '=') {
                 b = 0;
                 pad++;
             } else if ((c == ' ') || (c == '\t')) {
                 continue;
             } else { /* error condition */
                 if (bytes) free(bytes);
                 else if (oldBytes) free(oldBytes);
                 /* error recovery: skip until 2 adjacent newlines. */
                 DBG_(("db: invalid character 0x%x '%c'\n", c,c));
                 if (c != EOF)  {
                     c = lexGetc();
                     while (c != EOF) {
                         if (c == '\n' && lexLookahead() == '\n') {
                             ++mime_lineNum;
                             break;
                             }
                         c = lexGetc();
                         }
                     }
                 return NULL;
                 }
             trip = (trip << 6) | b;
             if (++quadIx == 4) {
                 unsigned char outBytes[3];
                 int numOut;
                 int i;
                 for (i = 0; i < 3; i++) {
                     outBytes[2-i] = (unsigned char)(trip & 0xFF);
                     trip >>= 8;
                     }
                 numOut = 3 - pad;
                 if (bytesLen + numOut > bytesMax) {
                     if (!bytes) {
                         bytesMax = 1024;
                         bytes = (unsigned char*)malloc((size_t)bytesMax);
                         }
                     else {
                         bytesMax <<= 2;
                         oldBytes = bytes;
                         bytes = (unsigned char*)realloc(bytes,(size_t)bytesMax);
                         }
                     if (bytes == 0) {
                         mime_error("out of memory while processing BASE64 data\n");
                         }
                     }
                 if (bytes) {
                     memcpy(bytes + bytesLen, outBytes, numOut);
                     bytesLen += numOut;
                     }
                 trip = 0;
                 quadIx = 0;
                 }
             }
         } /* while */
     DBG_(("db: bytesLen = %d\n",  bytesLen));
     /* kludge: all this won't be necessary if we have tree form
         representation */
     if (bytes) {
         setValueWithSize(curProp,bytes,(unsigned int)bytesLen);
         free(bytes);
         }
     else if (oldBytes) {
         setValueWithSize(curProp,oldBytes,(unsigned int)bytesLen);
         free(oldBytes);
         }
     return 0;
     }
 
 static int match_begin_end_name(int end) {
     int token;
     lexSkipWhite();
     if (lexLookahead() != ':') return ID;
     lexSkipLookahead();
     lexSkipWhite();
     token = match_begin_name(end);
     if (token == ID) {
         lexPushLookaheadc(':');
         DBG_(("db: ID '%s'\n", yylval.str));
         return ID;
         }
     else if (token != 0) {
         lexSkipLookaheadWord();
         deleteStr(yylval.str);
         DBG_(("db: begin/end %d\n", token));
         return token;
         }
     return 0;
     }
 
 static char* lexGetQuotedPrintable()
     {
     char cur;
 
     lexClearToken();
     do {
         cur = lexGetc();
         switch (cur) {
             case '=': {
                 int c = 0;
                 int next[2];
                 int i;
                 for (i = 0; i < 2; i++) {
                     next[i] = lexGetc();
                     if (next[i] >= '0' && next[i] <= '9')
                         c = c * 16 + next[i] - '0';
                     else if (next[i] >= 'A' && next[i] <= 'F')
                         c = c * 16 + next[i] - 'A' + 10;
                     else
                         break;
                     }
                 if (i == 0) {
                     /* single '=' follow by LINESEP is continuation sign? */
                     if (next[0] == '\n') {
                         ++mime_lineNum;
                         }
                     else {
                         lexPushLookaheadc('=');
                         goto EndString;
                         }
                     }
                 else if (i == 1) {
                     lexPushLookaheadc(next[1]);
                     lexPushLookaheadc(next[0]);
                     lexAppendc('=');
                 } else {
                     lexAppendc(c);
                     }
                 break;
                 } /* '=' */
             case '\n': {
                 lexPushLookaheadc('\n');
                 goto EndString;
                 }
             case (char)EOF:
                 break;
             default:
                 lexAppendc(cur);
                 break;
             } /* switch */
         } while (cur != (char)EOF);
 
 EndString:
     lexAppendc(0);
     return lexStr();
     } /* LexQuotedPrintable */
 
-static int yylex() {
+int yylex() {
 
     int lexmode = LEXMODE();
     if (lexmode == L_VALUES) {
         int c = lexGetc();
         if (c == ';') {
             DBG_(("db: SEMICOLON\n"));
             lexPushLookaheadc(c);
+#ifdef _SUPPORT_LINE_FOLDING
             handleMoreRFC822LineBreak(c);
+#endif
             lexSkipLookahead();
             return SEMICOLON;
             }
         else if (strchr("\n",c)) {
             ++mime_lineNum;
             /* consume all line separator(s) adjacent to each other */
             c = lexLookahead();
             while (strchr("\n",c)) {
                 lexSkipLookahead();
                 c = lexLookahead();
                 ++mime_lineNum;
                 }
             DBG_(("db: LINESEP\n"));
             return LINESEP;
             }
         else {
             char *p = 0;
             lexPushLookaheadc(c);
             if (lexWithinMode(L_BASE64)) {
                 /* get each char and convert to bin on the fly... */
                 p = lexGetDataFromBase64();
                 yylval.str = p;
                 return STRING;
                 }
             else if (lexWithinMode(L_QUOTED_PRINTABLE)) {
                 p = lexGetQuotedPrintable();
                 }
             else {
 #ifdef _SUPPORT_LINE_FOLDING
                 p = lexGet1Value();
 #else
                 p = lexGetStrUntil(";\n");
 #endif
                 }
             if (p) {
                 DBG_(("db: STRING: '%s'\n", p));
                 yylval.str = p;
                 return STRING;
                 }
             else return 0;
             }
         }
-
     else {
         /* normal mode */
         while (1) {
             int c = lexGetc();
             switch(c) {
                 case ':': {
                     /* consume all line separator(s) adjacent to each other */
                     /* ignoring linesep immediately after colon. */
-                    c = lexLookahead();
+        /*          c = lexLookahead();
                     while (strchr("\n",c)) {
                         lexSkipLookahead();
                         c = lexLookahead();
                         ++mime_lineNum;
-                        }
+                        }*/
                     DBG_(("db: COLON\n"));
                     return COLON;
                     }
                 case ';':
                     DBG_(("db: SEMICOLON\n"));
                     return SEMICOLON;
                 case '=':
                     DBG_(("db: EQ\n"));
                     return EQ;
-                /* ignore tabs/newlines in this mode.  We can't ignore
-                 * spaces, because values like NEEDS ACTION have a space. */
-                case '\t': continue;
+                /* ignore whitespace in this mode */
+                case '\t':
+                case ' ': continue;
                 case '\n': {
                     ++mime_lineNum;
                     continue;
                     }
                 case EOF: return 0;
                     break;
-            default: {
-                     lexPushLookaheadc(c);
-                     /* pending lutz : why linker error with isalpha(c)? */
-                     /*if ( isalpha(c) || c == ' ') { */
-                     if ( ( c >= 'A' && c <= 'Z') || ( c >= 'a' && c <= 'z') || c == ' ') {
-
+                default: {
+                    lexPushLookaheadc(c);
+                    if (isalpha(c)) {
                         char *t = lexGetWord();
                         yylval.str = t;
-                        if (!strcasecmp(t, "begin")) {
+                        if (!stricmp(t, "begin")) {
                             return match_begin_end_name(0);
                             }
-                        else if (!strcasecmp(t,"end")) {
+                        else if (!stricmp(t,"end")) {
                             return match_begin_end_name(1);
                             }
                         else {
                             DBG_(("db: ID '%s'\n", t));
                             return ID;
                             }
                         }
                     else {
-                        /* unknown token */ 
+                        /* unknow token */
                         return 0;
-                              } 
+                        }
                     break;
                     }
                 }
             }
         }
-
     return 0;
     }
 
 
 /***************************************************************************/
-        /***    Public Functions                                        ****/
+        /***                                                    Public Functions                                        ****/
 /***************************************************************************/
 
 static VObject* Parse_MIMEHelper()
     {
     ObjStackTop = -1;
     mime_numErrors = 0;
     mime_lineNum = 1;
     vObjList = 0;
     curObj = 0;
 
     if (yyparse() != 0)
         return 0;
 
     finiLex();
     return vObjList;
     }
 
-/****************************************************************************/
-VObject* Parse_MIME(const char *input, unsigned long len)
+DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len)
     {
     initLex(input, len, 0);
     return Parse_MIMEHelper();
     }
 
 
+#if INCLUDEMFC
+
+DLLEXPORT(VObject*) Parse_MIME_FromFile(CFile *file)
+    {
+    unsigned long startPos;
+    VObject *result;
+
+    initLex(0,-1,file);
+    startPos = file->GetPosition();
+    if (!(result = Parse_MIMEHelper()))
+        file->Seek(startPos, CFile::begin);
+    return result;
+    }
+
+#else
+
 VObject* Parse_MIME_FromFile(FILE *file)
     {
-            VObject *result;
+    VObject *result;
     long startPos;
 
     initLex(0,(unsigned long)-1,file);
     startPos = ftell(file);
     if (!(result = Parse_MIMEHelper())) {
         fseek(file,startPos,SEEK_SET);
         }
     return result;
     }
 
-VObject* Parse_MIME_FromFileName(const char *fname)
+DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
     {
     FILE *fp = fopen(fname,"r");
     if (fp) {
         VObject* o = Parse_MIME_FromFile(fp);
         fclose(fp);
         return o;
         }
     else {
-        char msg[255];
-        sprintf(msg, "can't open file '%s' for reading\n", fname);
+        char msg[256];
+        snprintf(msg, sizeof(msg), "can't open file '%s' for reading\n", fname);
         mime_error_(msg);
         return 0;
         }
     }
 
-/****************************************************************************/
-void YYDebug(const char *s)
-{
-        Parse_Debug(s);
-}
+#endif
 
 
 static MimeErrorHandler mimeErrorHandler;
 
-void registerMimeErrorHandler(MimeErrorHandler me)
+DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler me)
     {
     mimeErrorHandler = me;
     }
 
 static void mime_error(char *s)
     {
     char msg[256];
     if (mimeErrorHandler) {
         sprintf(msg,"%s at line %d", s, mime_lineNum);
         mimeErrorHandler(msg);
         }
     }
 
 static void mime_error_(char *s)
     {
     if (mimeErrorHandler) {
         mimeErrorHandler(s);
         }
     }
 
diff --git a/libkcal/versit/vcc.h b/libkcal/versit/vcc.h
index 03886d1..0e52034 100644
--- a/libkcal/versit/vcc.h
+++ b/libkcal/versit/vcc.h
@@ -1,76 +1,80 @@
 /***************************************************************************
 (C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
 Business Machines Corporation and Siemens Rolm Communications Inc.             
                                                                                
 For purposes of this license notice, the term Licensors shall mean,            
 collectively, Apple Computer, Inc., AT&T Corp., International                  
 Business Machines Corporation and Siemens Rolm Communications Inc.             
 The term Licensor shall mean any of the Licensors.                             
                                                                                
 Subject to acceptance of the following conditions, permission is hereby        
 granted by Licensors without the need for written agreement and without        
 license or royalty fees, to use, copy, modify and distribute this              
 software for any purpose.                                                      
                                                                                
 The above copyright notice and the following four paragraphs must be           
 reproduced in all copies of this software and any software including           
 this software.                                                                 
                                                                                
 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
 ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
 MODIFICATIONS.                                                                 
                                                                                
 IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
 INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
 OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
 DAMAGE.                                                                        
                                                                                
 EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
 INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
 PURPOSE.                                                                       
 
 The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
 disclosure by the government are subject to restrictions set forth in          
 DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
 
 ***************************************************************************/
 
 #ifndef __VCC_H__
 #define __VCC_H__ 1
 
 #include "vobject.h"
 
 
 #if defined(__CPLUSPLUS__) || defined(__cplusplus)
 extern "C" {
 #endif
 
 typedef void (*MimeErrorHandler)(char *);
 
-extern void registerMimeErrorHandler(MimeErrorHandler);
+extern DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler);
 
-extern VObject* Parse_MIME(const char *input, unsigned long len);
-extern VObject* Parse_MIME_FromFileName(const char* fname);
+extern DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len);
+extern DLLEXPORT(VObject*) Parse_MIME_FromFileName(char* fname);
 
 
 /* NOTE regarding Parse_MIME_FromFile
-The function below, Parse_MIME_FromFile, come in two flavors,
+The function above, Parse_MIME_FromFile, comes in two flavors,
 neither of which is exported from the DLL. Each version takes
 a CFile or FILE* as a parameter, neither of which can be
 passed across a DLL interface (at least that is my experience).
 If you are linking this code into your build directly then
 you may find them a more convenient API that the other flavors
 that take a file name. If you use them with the DLL LIB you
 will get a link error.
 */
 
 
+#if INCLUDEMFC
+extern VObject* Parse_MIME_FromFile(CFile *file);
+#else
 extern VObject* Parse_MIME_FromFile(FILE *file);
+#endif
 
 #if defined(__CPLUSPLUS__) || defined(__cplusplus)
 }
 #endif
 
 #endif /* __VCC_H__ */
 
diff --git a/libkcal/versit/vobject.c b/libkcal/versit/vobject.c
index 637efb2..3fac63e 100644
--- a/libkcal/versit/vobject.c
+++ b/libkcal/versit/vobject.c
@@ -1,1433 +1,1454 @@
 /***************************************************************************
 (C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
 Business Machines Corporation and Siemens Rolm Communications Inc.             
                                                                                
 For purposes of this license notice, the term Licensors shall mean,            
 collectively, Apple Computer, Inc., AT&T Corp., International                  
 Business Machines Corporation and Siemens Rolm Communications Inc.             
 The term Licensor shall mean any of the Licensors.                             
                                                                                
 Subject to acceptance of the following conditions, permission is hereby        
 granted by Licensors without the need for written agreement and without        
 license or royalty fees, to use, copy, modify and distribute this              
 software for any purpose.                                                      
                                                                                
 The above copyright notice and the following four paragraphs must be           
 reproduced in all copies of this software and any software including           
 this software.                                                                 
                                                                                
 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
 ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
 MODIFICATIONS.                                                                 
                                                                                
 IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
 INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
 OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
 DAMAGE.                                                                        
                                                                                
 EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
 INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
 PURPOSE.                                                                       
 
 The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
 disclosure by the government are subject to restrictions set forth in          
 DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
 
 ***************************************************************************/
 
 /*
  * src: vobject.c
  * doc: vobject and APIs to construct vobject, APIs pretty print 
  * vobject, and convert a vobject into its textual representation.
  */
 
-#include <stdlib.h>
+#ifdef WIN32
+#define snprintf   _snprintf
+#define strcasecmp stricmp
+#endif
 
 #include "vobject.h"
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#ifdef _WIN32_
+#include <fcntl.h>
 
-  #define strcasecmp _stricmp
 
-#endif
-
-        #define NAME_OF(o)              o->id
+        #define NAME_OF(o)                      o->id
         #define VALUE_TYPE(o)           o->valType
         #define STRINGZ_VALUE_OF(o)     o->val.strs
         #define USTRINGZ_VALUE_OF(o)o->val.ustrs
         #define INTEGER_VALUE_OF(o)     o->val.i
         #define LONG_VALUE_OF(o)        o->val.l
         #define ANY_VALUE_OF(o)                 o->val.any
         #define VOBJECT_VALUE_OF(o)     o->val.vobj
 
+typedef union ValueItem {
+    const char *strs;
+    const wchar_t *ustrs;
+    unsigned int i;
+    unsigned long l;
+    void *any;
+    VObject *vobj;
+    } ValueItem;
+
+struct VObject {
+    VObject *next;
+    const char *id;
+    VObject *prop;
+    unsigned short valType;
+    ValueItem val;
+    };
+
+typedef struct StrItem StrItem;
+
+struct StrItem {
+    StrItem *next;
+    const char *s;
+    unsigned int refCnt;
+    };
+
 const char** fieldedProp;
 
 
 
 /*----------------------------------------------------------------------
    The following functions involve with memory allocation:
         newVObject
         deleteVObject
         dupStr
         deleteStr
         newStrItem
         deleteStrItem
    ----------------------------------------------------------------------*/
 
-VObject* newVObject_(const char *id)
+DLLEXPORT(VObject*) newVObject_(const char *id)
 {
     VObject *p = (VObject*)malloc(sizeof(VObject));
     p->next = 0;
     p->id = id;
     p->prop = 0;
     VALUE_TYPE(p) = 0;
     ANY_VALUE_OF(p) = 0;
     return p;
 }
 
-VObject* newVObject(const char *id)
+DLLEXPORT(VObject*) newVObject(const char *id)
 {
     return newVObject_(lookupStr(id));
 }
 
-void deleteVObject(VObject *p)
+DLLEXPORT(void) deleteVObject(VObject *p)
 {
-  if (p->id)
     unUseStr(p->id);
-  if (p)
     free(p);
-  p = NULL;
 }
 
-char* dupStr(const char *s, unsigned int size)
+DLLEXPORT(char*) dupStr(const char *s, unsigned int size)
 {
     char *t;
     if  (size == 0) {
         size = strlen(s);
         }
     t = (char*)malloc(size+1);
     if (t) {
         memcpy(t,s,size);
         t[size] = 0;
         return t;
         }
     else {
         return (char*)0;
         }
 }
 
-void deleteStr(const char *p)
+DLLEXPORT(void) deleteStr(const char *p)
 {
-    if (p) 
-      free((void*)p);
-    p = NULL;
+    if (p) free((void*)p);
 }
 
 
 static StrItem* newStrItem(const char *s, StrItem *next)
 {
     StrItem *p = (StrItem*)malloc(sizeof(StrItem));
     p->next = next;
     p->s = s;
     p->refCnt = 1;
     return p;
 }
 
 static void deleteStrItem(StrItem *p)
 {
-    if (p)
-      free((void*)p);
-    p = NULL;
+    free((void*)p);
 }
 
 
 /*----------------------------------------------------------------------
   The following function provide accesses to VObject's value.
   ----------------------------------------------------------------------*/
 
-const char* vObjectName(VObject *o)
+DLLEXPORT(const char*) vObjectName(VObject *o)
 {
     return NAME_OF(o);
 }
 
-void setVObjectName(VObject *o, const char* id)
+DLLEXPORT(void) setVObjectName(VObject *o, const char* id)
 {
     NAME_OF(o) = id;
 }
 
-const char* vObjectStringZValue(VObject *o)
+DLLEXPORT(const char*) vObjectStringZValue(VObject *o)
 {
     return STRINGZ_VALUE_OF(o);
 }
 
-void setVObjectStringZValue(VObject *o, const char *s)
+DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s)
 {
     STRINGZ_VALUE_OF(o) = dupStr(s,0);
     VALUE_TYPE(o) = VCVT_STRINGZ;
 }
 
-void setVObjectStringZValue_(VObject *o, const char *s)
+DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s)
 {
     STRINGZ_VALUE_OF(o) = s;
     VALUE_TYPE(o) = VCVT_STRINGZ;
 }
 
-const wchar_t* vObjectUStringZValue(VObject *o)
+DLLEXPORT(const wchar_t*) vObjectUStringZValue(VObject *o)
 {
     return USTRINGZ_VALUE_OF(o);
 }
 
-void setVObjectUStringZValue(VObject *o, const wchar_t *s)
+DLLEXPORT(void) setVObjectUStringZValue(VObject *o, const wchar_t *s)
 {
     USTRINGZ_VALUE_OF(o) = (wchar_t*) dupStr((char*)s,(uStrLen(s)+1)*2);
     VALUE_TYPE(o) = VCVT_USTRINGZ;
 }
 
-void setVObjectUStringZValue_(VObject *o, const wchar_t *s)
+DLLEXPORT(void) setVObjectUStringZValue_(VObject *o, const wchar_t *s)
 {
     USTRINGZ_VALUE_OF(o) = s;
     VALUE_TYPE(o) = VCVT_USTRINGZ;
 }
 
-unsigned int vObjectIntegerValue(VObject *o)
+DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o)
 {
     return INTEGER_VALUE_OF(o);
 }
 
-void setVObjectIntegerValue(VObject *o, unsigned int i)
+DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i)
 {
     INTEGER_VALUE_OF(o) = i;
     VALUE_TYPE(o) = VCVT_UINT;
 }
 
-unsigned long vObjectLongValue(VObject *o)
+DLLEXPORT(unsigned long) vObjectLongValue(VObject *o)
 {
     return LONG_VALUE_OF(o);
 }
 
-void setVObjectLongValue(VObject *o, unsigned long l)
+DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l)
 {
     LONG_VALUE_OF(o) = l;
     VALUE_TYPE(o) = VCVT_ULONG;
 }
 
-void* vObjectAnyValue(VObject *o)
+DLLEXPORT(void*) vObjectAnyValue(VObject *o)
 {
     return ANY_VALUE_OF(o);
 }
 
-void setVObjectAnyValue(VObject *o, void *t)
+DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t)
 {
     ANY_VALUE_OF(o) = t;
     VALUE_TYPE(o) = VCVT_RAW;
 }
 
-VObject* vObjectVObjectValue(VObject *o)
+DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o)
 {
     return VOBJECT_VALUE_OF(o);
 }
 
-void setVObjectVObjectValue(VObject *o, VObject *p)
+DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p)
 {
     VOBJECT_VALUE_OF(o) = p;
     VALUE_TYPE(o) = VCVT_VOBJECT;
 }
 
-int vObjectValueType(VObject *o)
+DLLEXPORT(int) vObjectValueType(VObject *o)
 {
     return VALUE_TYPE(o);
 }
 
 
 /*----------------------------------------------------------------------
   The following functions can be used to build VObject.
   ----------------------------------------------------------------------*/
 
-VObject* addVObjectProp(VObject *o, VObject *p)
+DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p)
 {
     /* circular link list pointed to tail */
     /*
     o {next,id,prop,val}
                 V
         pn {next,id,prop,val}
              V
             ...
         p1 {next,id,prop,val}
              V
              pn
     -->
     o {next,id,prop,val}
                 V
         pn {next,id,prop,val}
              V
         p {next,id,prop,val}
             ...
         p1 {next,id,prop,val}
              V
              pn
     */
 
     VObject *tail = o->prop;
     if (tail) {
         p->next = tail->next;
         o->prop = tail->next = p;
         }
     else {
         o->prop = p->next = p;
         }
     return p;
 }
 
-VObject* addProp(VObject *o, const char *id)
+DLLEXPORT(VObject*) addProp(VObject *o, const char *id)
 {
     return addVObjectProp(o,newVObject(id));
 }
 
-VObject* addProp_(VObject *o, const char *id)
+DLLEXPORT(VObject*) addProp_(VObject *o, const char *id)
 {
     return addVObjectProp(o,newVObject_(id));
 }
 
-void addList(VObject **o, VObject *p)
+DLLEXPORT(void) addList(VObject **o, VObject *p)
 {
     p->next = 0;
     if (*o == 0) {
         *o = p;
         }
     else {
         VObject *t = *o;
         while (t->next) {
            t = t->next;
            }
         t->next = p;
         }
 }
 
-VObject* nextVObjectInList(VObject *o)
+DLLEXPORT(VObject*) nextVObjectInList(VObject *o)
 {
     return o->next;
 }
 
-VObject* setValueWithSize_(VObject *prop, void *val, unsigned int size)
+DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size)
 {
     VObject *sizeProp;
     setVObjectAnyValue(prop, val);
     sizeProp = addProp(prop,VCDataSizeProp);
     setVObjectLongValue(sizeProp, size);
     return prop;
 }
 
-VObject* setValueWithSize(VObject *prop, void *val, unsigned int size)
+DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size)
 {
-    void *p = dupStr(val,size);
+    void *p = dupStr((const char *)val,size);
     return setValueWithSize_(prop,p,p?size:0);
 }
 
-void initPropIterator(VObjectIterator *i, VObject *o)
+DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o)
 {
     i->start = o->prop; 
     i->next = 0;
 }
 
-void initVObjectIterator(VObjectIterator *i, VObject *o)
+DLLEXPORT(void) initVObjectIterator(VObjectIterator *i, VObject *o)
 {
     i->start = o->next; 
     i->next = 0;
 }
 
-int moreIteration(VObjectIterator *i)
+DLLEXPORT(int) moreIteration(VObjectIterator *i)
 { 
     return (i->start && (i->next==0 || i->next!=i->start));
 }
 
-VObject* nextVObject(VObjectIterator *i)
+DLLEXPORT(VObject*) nextVObject(VObjectIterator *i)
 {
     if (i->start && i->next != i->start) {
         if (i->next == 0) {
             i->next = i->start->next;
             return i->next;
             }
         else {
             i->next = i->next->next;
             return i->next;
             }
         }
     else return (VObject*)0;
 }
 
-VObject* isAPropertyOf(VObject *o, const char *id)
+DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id)
 {
     VObjectIterator i;
     initPropIterator(&i,o);
     while (moreIteration(&i)) {
         VObject *each = nextVObject(&i);
-        if (!strcasecmp(id,each->id))
+        if (!stricmp(id,each->id))
             return each;
         }
     return (VObject*)0;
 }
 
-VObject* addGroup(VObject *o, const char *g)
+DLLEXPORT(VObject*) addGroup(VObject *o, const char *g)
 {
     /*
         a.b.c
         -->
         prop(c)
             prop(VCGrouping=b)
                 prop(VCGrouping=a)
      */
     char *dot = strrchr(g,'.');
     if (dot) {
         VObject *p, *t;
         char *gs, *n = dot+1;
                 gs = dupStr(g,0);/* so we can write to it. */
         /* used to be
         * t = p = addProp_(o,lookupProp_(n));
         */
         t = p = addProp_(o,lookupProp(n));
         dot = strrchr(gs,'.');
         *dot = 0;
         do {
             dot = strrchr(gs,'.');
             if (dot) {
                 n = dot+1;
                 *dot=0;
                 }
             else
                 n = gs;
             /* property(VCGroupingProp=n);
                      *and the value may have VCGrouping property
              */
             t = addProp(t,VCGroupingProp);
             setVObjectStringZValue(t,lookupProp_(n));
             } while (n != gs);
                 deleteStr(gs);
         return p;
         }
     else
         return addProp_(o,lookupProp(g));
 }
 
-VObject* addPropValue(VObject *o, const char *p, const char *v)
+DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v)
 {
     VObject *prop;
     prop = addProp(o,p);
     setVObjectUStringZValue_(prop, fakeUnicode(v,0));
     return prop;
 }
 
-VObject* addPropSizedValue_(VObject *o, const char *p, const char *v,
+DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v,
         unsigned int size)
 {
     VObject *prop;
     prop = addProp(o,p);
     setValueWithSize_(prop, (void*)v, size);
     return prop;
 }
 
-VObject* addPropSizedValue(VObject *o, const char *p, const char *v,
+DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v,
         unsigned int size)
 {
     return addPropSizedValue_(o,p,dupStr(v,size),size);
 }
 
 
 
 /*----------------------------------------------------------------------
   The following pretty print a VObject
   ----------------------------------------------------------------------*/
 
 static void printVObject_(FILE *fp, VObject *o, int level);
 
 static void indent(FILE *fp, int level)
 {
     int i;
     for (i=0;i<level*4;i++) {
         fputc(' ', fp);
         }
 }
 
 static void printValue(FILE *fp, VObject *o, int level)
 {
     switch (VALUE_TYPE(o)) {
         case VCVT_USTRINGZ: {
             char c;
             char *t,*s;
             s = t = fakeCString(USTRINGZ_VALUE_OF(o));
             fputc('"',fp);
             while (c=*t,c) {
                 fputc(c,fp);
                 if (c == '\n') indent(fp,level+2);
                 t++;
                 }
             fputc('"',fp);
             deleteStr(s);
             break;
             }
         case VCVT_STRINGZ: {
             char c;
             const char *s = STRINGZ_VALUE_OF(o);
             fputc('"',fp);
             while (c=*s,c) {
                 fputc(c,fp);
                 if (c == '\n') indent(fp,level+2);
                 s++;
                 }
             fputc('"',fp);
             break;
             }
         case VCVT_UINT:
             fprintf(fp,"%d", INTEGER_VALUE_OF(o)); break;
         case VCVT_ULONG:
             fprintf(fp,"%ld", LONG_VALUE_OF(o)); break;
         case VCVT_RAW:
             fprintf(fp,"[raw data]"); break;
         case VCVT_VOBJECT:
             fprintf(fp,"[vobject]\n");
             printVObject_(fp,VOBJECT_VALUE_OF(o),level+1);
             break;
         case 0:
             fprintf(fp,"[none]"); break;
         default:
             fprintf(fp,"[unknown]"); break;
         }
 }
 
 static void printNameValue(FILE *fp,VObject *o, int level)
 {
     indent(fp,level);
     if (NAME_OF(o)) {
         fprintf(fp,"%s", NAME_OF(o));
         }
     if (VALUE_TYPE(o)) {
         fputc('=',fp);
         printValue(fp,o, level);
         }
     fprintf(fp,"\n");
 }
 
 static void printVObject_(FILE *fp, VObject *o, int level)
     {
     VObjectIterator t;
     if (o == 0) {
         fprintf(fp,"[NULL]\n");
         return;
         }
     printNameValue(fp,o,level);
     initPropIterator(&t,o);
     while (moreIteration(&t)) {
         VObject *eachProp = nextVObject(&t);
         printVObject_(fp,eachProp,level+1);
         }
     }
 
 void printVObject(FILE *fp,VObject *o)
 {
     printVObject_(fp,o,0);
 }
 
-void printVObjectToFile(char *fname,VObject *o)
+DLLEXPORT(void) printVObjectToFile(char *fname,VObject *o)
 {
     FILE *fp = fopen(fname,"w");
     if (fp) {
         printVObject(fp,o);
         fclose(fp);
         }
 }
 
-void printVObjectsToFile(char *fname,VObject *list)
+DLLEXPORT(void) printVObjectsToFile(char *fname,VObject *list)
 {
     FILE *fp = fopen(fname,"w");
     if (fp) {
         while (list) {
             printVObject(fp,list);
             list = nextVObjectInList(list);
             }
         fclose(fp);
         }
 }
 
-void cleanVObject(VObject *o)
+DLLEXPORT(void) cleanVObject(VObject *o)
 {
     if (o == 0) return;
     if (o->prop) {
         /* destroy time: cannot use the iterator here.
            Have to break the cycle in the circular link
            list and turns it into regular NULL-terminated
            list -- since at some point of destruction,
            the reference entry for the iterator to work
            will not longer be valid.
            */
         VObject *p;
         p = o->prop->next;
         o->prop->next = 0;
         do {
            VObject *t = p->next;
            cleanVObject(p);
            p = t;
            } while (p);
         }
     switch (VALUE_TYPE(o)) {
         case VCVT_USTRINGZ:
         case VCVT_STRINGZ:
         case VCVT_RAW:
-            /* assume they are all allocated by malloc. */
+                /* assume they are all allocated by malloc. */
             free((char*)STRINGZ_VALUE_OF(o));
             break;
         case VCVT_VOBJECT:
             cleanVObject(VOBJECT_VALUE_OF(o));
             break;
         }
     deleteVObject(o);
 }
 
-void cleanVObjects(VObject *list)
+DLLEXPORT(void) cleanVObjects(VObject *list)
 {
     while (list) {
         VObject *t = list;
         list = nextVObjectInList(list);
         cleanVObject(t);
         }
 }
 
 /*----------------------------------------------------------------------
   The following is a String Table Facilities.
   ----------------------------------------------------------------------*/
 
 #define STRTBLSIZE 255
 
 static StrItem *strTbl[STRTBLSIZE];
 
 static unsigned int hashStr(const char *s)
 {
     unsigned int h = 0;
     int i;
     for (i=0;s[i];i++) {
         h += s[i]*i;
         }
     return h % STRTBLSIZE;
 }
 
-const char* lookupStr(const char *s)
+DLLEXPORT(const char*) lookupStr(const char *s)
 {
-  char *newS;
-
-  StrItem *t;
-  unsigned int h = hashStr(s);
-  if ((t = strTbl[h]) != 0) {
-    do {
-      if (strcasecmp(t->s,s) == 0) {
-        t->refCnt++;
-        return t->s;
-      }
-      t = t->next;
-    } while (t);
-  }
-  newS = dupStr(s,0);
-  strTbl[h] = newStrItem(newS,strTbl[h]);
-  return newS;
+    StrItem *t;
+    unsigned int h = hashStr(s);
+    if ((t = strTbl[h]) != 0) {
+        do {
+            if (stricmp(t->s,s) == 0) {
+                t->refCnt++;
+                return t->s;
+                }
+            t = t->next;
+            } while (t);
+        }
+    s = dupStr(s,0);
+    strTbl[h] = newStrItem(s,strTbl[h]);
+    return s;
 }
 
-void unUseStr(const char *s)
+DLLEXPORT(void) unUseStr(const char *s)
 {
-    StrItem *cur, *prev;
-
+    StrItem *t, *p;
     unsigned int h = hashStr(s);
-    cur = strTbl[h];
-    prev = cur;
-    while (cur != 0) {
-      if (strcasecmp(cur->s,s) == 0) {
-        cur->refCnt--;
-        /* if that was the last reference to this string, kill it. */
-        if (cur->refCnt == 0) {
-          if (cur == strTbl[h]) {
-            strTbl[h] = cur->next;
-            deleteStr(prev->s);
-            deleteStrItem(prev);
-          } else {
-            prev->next = cur->next;
-            deleteStr(cur->s);
-            deleteStrItem(cur);
-          }
-          return;
+    if ((t = strTbl[h]) != 0) {
+        p = t;
+        do {
+            if (stricmp(t->s,s) == 0) {
+                t->refCnt--;
+                if (t->refCnt == 0) {
+                    if (p == strTbl[h]) {
+                        strTbl[h] = t->next;
+                        }
+                    else {
+                        p->next = t->next;
+                        }
+                    deleteStr(t->s);
+                    deleteStrItem(t);
+                    return;
+                    }
+                }
+            p = t;
+            t = t->next;
+            } while (t);
         }
-      }
-      prev = cur;
-      cur = cur->next;
-    }
 }
 
-void cleanStrTbl()
+DLLEXPORT(void) cleanStrTbl()
 {
-  int i;
-  for (i=0; i<STRTBLSIZE;i++) {
-    StrItem *t = strTbl[i];
-    while (t) {
-      StrItem *p;
-      deleteStr(t->s);
-      p = t;
-      t = t->next;
-      deleteStrItem(p);
-    }
-    strTbl[i] = 0;
-  }
+    int i;
+    for (i=0; i<STRTBLSIZE;i++) {
+        StrItem *t = strTbl[i];
+        while (t) {
+            StrItem *p;
+            deleteStr(t->s);
+            p = t;
+            t = t->next;
+            deleteStrItem(p);
+            } while (t);
+        strTbl[i] = 0;
+        }
 }
 
 
 struct PreDefProp {
     const char *name;
     const char *alias;
     const char** fields;
     unsigned int flags;
     };
 
 /* flags in PreDefProp */
         #define PD_BEGIN0x1
         #define PD_INTERNAL0x2
 
 static const char *adrFields[] = {
     VCPostalBoxProp,
     VCExtAddressProp,
     VCStreetAddressProp,
     VCCityProp,
     VCRegionProp,
     VCPostalCodeProp,
     VCCountryNameProp,
     0
 };
 
 static const char *nameFields[] = {
     VCFamilyNameProp,
     VCGivenNameProp,
     VCAdditionalNamesProp,
     VCNamePrefixesProp,
     VCNameSuffixesProp,
     NULL
     };
 
 static const char *orgFields[] = {
     VCOrgNameProp,
     VCOrgUnitProp,
     VCOrgUnit2Prop,
     VCOrgUnit3Prop,
     VCOrgUnit4Prop,
     NULL
     };
 
 static const char *AAlarmFields[] = {
     VCRunTimeProp,
     VCSnoozeTimeProp,
     VCRepeatCountProp,
     VCAudioContentProp,
     0
     };
 
 /* ExDate -- has unamed fields */
 /* RDate -- has unamed fields */
 
 static const char *DAlarmFields[] = {
     VCRunTimeProp,
     VCSnoozeTimeProp,
     VCRepeatCountProp,
     VCDisplayStringProp,
     0
     };
 
 static const char *MAlarmFields[] = {
     VCRunTimeProp,
     VCSnoozeTimeProp,
     VCRepeatCountProp,
     VCEmailAddressProp,
     VCNoteProp,
     0
     };
 
 static const char *PAlarmFields[] = {
     VCRunTimeProp,
     VCSnoozeTimeProp,
     VCRepeatCountProp,
     VCProcedureNameProp,
     0
     };
 
 static struct PreDefProp propNames[] = {
     { VC7bitProp, 0, 0, 0 },
     { VC8bitProp, 0, 0, 0 },
     { VCAAlarmProp, 0, AAlarmFields, 0 },
     { VCAdditionalNamesProp, 0, 0, 0 },
     { VCAdrProp, 0, adrFields, 0 },
     { VCAgentProp, 0, 0, 0 },
     { VCAIFFProp, 0, 0, 0 },
     { VCAOLProp, 0, 0, 0 },
     { VCAppleLinkProp, 0, 0, 0 },
     { VCAttachProp, 0, 0, 0 },
     { VCAttendeeProp, 0, 0, 0 },
     { VCATTMailProp, 0, 0, 0 },
     { VCAudioContentProp, 0, 0, 0 },
     { VCAVIProp, 0, 0, 0 },
     { VCBase64Prop, 0, 0, 0 },
     { VCBBSProp, 0, 0, 0 },
     { VCBirthDateProp, 0, 0, 0 },
     { VCBMPProp, 0, 0, 0 },
     { VCBodyProp, 0, 0, 0 },
     { VCBusinessRoleProp, 0, 0, 0 },
     { VCCalProp, 0, 0, PD_BEGIN },
     { VCCaptionProp, 0, 0, 0 },
     { VCCardProp, 0, 0, PD_BEGIN },
     { VCCarProp, 0, 0, 0 },
     { VCCategoriesProp, 0, 0, 0 },
     { VCCellularProp, 0, 0, 0 },
     { VCCGMProp, 0, 0, 0 },
     { VCCharSetProp, 0, 0, 0 },
     { VCCIDProp, VCContentIDProp, 0, 0 },
     { VCCISProp, 0, 0, 0 },
     { VCCityProp, 0, 0, 0 },
     { VCClassProp, 0, 0, 0 },
     { VCCommentProp, 0, 0, 0 },
     { VCCompletedProp, 0, 0, 0 },
     { VCContentIDProp, 0, 0, 0 },
     { VCCountryNameProp, 0, 0, 0 },
     { VCDAlarmProp, 0, DAlarmFields, 0 },
     { VCDataSizeProp, 0, 0, PD_INTERNAL },
     { VCDayLightProp, 0, 0, 0 },
     { VCDCreatedProp, 0, 0, 0 },
     { VCDeliveryLabelProp, 0, 0, 0 },
     { VCDescriptionProp, 0, 0, 0 },
     { VCDIBProp, 0, 0, 0 },
     { VCDisplayStringProp, 0, 0, 0 },
     { VCDomesticProp, 0, 0, 0 },
     { VCDTendProp, 0, 0, 0 },
     { VCDTstartProp, 0, 0, 0 },
     { VCDueProp, 0, 0, 0 },
     { VCEmailAddressProp, 0, 0, 0 },
     { VCEncodingProp, 0, 0, 0 },
     { VCEndProp, 0, 0, 0 },
     { VCEventProp, 0, 0, PD_BEGIN },
     { VCEWorldProp, 0, 0, 0 },
     { VCExNumProp, 0, 0, 0 },
-    { VCExDateProp, 0, 0, 0 },
+    { VCExpDateProp, 0, 0, 0 },
     { VCExpectProp, 0, 0, 0 },
     { VCExtAddressProp, 0, 0, 0 },
     { VCFamilyNameProp, 0, 0, 0 },
     { VCFaxProp, 0, 0, 0 },
     { VCFullNameProp, 0, 0, 0 },
     { VCGeoLocationProp, 0, 0, 0 },
     { VCGeoProp, 0, 0, 0 },
     { VCGIFProp, 0, 0, 0 },
     { VCGivenNameProp, 0, 0, 0 },
     { VCGroupingProp, 0, 0, 0 },
     { VCHomeProp, 0, 0, 0 },
     { VCIBMMailProp, 0, 0, 0 },
     { VCInlineProp, 0, 0, 0 },
     { VCInternationalProp, 0, 0, 0 },
     { VCInternetProp, 0, 0, 0 },
     { VCISDNProp, 0, 0, 0 },
     { VCJPEGProp, 0, 0, 0 },
     { VCLanguageProp, 0, 0, 0 },
     { VCLastModifiedProp, 0, 0, 0 },
     { VCLastRevisedProp, 0, 0, 0 },
     { VCLocationProp, 0, 0, 0 },
     { VCLogoProp, 0, 0, 0 },
     { VCMailerProp, 0, 0, 0 },
     { VCMAlarmProp, 0, MAlarmFields, 0 },
     { VCMCIMailProp, 0, 0, 0 },
     { VCMessageProp, 0, 0, 0 },
     { VCMETProp, 0, 0, 0 },
     { VCModemProp, 0, 0, 0 },
     { VCMPEG2Prop, 0, 0, 0 },
     { VCMPEGProp, 0, 0, 0 },
     { VCMSNProp, 0, 0, 0 },
     { VCNamePrefixesProp, 0, 0, 0 },
     { VCNameProp, 0, nameFields, 0 },
     { VCNameSuffixesProp, 0, 0, 0 },
     { VCNoteProp, 0, 0, 0 },
     { VCOrgNameProp, 0, 0, 0 },
     { VCOrgProp, 0, orgFields, 0 },
     { VCOrgUnit2Prop, 0, 0, 0 },
     { VCOrgUnit3Prop, 0, 0, 0 },
     { VCOrgUnit4Prop, 0, 0, 0 },
     { VCOrgUnitProp, 0, 0, 0 },
     { VCPagerProp, 0, 0, 0 },
     { VCPAlarmProp, 0, PAlarmFields, 0 },
     { VCParcelProp, 0, 0, 0 },
     { VCPartProp, 0, 0, 0 },
     { VCPCMProp, 0, 0, 0 },
     { VCPDFProp, 0, 0, 0 },
     { VCPGPProp, 0, 0, 0 },
     { VCPhotoProp, 0, 0, 0 },
     { VCPICTProp, 0, 0, 0 },
     { VCPMBProp, 0, 0, 0 },
     { VCPostalBoxProp, 0, 0, 0 },
     { VCPostalCodeProp, 0, 0, 0 },
     { VCPostalProp, 0, 0, 0 },
     { VCPowerShareProp, 0, 0, 0 },
     { VCPreferredProp, 0, 0, 0 },
     { VCPriorityProp, 0, 0, 0 },
     { VCProcedureNameProp, 0, 0, 0 },
     { VCProdIdProp, 0, 0, 0 },
     { VCProdigyProp, 0, 0, 0 },
     { VCPronunciationProp, 0, 0, 0 },
     { VCPSProp, 0, 0, 0 },
     { VCPublicKeyProp, 0, 0, 0 },
     { VCQPProp, VCQuotedPrintableProp, 0, 0 },
     { VCQuickTimeProp, 0, 0, 0 },
     { VCQuotedPrintableProp, 0, 0, 0 },
     { VCRDateProp, 0, 0, 0 },
     { VCRegionProp, 0, 0, 0 },
     { VCRelatedToProp, 0, 0, 0 },
     { VCRepeatCountProp, 0, 0, 0 },
     { VCResourcesProp, 0, 0, 0 },
     { VCRNumProp, 0, 0, 0 },
     { VCRoleProp, 0, 0, 0 },
     { VCRRuleProp, 0, 0, 0 },
     { VCRSVPProp, 0, 0, 0 },
     { VCRunTimeProp, 0, 0, 0 },
     { VCSequenceProp, 0, 0, 0 },
     { VCSnoozeTimeProp, 0, 0, 0 },
     { VCStartProp, 0, 0, 0 },
     { VCStatusProp, 0, 0, 0 },
     { VCStreetAddressProp, 0, 0, 0 },
     { VCSubTypeProp, 0, 0, 0 },
     { VCSummaryProp, 0, 0, 0 },
     { VCTelephoneProp, 0, 0, 0 },
     { VCTIFFProp, 0, 0, 0 },
     { VCTimeZoneProp, 0, 0, 0 },
     { VCTitleProp, 0, 0, 0 },
     { VCTLXProp, 0, 0, 0 },
     { VCTodoProp, 0, 0, PD_BEGIN },
     { VCTranspProp, 0, 0, 0 },
     { VCUniqueStringProp, 0, 0, 0 },
     { VCURLProp, 0, 0, 0 },
     { VCURLValueProp, 0, 0, 0 },
     { VCValueProp, 0, 0, 0 },
     { VCVersionProp, 0, 0, 0 },
     { VCVideoProp, 0, 0, 0 },
     { VCVoiceProp, 0, 0, 0 },
     { VCWAVEProp, 0, 0, 0 },
     { VCWMFProp, 0, 0, 0 },
     { VCWorkProp, 0, 0, 0 },
     { VCX400Prop, 0, 0, 0 },
     { VCX509Prop, 0, 0, 0 },
     { VCXRuleProp, 0, 0, 0 },
     { 0,0,0,0 }
     };
 
 
 static struct PreDefProp* lookupPropInfo(const char* str)
 {
     /* brute force for now, could use a hash table here. */
     int i;
         
     for (i = 0; propNames[i].name; i++)
-        if (strcasecmp(str, propNames[i].name) == 0) {
+        if (stricmp(str, propNames[i].name) == 0) {
             return &propNames[i];
             }
     
     return 0;
 }
 
 
-const char* lookupProp_(const char* str)
+DLLEXPORT(const char*) lookupProp_(const char* str)
 {
     int i;
         
     for (i = 0; propNames[i].name; i++)
-        if (strcasecmp(str, propNames[i].name) == 0) {
+        if (stricmp(str, propNames[i].name) == 0) {
             const char* s;
             s = propNames[i].alias?propNames[i].alias:propNames[i].name;
             return lookupStr(s);
             }
     return lookupStr(str);
 }
 
 
-const char* lookupProp(const char* str)
+DLLEXPORT(const char*) lookupProp(const char* str)
 {
     int i;
         
     for (i = 0; propNames[i].name; i++)
-        if (strcasecmp(str, propNames[i].name) == 0) {
+        if (stricmp(str, propNames[i].name) == 0) {
             const char *s;
             fieldedProp = propNames[i].fields;
             s = propNames[i].alias?propNames[i].alias:propNames[i].name;
             return lookupStr(s);
             }
     fieldedProp = 0;
     return lookupStr(str);
 }
 
 
 /*----------------------------------------------------------------------
   APIs to Output text form.
   ----------------------------------------------------------------------*/
 #define OFILE_REALLOC_SIZE 256
 typedef struct OFile {
     FILE *fp;
     char *s;
     int len;
     int limit;
     int alloc:1;
     int fail:1;
     } OFile;
 
-
-/* vCalendar files need crlf linebreaks. The disabled functions didn't provide
-   that. */
 #if 0
-
 static void appendsOFile(OFile *fp, const char *s)
 {
     int slen;
     if (fp->fail) return;
     slen  = strlen(s);
     if (fp->fp) {
         fwrite(s,1,slen,fp->fp);
         }
     else {
 stuff:
         if (fp->len + slen < fp->limit) {
             memcpy(fp->s+fp->len,s,slen);
             fp->len += slen;
             return;
             }
         else if (fp->alloc) {
             fp->limit = fp->limit + OFILE_REALLOC_SIZE;
             if (OFILE_REALLOC_SIZE <= slen) fp->limit += slen;
-            if (fp->s)
-              fp->s = realloc(fp->s,fp->limit);
-            else
-              fp->s = malloc(fp->limit);
+            fp->s = (char *) realloc(fp->s,fp->limit);
             if (fp->s) goto stuff;
             }
         if (fp->alloc)
             free(fp->s);
         fp->s = 0;
         fp->fail = 1;
         }
 }
 
 static void appendcOFile(OFile *fp, char c)
 {
     if (fp->fail) return;
     if (fp->fp) {
         fputc(c,fp->fp);
         }
     else {
 stuff:
         if (fp->len+1 < fp->limit) {
             fp->s[fp->len] = c;
             fp->len++;
             return;
             }
         else if (fp->alloc) {
             fp->limit = fp->limit + OFILE_REALLOC_SIZE;
-            fp->s = realloc(fp->s,fp->limit);
+            fp->s = (char *) realloc(fp->s,fp->limit);
             if (fp->s) goto stuff;
             }
         if (fp->alloc)
             free(fp->s);
         fp->s = 0;
         fp->fail = 1;
         }
 }
-
 #else
-
 static void appendcOFile_(OFile *fp, char c)
 {
     if (fp->fail) return;
     if (fp->fp) {
         fputc(c,fp->fp);
         }
     else {
 stuff:
         if (fp->len+1 < fp->limit) {
             fp->s[fp->len] = c;
             fp->len++;
             return;
             }
         else if (fp->alloc) {
             fp->limit = fp->limit + OFILE_REALLOC_SIZE;
             fp->s = realloc(fp->s,fp->limit);
             if (fp->s) goto stuff;
             }
         if (fp->alloc)
             free(fp->s);
         fp->s = 0;
         fp->fail = 1;
         }
 }
 
 static void appendcOFile(OFile *fp, char c)
 {
     if (c == '\n') {
         /* write out as <CR><LF> */
         appendcOFile_(fp,0xd);
         appendcOFile_(fp,0xa);
         }
     else
         appendcOFile_(fp,c);
 }
 
 static void appendsOFile(OFile *fp, const char *s)
 {
     int i, slen;
     slen  = strlen(s);
     for (i=0; i<slen; i++) {
         appendcOFile(fp,s[i]);
         }
 }
 
 #endif
 
 static void initOFile(OFile *fp, FILE *ofp)
 {
     fp->fp = ofp;
     fp->s = 0;
     fp->len = 0;
     fp->limit = 0;
     fp->alloc = 0;
     fp->fail = 0;
 }
 
 static void initMemOFile(OFile *fp, char *s, int len)
 {
     fp->fp = 0;
     fp->s = s;
     fp->len = 0;
     fp->limit = s?len:0;
     fp->alloc = s?0:1;
     fp->fail = 0;
 }
 
 
 static int writeBase64(OFile *fp, unsigned char *s, long len)
 {
     long cur = 0;
     int i, numQuads = 0;
     unsigned long trip;
     unsigned char b;
     char quad[5];
 #define MAXQUADS 16
 
     quad[4] = 0;
 
     while (cur < len) {
-        /* collect the triplet of bytes into 'trip' */
+            /* collect the triplet of bytes into 'trip' */
         trip = 0;
         for (i = 0; i < 3; i++) {
             b = (cur < len) ? *(s + cur) : 0;
             cur++;
             trip = trip << 8 | b;
             }
         /* fill in 'quad' with the appropriate four characters */
         for (i = 3; i >= 0; i--) {
             b = (unsigned char)(trip & 0x3F);
             trip = trip >> 6;
             if ((3 - i) < (cur - len))
-                quad[i] = '='; /* pad char */
+                    quad[i] = '='; /* pad char */
             else if (b < 26) quad[i] = (char)b + 'A';
             else if (b < 52) quad[i] = (char)(b - 26) + 'a';
             else if (b < 62) quad[i] = (char)(b - 52) + '0';
             else if (b == 62) quad[i] = '+';
             else quad[i] = '/';
             }
         /* now output 'quad' with appropriate whitespace and line ending */
         appendsOFile(fp, (numQuads == 0 ? "    " : ""));
         appendsOFile(fp, quad);
         appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : "")));
         numQuads = (numQuads + 1) % MAXQUADS;
         }
     appendcOFile(fp,'\n');
 
     return 1;
 }
 
-/* this function really sucks.  Too basic. */
-static void writeQPString(OFile *fp, const char *s, int qp)
+static void writeString(OFile *fp, const char *s)
+{
+    appendsOFile(fp,s);
+}
+
+static void writeQPString(OFile *fp, const char *s)
 {
+    char buf[4];
+    int count=0;
     const char *p = s;
+
     while (*p) {
-      if (*p == '\n') {
-        if (p[1]) appendsOFile(fp,"=0A=");
-      }
-      if (*p == '=' && qp)
-        appendsOFile(fp,"=3D");
-      else
-        appendcOFile(fp,*p);
-      p++;
+        /* break up lines biggger than 75 chars */
+        if(count >=74){
+                count=0;
+                appendsOFile(fp,"=\n");
+        }
+        
+        /* escape any non ASCII characters and '=' as per rfc1521 */
+        if (*p<= 0x1f || *p >=0x7f || *p == '=' ) {
+                sprintf(buf,"=%02X",(unsigned char)*p);
+                appendsOFile(fp,buf); 
+                count+=3; 
+        } else {
+                        appendcOFile(fp,*p);
+                count++; 
+        }
+        p++;
     }
 }
 
+
+
 static void writeVObject_(OFile *fp, VObject *o);
 
-static void writeValue(OFile *fp, VObject *o, unsigned long size)
+static void writeValue(OFile *fp, VObject *o, unsigned long size,int quote)
 {
     if (o == 0) return;
     switch (VALUE_TYPE(o)) {
         case VCVT_USTRINGZ: {
             char *s = fakeCString(USTRINGZ_VALUE_OF(o));
-            if (isAPropertyOf(o, VCQuotedPrintableProp))
-              writeQPString(fp, s, 1);
-            else
-              writeQPString(fp, s, 0);
+            if(quote) writeQPString(fp, s);
+            else writeString(fp,s);
             deleteStr(s);
             break;
             }
         case VCVT_STRINGZ: {
-            if (isAPropertyOf(o, VCQuotedPrintableProp))
-              writeQPString(fp, STRINGZ_VALUE_OF(o), 1);
-            else
-              writeQPString(fp, STRINGZ_VALUE_OF(o), 0);
+            if(quote) writeQPString(fp, STRINGZ_VALUE_OF(o));
+            else writeString(fp,STRINGZ_VALUE_OF(o));
             break;
             }
         case VCVT_UINT: {
             char buf[16];
             sprintf(buf,"%u", INTEGER_VALUE_OF(o));
             appendsOFile(fp,buf);
             break;
             }
         case VCVT_ULONG: {
             char buf[16];
             sprintf(buf,"%lu", LONG_VALUE_OF(o));
             appendsOFile(fp,buf);
             break;
             }
         case VCVT_RAW: {
             appendcOFile(fp,'\n');
             writeBase64(fp,(unsigned char*)(ANY_VALUE_OF(o)),size);
             break;
             }
         case VCVT_VOBJECT:
             appendcOFile(fp,'\n');
             writeVObject_(fp,VOBJECT_VALUE_OF(o));
             break;
         }
 }
 
 static void writeAttrValue(OFile *fp, VObject *o)
 {
     if (NAME_OF(o)) {
         struct PreDefProp *pi;
         pi = lookupPropInfo(NAME_OF(o));
         if (pi && ((pi->flags & PD_INTERNAL) != 0)) return;
         appendcOFile(fp,';');
         appendsOFile(fp,NAME_OF(o));
         }
     else
         appendcOFile(fp,';');
     if (VALUE_TYPE(o)) {
         appendcOFile(fp,'=');
-        writeValue(fp,o,0);
+        writeValue(fp,o,0,0);
         }
 }
 
 static void writeGroup(OFile *fp, VObject *o)
 {
     char buf1[256];
     char buf2[256];
     strcpy(buf1,NAME_OF(o));
     while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) {
-        strncpy(buf2,STRINGZ_VALUE_OF(o),sizeof(buf2));
-        buf2[sizeof(buf2)] = '\0';
-        strncat(buf2,".",sizeof(buf2)-strlen(buf2)-1);
-        strncat(buf2,buf1,sizeof(buf2)-strlen(buf2)-1);
+        strcpy(buf2,STRINGZ_VALUE_OF(o));
+        strcat(buf2,".");
+        strcat(buf2,buf1);
         strcpy(buf1,buf2);
         }
     appendsOFile(fp,buf1);
 }
 
 static int inList(const char **list, const char *s)
 {
     if (list == 0) return 0;
     while (*list) {
-        if (strcasecmp(*list,s) == 0) return 1;
+        if (stricmp(*list,s) == 0) return 1;
         list++;
         }
     return 0;
 }
 
 static void writeProp(OFile *fp, VObject *o)
 {
+    int isQuoted=0;
     if (NAME_OF(o)) {
         struct PreDefProp *pi;
         VObjectIterator t;
         const char **fields_ = 0;
         pi = lookupPropInfo(NAME_OF(o));
         if (pi && ((pi->flags & PD_BEGIN) != 0)) {
             writeVObject_(fp,o);
             return;
             }
         if (isAPropertyOf(o,VCGroupingProp))
             writeGroup(fp,o);
         else
             appendsOFile(fp,NAME_OF(o));
         if (pi) fields_ = pi->fields;
         initPropIterator(&t,o);
         while (moreIteration(&t)) {
             const char *s;
             VObject *eachProp = nextVObject(&t);
             s = NAME_OF(eachProp);
-            if (strcasecmp(VCGroupingProp,s) && !inList(fields_,s))
+            if (stricmp(VCGroupingProp,s) && !inList(fields_,s))
                 writeAttrValue(fp,eachProp);
+            if (stricmp(VCQPProp,s)==0 || stricmp(VCQuotedPrintableProp,s)==0)
+                 isQuoted=1;
             }
         if (fields_) {
             int i = 0, n = 0;
             const char** fields = fields_;
             /* output prop as fields */
             appendcOFile(fp,':');
             while (*fields) {
-                VObject *tl = isAPropertyOf(o,*fields);
+                VObject *t = isAPropertyOf(o,*fields);
                 i++;
-                if (tl) n = i;
+                if (t) n = i;
                 fields++;
                 }
             fields = fields_;
             for (i=0;i<n;i++) {
-                writeValue(fp,isAPropertyOf(o,*fields),0);
+                writeValue(fp,isAPropertyOf(o,*fields),0,isQuoted);
                 fields++;
                 if (i<(n-1)) appendcOFile(fp,';');
                 }
             }
         }
         
     if (VALUE_TYPE(o)) {
         unsigned long size = 0;
         VObject *p = isAPropertyOf(o,VCDataSizeProp);
         if (p) size = LONG_VALUE_OF(p);
         appendcOFile(fp,':');
-        writeValue(fp,o,size);
+        writeValue(fp,o,size,isQuoted);
         }
 
     appendcOFile(fp,'\n');
 }
 
 static void writeVObject_(OFile *fp, VObject *o)
 {
     if (NAME_OF(o)) {
         struct PreDefProp *pi;
         pi = lookupPropInfo(NAME_OF(o));
 
         if (pi && ((pi->flags & PD_BEGIN) != 0)) {
             VObjectIterator t;
             const char *begin = NAME_OF(o);
             appendsOFile(fp,"BEGIN:");
             appendsOFile(fp,begin);
             appendcOFile(fp,'\n');
             initPropIterator(&t,o);
             while (moreIteration(&t)) {
                 VObject *eachProp = nextVObject(&t);
                 writeProp(fp, eachProp);
                 }
             appendsOFile(fp,"END:");
             appendsOFile(fp,begin);
             appendsOFile(fp,"\n\n");
             }
         }
 }
 
 void writeVObject(FILE *fp, VObject *o)
 {
     OFile ofp;
     initOFile(&ofp,fp);
     writeVObject_(&ofp,o);
 }
 
-void writeVObjectToFile(char *fname, VObject *o)
+DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o)
 {
     FILE *fp = fopen(fname,"w");
     if (fp) {
         writeVObject(fp,o);
         fclose(fp);
         }
 }
 
-void writeVObjectsToFile(char *fname, VObject *list)
+DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list)
 {
     FILE *fp = fopen(fname,"w");
     if (fp) {
         while (list) {
             writeVObject(fp,list);
             list = nextVObjectInList(list);
             }
         fclose(fp);
         }
 }
 
-char* writeMemVObject(char *s, int *len, VObject *o)
+DLLEXPORT(char*) writeMemVObject(char *s, int *len, VObject *o)
 {
     OFile ofp;
     initMemOFile(&ofp,s,len?*len:0);
     writeVObject_(&ofp,o);
     if (len) *len = ofp.len;
     appendcOFile(&ofp,0);
     return ofp.s;
 }
 
-char* writeMemVObjects(char *s, int *len, VObject *list)
+DLLEXPORT(char*) writeMemVObjects(char *s, int *len, VObject *list)
 {
     OFile ofp;
     initMemOFile(&ofp,s,len?*len:0);
     while (list) {
         writeVObject_(&ofp,list);
         list = nextVObjectInList(list);
         }
     if (len) *len = ofp.len;
     appendcOFile(&ofp,0);
     return ofp.s;
 }
 
 /*----------------------------------------------------------------------
   APIs to do fake Unicode stuff.
   ----------------------------------------------------------------------*/
-wchar_t* fakeUnicode(const char *ps, int *bytes)
+DLLEXPORT(wchar_t*) fakeUnicode(const char *ps, int *bytes)
 {
     wchar_t *r, *pw;
     int len = strlen(ps)+1;
 
     pw = r = (wchar_t*)malloc(sizeof(wchar_t)*len);
     if (bytes)
         *bytes = len * sizeof(wchar_t);
 
     while (*ps) { 
         if (*ps == '\n')
             *pw = (wchar_t)0x2028;
         else if (*ps == '\r')
             *pw = (wchar_t)0x2029;
         else
             *pw = (wchar_t)(unsigned char)*ps;
         ps++; pw++;
                 }                        
     *pw = (wchar_t)0;
         
     return r;
 }
 
-int uStrLen(const wchar_t *u)
+DLLEXPORT(int) uStrLen(const wchar_t *u)
 {
     int i = 0;
     while (*u != (wchar_t)0) { u++; i++; }
     return i;
 }
 
-char* fakeCString(const wchar_t *u)
+DLLEXPORT(char*) fakeCString(const wchar_t *u)
 {
     char *s, *t;
     int len = uStrLen(u) + 1;
-    t = s = (char*)malloc(len+1);
+    t = s = (char*)malloc(len);
     while (*u) {
         if (*u == (wchar_t)0x2028)
             *t = '\n';
         else if (*u == (wchar_t)0x2029)
             *t = '\r';
         else
             *t = (char)*u;
         u++; t++;
         }
     *t = 0;
     return s;
 }
 
 /* end of source file vobject.c */
diff --git a/libkcal/versit/vobject.h b/libkcal/versit/vobject.h
index 0ec8b31..85c299e 100644
--- a/libkcal/versit/vobject.h
+++ b/libkcal/versit/vobject.h
@@ -1,384 +1,369 @@
 /***************************************************************************
 (C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
 Business Machines Corporation and Siemens Rolm Communications Inc.             
                                                                                
 For purposes of this license notice, the term Licensors shall mean,            
 collectively, Apple Computer, Inc., AT&T Corp., International                  
 Business Machines Corporation and Siemens Rolm Communications Inc.             
 The term Licensor shall mean any of the Licensors.                             
                                                                                
 Subject to acceptance of the following conditions, permission is hereby        
 granted by Licensors without the need for written agreement and without        
 license or royalty fees, to use, copy, modify and distribute this              
 software for any purpose.                                                      
                                                                                
 The above copyright notice and the following four paragraphs must be           
 reproduced in all copies of this software and any software including           
 this software.                                                                 
                                                                                
 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
 ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
 MODIFICATIONS.                                                                 
                                                                                
 IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
 INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
 OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
 DAMAGE.                                                                        
                                                                                
 EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
 INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
 PURPOSE.                                                                       
 
 The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
 disclosure by the government are subject to restrictions set forth in          
 DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
 
 ***************************************************************************/
 
 /*
  
 The vCard/vCalendar C interface is implemented in the set 
 of files as follows:
 
 vcc.y, yacc source, and vcc.c, the yacc output you will use
 implements the core parser
 
 vobject.c implements an API that insulates the caller from
 the parser and changes in the vCard/vCalendar BNF
 
 port.h defines compilation environment dependent stuff
 
 vcc.h and vobject.h are header files for their .c counterparts
 
 vcaltmp.h and vcaltmp.c implement vCalendar "macro" functions
 which you may find useful.
 
 test.c is a standalone test driver that exercises some of
 the features of the APIs provided. Invoke test.exe on a
 VCARD/VCALENDAR input text file and you will see the pretty
 print output of the internal representation (this pretty print
 output should give you a good idea of how the internal 
 representation looks like -- there is one such output in the 
 following too). Also, a file with the .out suffix is generated 
 to show that the internal representation can be written back 
 in the original text format.
 
 For more information on this API see the readme.txt file
 which accompanied this distribution.
 
   Also visit:
 
                 http://www.versit.com
                 http://www.ralden.com
 
 */
 
 
 #ifndef __VOBJECT_H__
 #define __VOBJECT_H__ 1
 
 
 #include "port.h"
 #include <stdlib.h>
 #include <stdio.h>
 
 #if defined(__CPLUSPLUS__) || defined(__cplusplus)
 extern "C" {
 #endif
 
 
         #define VC7bitProp                      "7BIT"
         #define VC8bitProp                      "8BIT"
         #define VCAAlarmProp            "AALARM"
         #define VCAdditionalNamesProp"ADDN"
         #define VCAdrProp                       "ADR"
         #define VCAgentProp                     "AGENT"
         #define VCAIFFProp                      "AIFF"
         #define VCAOLProp                       "AOL"
         #define VCAppleLinkProp                 "APPLELINK"
         #define VCAttachProp            "ATTACH"
         #define VCAttendeeProp          "ATTENDEE"
         #define VCATTMailProp           "ATTMAIL"
         #define VCAudioContentProp      "AUDIOCONTENT"
         #define VCAVIProp                       "AVI"
         #define VCBase64Prop            "BASE64"
         #define VCBBSProp                       "BBS"
         #define VCBirthDateProp                 "BDAY"
         #define VCBMPProp                       "BMP"
         #define VCBodyProp                      "BODY"
         #define VCBusinessRoleProp      "ROLE"
         #define VCCalProp                       "VCALENDAR"
         #define VCCaptionProp           "CAP"
         #define VCCardProp                      "VCARD"
         #define VCCarProp                       "CAR"
         #define VCCategoriesProp        "CATEGORIES"
         #define VCCellularProp          "CELL"
         #define VCCGMProp                       "CGM"
         #define VCCharSetProp           "CS"
         #define VCCIDProp                       "CID"
         #define VCCISProp                       "CIS"
         #define VCCityProp                      "L"
         #define VCClassProp                     "CLASS"
         #define VCCommentProp           "NOTE"
         #define VCCompletedProp                 "COMPLETED"
         #define VCContentIDProp                 "CONTENT-ID"
         #define VCCountryNameProp       "C"
         #define VCDAlarmProp            "DALARM"
         #define VCDataSizeProp          "DATASIZE"
         #define VCDayLightProp          "DAYLIGHT"
         #define VCDCreatedProp          "DCREATED"
 #define VCDeliveryLabelProp     "LABEL"
         #define VCDescriptionProp       "DESCRIPTION"
         #define VCDIBProp                       "DIB"
         #define VCDisplayStringProp     "DISPLAYSTRING"
         #define VCDomesticProp          "DOM"
         #define VCDTendProp                     "DTEND"
         #define VCDTstartProp           "DTSTART"
         #define VCDueProp                       "DUE"
         #define VCEmailAddressProp      "EMAIL"
         #define VCEncodingProp          "ENCODING"
         #define VCEndProp                       "END"
         #define VCEventProp                     "VEVENT"
         #define VCEWorldProp            "EWORLD"
         #define VCExNumProp                     "EXNUM"
-        #define VCExDateProp            "EXDATE"
+        #define VCExpDateProp           "EXDATE"
         #define VCExpectProp            "EXPECT"
         #define VCExtAddressProp        "EXT ADD"
         #define VCFamilyNameProp        "F"
         #define VCFaxProp                       "FAX"
         #define VCFullNameProp          "FN"
         #define VCGeoProp                       "GEO"
         #define VCGeoLocationProp       "GEO"
         #define VCGIFProp                       "GIF"
         #define VCGivenNameProp                 "G"
         #define VCGroupingProp          "Grouping"
         #define VCHomeProp                      "HOME"
         #define VCIBMMailProp           "IBMMail"
         #define VCInlineProp            "INLINE"
         #define VCInternationalProp     "INTL"
         #define VCInternetProp          "INTERNET"
         #define VCISDNProp                      "ISDN"
         #define VCJPEGProp                      "JPEG"
         #define VCLanguageProp          "LANG"
         #define VCLastModifiedProp      "LAST-MODIFIED"
         #define VCLastRevisedProp       "REV"
         #define VCLocationProp          "LOCATION"
         #define VCLogoProp                      "LOGO"
         #define VCMailerProp            "MAILER"
         #define VCMAlarmProp            "MALARM"
         #define VCMCIMailProp           "MCIMAIL"
         #define VCMessageProp           "MSG"
         #define VCMETProp                       "MET"
         #define VCModemProp                     "MODEM"
         #define VCMPEG2Prop                     "MPEG2"
         #define VCMPEGProp                      "MPEG"
         #define VCMSNProp                       "MSN"
         #define VCNamePrefixesProp      "NPRE"
         #define VCNameProp                      "N"
         #define VCNameSuffixesProp      "NSUF"
         #define VCNoteProp                      "NOTE"
         #define VCOrgNameProp           "ORGNAME"
         #define VCOrgProp                       "ORG"
         #define VCOrgUnit2Prop          "OUN2"
         #define VCOrgUnit3Prop          "OUN3"
         #define VCOrgUnit4Prop          "OUN4"
         #define VCOrgUnitProp           "OUN"
         #define VCPagerProp                     "PAGER"
         #define VCPAlarmProp            "PALARM"
         #define VCParcelProp            "PARCEL"
         #define VCPartProp                      "PART"
         #define VCPCMProp                       "PCM"
         #define VCPDFProp                       "PDF"
         #define VCPGPProp                       "PGP"
         #define VCPhotoProp                     "PHOTO"
         #define VCPICTProp                      "PICT"
         #define VCPMBProp                       "PMB"
         #define VCPostalBoxProp                 "BOX"
         #define VCPostalCodeProp        "PC"
         #define VCPostalProp            "POSTAL"
         #define VCPowerShareProp        "POWERSHARE"
         #define VCPreferredProp                 "PREF"
         #define VCPriorityProp          "PRIORITY"
         #define VCProcedureNameProp     "PROCEDURENAME"
         #define VCProdIdProp            "PRODID"
         #define VCProdigyProp           "PRODIGY"
         #define VCPronunciationProp     "SOUND"
         #define VCPSProp                        "PS"
         #define VCPublicKeyProp                 "KEY"
         #define VCQPProp                        "QP"
         #define VCQuickTimeProp                 "QTIME"
         #define VCQuotedPrintableProp"QUOTED-PRINTABLE"
         #define VCRDateProp                     "RDATE"
         #define VCRegionProp            "R"
         #define VCRelatedToProp                 "RELATED-TO"
         #define VCRepeatCountProp       "REPEATCOUNT"
         #define VCResourcesProp                 "RESOURCES"
         #define VCRNumProp                      "RNUM"
         #define VCRoleProp                      "ROLE"
         #define VCRRuleProp                     "RRULE"
         #define VCRSVPProp                      "RSVP"
         #define VCRunTimeProp           "RUNTIME"
         #define VCSequenceProp          "SEQUENCE"
         #define VCSnoozeTimeProp        "SNOOZETIME"
         #define VCStartProp                     "START"
         #define VCStatusProp            "STATUS"
         #define VCStreetAddressProp     "STREET"
         #define VCSubTypeProp           "SUBTYPE"
         #define VCSummaryProp           "SUMMARY"
         #define VCTelephoneProp                 "TEL"
         #define VCTIFFProp                      "TIFF"
         #define VCTimeZoneProp          "TZ"
         #define VCTitleProp                     "TITLE"
         #define VCTLXProp                       "TLX"
         #define VCTodoProp                      "VTODO"
         #define VCTranspProp            "TRANSP"
         #define VCUniqueStringProp      "UID"
         #define VCURLProp                       "URL"
         #define VCURLValueProp          "URLVAL"
         #define VCValueProp                     "VALUE"
         #define VCVersionProp           "VERSION"
         #define VCVideoProp                     "VIDEO"
         #define VCVoiceProp                     "VOICE"
         #define VCWAVEProp                      "WAVE"
         #define VCWMFProp                       "WMF"
         #define VCWorkProp                      "WORK"
         #define VCX400Prop                      "X400"
         #define VCX509Prop                      "X509"
         #define VCXRuleProp                     "XRULE"
 
-/* extensions for KOrganizer / KPilot */
-#define KPilotIdProp                            "X-PILOTID"
-#define KPilotStatusProp                        "X-PILOTSTAT"
+/* Extensions */
 
+#define XPilotIdProp                            "X-PILOTID"
+#define XPilotStatusProp                        "X-PILOTSTAT"
 /* extensions for iMIP / iTIP */
 #define ICOrganizerProp                         "X-ORGANIZER"
 #define ICMethodProp                            "X-METHOD"
 #define ICRequestStatusProp                     "X-REQUEST-STATUS"
-
 typedef struct VObject VObject;
 
-typedef union ValueItem {
-    const char *strs;
-    const wchar_t *ustrs;
-    unsigned int i;
-    unsigned long l;
-    void *any;
-    VObject *vobj;
-    } ValueItem;
-
-struct VObject {
-    VObject *next;
-    const char *id;
-    VObject *prop;
-    unsigned short valType;
-    ValueItem val;
-    };
-
-typedef struct StrItem StrItem;
-
-struct StrItem {
-    StrItem *next;
-    const char *s;
-    unsigned int refCnt;
-    };
-
 typedef struct VObjectIterator {
     VObject* start;
     VObject* next;
     } VObjectIterator;
 
-extern VObject* newVObject(const char *id);
-extern void deleteVObject(VObject *p);
-extern char* dupStr(const char *s, unsigned int size);
-extern void deleteStr(const char *p);
-extern void unUseStr(const char *s);
-
-extern void setVObjectName(VObject *o, const char* id);
-extern void setVObjectStringZValue(VObject *o, const char *s);
-extern void setVObjectStringZValue_(VObject *o, const char *s);
-extern void setVObjectUStringZValue(VObject *o, const wchar_t *s);
-extern void setVObjectUStringZValue_(VObject *o, const wchar_t *s);
-extern void setVObjectIntegerValue(VObject *o, unsigned int i);
-extern void setVObjectLongValue(VObject *o, unsigned long l);
-extern void setVObjectAnyValue(VObject *o, void *t);
-extern VObject* setValueWithSize(VObject *prop, void *val, unsigned int size);
-extern VObject* setValueWithSize_(VObject *prop, void *val, unsigned int size);
-
-extern const char* vObjectName(VObject *o);
-extern const char* vObjectStringZValue(VObject *o);
-extern const wchar_t* vObjectUStringZValue(VObject *o);
-extern unsigned int vObjectIntegerValue(VObject *o);
-extern unsigned long vObjectLongValue(VObject *o);
-extern void* vObjectAnyValue(VObject *o);
-extern VObject* vObjectVObjectValue(VObject *o);
-extern void setVObjectVObjectValue(VObject *o, VObject *p);
-
-extern VObject* addVObjectProp(VObject *o, VObject *p);
-extern VObject* addProp(VObject *o, const char *id);
-extern VObject* addProp_(VObject *o, const char *id);
-extern VObject* addPropValue(VObject *o, const char *p, const char *v);
-extern VObject* addPropSizedValue_(VObject *o, const char *p, const char *v, unsigned int size);
-extern VObject* addPropSizedValue(VObject *o, const char *p, const char *v, unsigned int size);
-extern VObject* addGroup(VObject *o, const char *g);
-extern void addList(VObject **o, VObject *p);
-
-extern VObject* isAPropertyOf(VObject *o, const char *id);
-
-extern VObject* nextVObjectInList(VObject *o);
-extern void initPropIterator(VObjectIterator *i, VObject *o);
-extern int moreIteration(VObjectIterator *i);
-extern VObject* nextVObject(VObjectIterator *i);
-
-extern char* writeMemVObject(char *s, int *len, VObject *o);
-extern char* writeMemVObjects(char *s, int *len, VObject *list);
-
-extern const char* lookupStr(const char *s);
-extern void cleanStrTbl();
-
-extern void cleanVObject(VObject *o);
-extern void cleanVObjects(VObject *list);
-
-extern const char* lookupProp(const char* str);
-extern const char* lookupProp_(const char* str);
-
-extern wchar_t* fakeUnicode(const char *ps, int *bytes);
-extern int uStrLen(const wchar_t *u);
-extern char* fakeCString(const wchar_t *u);
-
-extern void printVObjectToFile(char *fname,VObject *o);
-extern void printVObjectsToFile(char *fname,VObject *list);
-extern void writeVObjectToFile(char *fname, VObject *o);
-extern void writeVObjectsToFile(char *fname, VObject *list);
-
-extern int vObjectValueType(VObject *o);
+extern DLLEXPORT(VObject*) newVObject(const char *id);
+extern DLLEXPORT(void) deleteVObject(VObject *p);
+extern DLLEXPORT(char*) dupStr(const char *s, unsigned int size);
+extern DLLEXPORT(void) deleteStr(const char *p);
+extern DLLEXPORT(void) unUseStr(const char *s);
+
+extern DLLEXPORT(void) setVObjectName(VObject *o, const char* id);
+extern DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s);
+extern DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s);
+extern DLLEXPORT(void) setVObjectUStringZValue(VObject *o, const wchar_t *s);
+extern DLLEXPORT(void) setVObjectUStringZValue_(VObject *o, const wchar_t *s);
+extern DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i);
+extern DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l);
+extern DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t);
+extern DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size);
+extern DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size);
+
+extern DLLEXPORT(const char*) vObjectName(VObject *o);
+extern DLLEXPORT(const char*) vObjectStringZValue(VObject *o);
+extern DLLEXPORT(const wchar_t*) vObjectUStringZValue(VObject *o);
+extern DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o);
+extern DLLEXPORT(unsigned long) vObjectLongValue(VObject *o);
+extern DLLEXPORT(void*) vObjectAnyValue(VObject *o);
+extern DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o);
+extern DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p);
+
+extern DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p);
+extern DLLEXPORT(VObject*) addProp(VObject *o, const char *id);
+extern DLLEXPORT(VObject*) addProp_(VObject *o, const char *id);
+extern DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v);
+extern DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v, unsigned int size);
+extern DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v, unsigned int size);
+extern DLLEXPORT(VObject*) addGroup(VObject *o, const char *g);
+extern DLLEXPORT(void) addList(VObject **o, VObject *p);
+
+extern DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id);
+
+extern DLLEXPORT(VObject*) nextVObjectInList(VObject *o);
+extern DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o);
+extern DLLEXPORT(int) moreIteration(VObjectIterator *i);
+extern DLLEXPORT(VObject*) nextVObject(VObjectIterator *i);
+
+extern DLLEXPORT(char*) writeMemVObject(char *s, int *len, VObject *o);
+extern DLLEXPORT(char*) writeMemVObjects(char *s, int *len, VObject *list);
+
+extern DLLEXPORT(const char*) lookupStr(const char *s);
+extern DLLEXPORT(void) cleanStrTbl();
+
+extern DLLEXPORT(void) cleanVObject(VObject *o);
+extern DLLEXPORT(void) cleanVObjects(VObject *list);
+
+extern DLLEXPORT(const char*) lookupProp(const char* str);
+extern DLLEXPORT(const char*) lookupProp_(const char* str);
+
+extern DLLEXPORT(wchar_t*) fakeUnicode(const char *ps, int *bytes);
+extern DLLEXPORT(int) uStrLen(const wchar_t *u);
+extern DLLEXPORT(char*) fakeCString(const wchar_t *u);
+
+extern DLLEXPORT(void) printVObjectToFile(char *fname,VObject *o);
+extern DLLEXPORT(void) printVObjectsToFile(char *fname,VObject *list);
+extern DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o);
+extern DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list);
+
+extern DLLEXPORT(int) vObjectValueType(VObject *o);
 
 /* return type of vObjectValueType: */
         #define VCVT_NOVALUE0
         /* if the VObject has no value associated with it. */
         #define VCVT_STRINGZ1
         /* if the VObject has value set by setVObjectStringZValue. */
         #define VCVT_USTRINGZ2
         /* if the VObject has value set by setVObjectUStringZValue. */
         #define VCVT_UINT       3
         /* if the VObject has value set by setVObjectIntegerValue. */
         #define VCVT_ULONG      4
         /* if the VObject has value set by setVObjectLongValue. */
         #define VCVT_RAW        5
         /* if the VObject has value set by setVObjectAnyValue. */
         #define VCVT_VOBJECT6
         /* if the VObject has value set by setVObjectVObjectValue. */
 
 extern const char** fieldedProp;
 
+/* NOTE regarding printVObject and writeVObject
+
+The functions below are not exported from the DLL because they
+take a FILE* as a parameter, which cannot be passed across a DLL 
+interface (at least that is my experience). Instead you can use
+their companion functions which take file names or pointers
+to memory. However, if you are linking this code into 
+your build directly then you may find them a more convenient API
+and you can go ahead and use them. If you try to use them with 
+the DLL LIB you will get a link error.
+*/
 extern void printVObject(FILE *fp,VObject *o);
 extern void writeVObject(FILE *fp, VObject *o);
 
 
 #if defined(__CPLUSPLUS__) || defined(__cplusplus)
 }
 #endif
 
 #endif /* __VOBJECT_H__ */