Platform MacOS-X: Disable backtrce in odebug..

Libopie PIM: Finishing SQL-Backend for Todo. Recurrance events are supported now.
What is still missing: Custom entries currently not stored. It isn't easy to
implement them with enabled prefetch-cache.
LibopieDB2: Adding -lsqlite here instead linking it to libopie

10 files changed, 306 insertions, 88 deletions

diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index bf6b78f..94434ae 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -1,132 +1,132 @@
 TEMPLATE        = lib
 CONFIG          += qte warn_on release
 HEADERS   = ofontmenu.h \
     ocolorbutton.h \
     ofiledialog.h ofileselector.h \
     ofileselector_p.h \
     ocheckitem.h  \
     xmltree.h \
     colordialog.h colorpopupmenu.h \
     oclickablelabel.h oprocctrl.h \
     oprocess.h odevice.h odevicebutton.h \
     otimepicker.h otabwidget.h \
     otabbar.h otabinfo.h \
     ofontselector.h \
     pim/opimrecord.h \
     pim/otodo.h \
     pim/orecordlist.h \
     pim/opimaccesstemplate.h \
     pim/opimaccessbackend.h \
     pim/otodoaccess.h \
     pim/otodoaccessbackend.h \
     pim/oconversion.h \
     pim/ocontact.h \
     pim/ocontactfields.h \
     pim/ocontactaccess.h \
     pim/ocontactaccessbackend.h \
     pim/ocontactaccessbackend_xml.h \
     pim/ocontactaccessbackend_vcard.h \
     pim/obackendfactory.h \
     pim/opimcache.h \ 
     pim/otodoaccessvcal.h \
     pim/orecur.h \
     pim/opimstate.h \
     pim/opimxrefpartner.h \
     pim/opimxref.h \
     pim/opimxrefmanager.h \
     pim/opimmaintainer.h \
     pim/opimnotify.h \
     pim/opimnotifymanager.h \
     pim/opimmainwindow.h \
     pim/opimresolver.h \
     pim/oevent.h \
     pim/otimezone.h \
     pim/odatebookaccess.h \
     pim/odatebookaccessbackend.h \
     pim/odatebookaccessbackend_xml.h \
     orecurrancewidget.h \
     oticker.h owait.h
 
 SOURCES   = ofontmenu.cc  \
         ocolorbutton.cpp \
         sharp_compat.cpp \
       xmltree.cc \
       ofiledialog.cc ofileselector.cpp \
             ocheckitem.cpp  \
       colordialog.cpp \
       colorpopupmenu.cpp oclickablelabel.cpp \
       oprocctrl.cpp oprocess.cpp \
       odevice.cpp odevicebutton.cpp otimepicker.cpp \
        otabwidget.cpp otabbar.cpp \
              ofontselector.cpp \
              pim/otodo.cpp \
              pim/opimrecord.cpp \
        pim/otodoaccess.cpp \
        pim/otodoaccessbackend.cpp \
              pim/otodoaccessxml.cpp \
              pim/oconversion.cpp \
              pim/ocontact.cpp \
              pim/ocontactfields.cpp \
              pim/ocontactaccess.cpp \
              pim/ocontactaccessbackend_vcard.cpp \
              pim/ocontactaccessbackend_xml.cpp \
        pim/otodoaccessvcal.cpp \
        pim/orecur.cpp \
        pim/opimstate.cpp \
        pim/opimxrefpartner.cpp \
        pim/opimxref.cpp \
        pim/opimxrefmanager.cpp \
        pim/opimmaintainer.cpp \
        pim/opimnotify.cpp \
        pim/opimnotifymanager.cpp \
        pim/opimmainwindow.cpp \
        pim/opimresolver.cpp \
        pim/oevent.cpp \
        pim/otimezone.cpp \
        pim/odatebookaccess.cpp \
        pim/odatebookaccessbackend.cpp \
        pim/odatebookaccessbackend_xml.cpp \
        orecurrancewidget.cpp \
        oticker.cpp owait.cpp 
 
 TARGET    = opie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 
 LIBS += -lqpe
 
 # Add SQL-Support if selected by config (eilers) 
 CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
 contains( CONFTEST, y ){
 
 DEFINES += __USE_SQL
-LIBS    += -lopiedb2 -lsqlite
+LIBS    += -lopiedb2
 HEADERS += pim/otodoaccesssql.h pim/ocontactaccessbackend_sql.h
 SOURCES += pim/otodoaccesssql.cpp pim/ocontactaccessbackend_sql.cpp
 
 }
 
 INTERFACES      = otimepickerbase.ui orecurrancebase.ui
 TARGET          = opie
 
 TRANSLATIONS = ../i18n/de/libopie.ts \
 	 ../i18n/nl/libopie.ts \
 	 ../i18n/xx/libopie.ts \
    ../i18n/en/libopie.ts \
    ../i18n/es/libopie.ts \
    ../i18n/fr/libopie.ts \
    ../i18n/hu/libopie.ts \
    ../i18n/ja/libopie.ts \
    ../i18n/ko/libopie.ts \
    ../i18n/no/libopie.ts \
    ../i18n/pl/libopie.ts \
    ../i18n/pt/libopie.ts \
    ../i18n/pt_BR/libopie.ts \
    ../i18n/sl/libopie.ts \
    ../i18n/zh_CN/libopie.ts \
    ../i18n/zh_TW/libopie.ts \
    ../i18n/da/libopie.ts
 
 include ( big-screen/big-screen.pro )
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/libopie/pim/orecur.cpp b/libopie/pim/orecur.cpp
index eae1fdc..8c9ad46 100644
--- a/libopie/pim/orecur.cpp
+++ b/libopie/pim/orecur.cpp
@@ -203,308 +203,383 @@ bool ORecur::p_nextOccurrence( const QDate& from, QDate& next ) {
 		if (imonth > 12) {
 		    imonth--;
 		    iyear += imonth / 12;
 		    imonth = imonth % 12;
 		    imonth++;
 		}
 		tmpDate = QDate( iyear, imonth, 1 );
 		/* these loops could go for a while, check end case now */
 		if ((tmpDate > endDate()) && hasEndDate() )
 		    return FALSE;
 		iday = 1;
 		iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7;
 		iday += 7 * weekOfMonth;
 	    }
 	    tmpDate = QDate(iyear, imonth, iday);
 
 	    if (tmpDate >= from) {
 		next = tmpDate;
 		if ((next > endDate() ) && hasEndDate() )
 		    return FALSE;
 		return TRUE;
 	    }
 
 	    /* need to find the next iteration */
 	    do {
 		imonth += freq;
 		if (imonth > 12) {
 		    imonth--;
 		    iyear += imonth / 12;
 		    imonth = imonth % 12;
 		    imonth++;
 		}
 		tmpDate = QDate( iyear, imonth, 1 );
 		/* these loops could go for a while, check end case now */
 		if ((tmpDate > endDate()) && hasEndDate() )
 		    return FALSE;
 		iday = 1;
 		iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7;
 		iday += 7 * weekOfMonth;
 	    } while (iday > tmpDate.daysInMonth());
 	    tmpDate = QDate(iyear, imonth, iday);
 
 	    next = tmpDate;
 	    if ((next > endDate()) && hasEndDate() )
 		return FALSE;
 	    return TRUE;
 	case MonthlyDate:
 	    iday = start().day();
 	    iyear = from.year();
 	    imonth = from.month();
 
 	    a = from.year() - start().year();
 	    a *= 12;
 	    a = a + (imonth - start().month());
 	    /* a is e.start()monthsFrom(from); */
 	    if(a % freq) {
 		a = freq - (a % freq);
 		imonth = from.month() + a;
 		if (imonth > 12) {
 		    imonth--;
 		    iyear += imonth / 12;
 		    imonth = imonth % 12;
 		    imonth++;
 		}
 	    }
 	    /* imonth is now the first month after or on
 	       from that matches the frequencey given */
 
 	    /* this could go for a while, worse case, 4*12 iterations, probably */
 	    while(!QDate::isValid(iyear, imonth, iday) ) {
 		imonth += freq;
 		if (imonth > 12) {
 		    imonth--;
 		    iyear += imonth / 12;
 		    imonth = imonth % 12;
 		    imonth++;
 		}
 		/* these loops could go for a while, check end case now */
 		if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() )
 		    return FALSE;
 	    }
 
 	    if(QDate(iyear, imonth, iday) >= from) {
 		/* done */
 		next = QDate(iyear, imonth, iday);
 		if ((next > endDate()) && hasEndDate() )
 		    return FALSE;
 		return TRUE;
 	    }
 
 	    /* ok, need to cycle */
 	    imonth += freq;
 	    imonth--;
 	    iyear += imonth / 12;
 	    imonth = imonth % 12;
 	    imonth++;
 
 	    while(!QDate::isValid(iyear, imonth, iday) ) {
 		imonth += freq;
 		imonth--;
 		iyear += imonth / 12;
 		imonth = imonth % 12;
 		imonth++;
 		if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() )
 		    return FALSE;
 	    }
 
 	    next = QDate(iyear, imonth, iday);
 	    if ((next > endDate()) && hasEndDate() )
 		return FALSE;
 	    return TRUE;
 	case Yearly:
 	    iday = start().day();
 	    imonth = start().month();
 	    iyear = from.year(); // after all, we want to start in this year
 
 	    diff = 1;
 	    if(imonth == 2 && iday > 28) {
 		/* leap year, and it counts, calculate actual frequency */
 		if(freq % 4)
 		    if (freq % 2)
 			freq = freq * 4;
 		    else
 			freq = freq * 2;
 		/* else divides by 4 already, leave freq alone */
 		diff = 4;
 	    }
 
 	    a = from.year() - start().year();
 	    if(a % freq) {
 		a = freq - (a % freq);
 		iyear = iyear + a;
 	    }
 
 	    /* under the assumption we won't hit one of the special not-leap years twice */
 	    if(!QDate::isValid(iyear, imonth, iday)) {
 		/* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */
 		iyear += freq;
 	    }
 
 	    if(QDate(iyear, imonth, iday) >= from) {
 		next = QDate(iyear, imonth, iday);
 
 		if ((next > endDate()) && hasEndDate() )
 		    return FALSE;
 		return TRUE;
 	    }
 	    /* iyear == from.year(), need to advance again */
 	    iyear += freq;
 	    /* under the assumption we won't hit one of the special not-leap years twice */
 	    if(!QDate::isValid(iyear, imonth, iday)) {
 		/* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */
 		iyear += freq;
 	    }
 
 	    next = QDate(iyear, imonth, iday);
 	    if ((next > endDate()) && hasEndDate() )
 		return FALSE;
 	    return TRUE;
 	default:
 	    return FALSE;
     }
 }
 ORecur::RepeatType ORecur::type()const{
     return data->type;
 }
 int ORecur::frequency()const {
     return data->freq;
 }
 int ORecur::position()const {
     return data->pos;
 }
 char ORecur::days() const{
     return data->days;
 }
 bool ORecur::hasEndDate()const {
     return data->hasEnd;
 }
 QDate ORecur::endDate()const {
     return data->end;
 }
 QDate ORecur::start()const{
     return data->start;
 }
 QDateTime ORecur::createdDateTime()const {
     return data->create;
 }
 int ORecur::repetition()const {
     return data->rep;
 }
 QString ORecur::service()const {
     return data->app;
 }
 ORecur::ExceptionList& ORecur::exceptions() {
     return data->list;
 }
 void ORecur::setType( const RepeatType& z) {
     checkOrModify();
     data->type = z;
 }
 void ORecur::setFrequency( int freq ) {
     checkOrModify();
     data->freq = freq;
 }
 void ORecur::setPosition( int pos ) {
     checkOrModify();
     data->pos = pos;
 }
 void ORecur::setDays( char c ) {
     checkOrModify();
     data->days = c;
 }
 void ORecur::setEndDate( const QDate& dt) {
     checkOrModify();
     data->end = dt;
 }
 void ORecur::setCreatedDateTime( const QDateTime& t) {
     checkOrModify();
     data->create = t;
 }
 void ORecur::setHasEndDate( bool b) {
     checkOrModify();
     data->hasEnd = b;
 }
 void ORecur::setRepitition( int rep ) {
     checkOrModify();
     data->rep = rep;
 }
 void ORecur::setService( const QString& app ) {
     checkOrModify();
     data->app = app;
 }
 void ORecur::setStart( const QDate& dt ) {
     checkOrModify();
     data->start = dt;
 }
 void ORecur::checkOrModify() {
     if ( data->count !=  1 ) {
         data->deref();
         Data* d2 = new Data;
         d2->days = data->days;
         d2->type = data->type;
         d2->freq = data->freq;
         d2->pos  = data->pos;
         d2->hasEnd = data->hasEnd;
         d2->end  = data->end;
         d2->create = data->create;
         d2->rep = data->rep;
         d2->app = data->app;
         d2->list = data->list;
         d2->start = data->start;
         data = d2;
     }
 }
 QString ORecur::toString()const {
     QString buf;
+    QMap<int, QString> recMap = toMap();
 
     buf += " rtype=\"";
-    switch ( data->type ) {
-    case ORecur::Daily:
-        buf += "Daily";
-        break;
-    case ORecur::Weekly:
-        buf += "Weekly";
-        break;
-    case ORecur::MonthlyDay:
-        buf += "MonthlyDay";
-        break;
-    case ORecur::MonthlyDate:
-        buf += "MonthlyDate";
-        break;
-    case ORecur::Yearly:
-        buf += "Yearly";
-        break;
-    default:
-        buf += "NoRepeat";
-        break;
-    }
+    buf += recMap[ORecur::RType];
     buf += "\"";
     if (data->days > 0 )
-	buf += " rweekdays=\"" + QString::number( static_cast<int>( data->days ) ) + "\"";
+	buf += " rweekdays=\"" + recMap[ORecur::RWeekdays] + "\"";
     if ( data->pos != 0 )
-	buf += " rposition=\"" + QString::number(data->pos ) + "\"";
+	buf += " rposition=\"" + recMap[ORecur::RPosition] + "\"";
 
-    buf += " rfreq=\"" + QString::number( data->freq ) + "\"";
-    buf += " rhasenddate=\"" + QString::number( static_cast<int>( data->hasEnd ) ) + "\"";
+    buf += " rfreq=\"" + recMap[ORecur::RFreq] + "\"";
+    buf += " rhasenddate=\"" + recMap[ORecur::RHasEndDate]+ "\"";
     if ( data->hasEnd )
 	buf += " enddt=\""
-	       + QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) )
+	       + recMap[ORecur::EndDate]
 	       + "\"";
-    buf += " created=\"" + QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) + "\"";
+    buf += " created=\"" + recMap[ORecur::Created] + "\"";
 
     if ( data->list.isEmpty() ) return buf;
-    // save exceptions list here!!
-    ExceptionList::ConstIterator it;
-    ExceptionList list = data->list;
     buf += " exceptions=\"";
-    QDate date;
-    for ( it = list.begin(); it != list.end(); ++it ) {
-        date = (*it);
-        if ( it != list.begin() ) buf += " ";
-
-        buf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() );
-    }
+    buf += recMap[ORecur::Exceptions];
     buf += "\" ";
 
     return buf;
 }
+
+QString ORecur::rTypeString() const
+{
+	QString retString;
+	switch ( data->type ) {
+	case ORecur::Daily:
+		retString = "Daily";
+		break;
+	case ORecur::Weekly:
+		retString = "Weekly";
+		break;
+	case ORecur::MonthlyDay:
+		retString = "MonthlyDay";
+		break;
+	case ORecur::MonthlyDate:
+		retString = "MonthlyDate";
+		break;
+	case ORecur::Yearly:
+		retString = "Yearly";
+		break;
+	default:
+		retString = "NoRepeat";
+		break;
+
+	}
+
+	return retString;
+}
+
+QMap<QString, ORecur::RepeatType> ORecur::rTypeValueConvertMap() const
+{
+	QMap<QString, RepeatType> convertMap;
+
+	convertMap.insert( QString( "Daily" ), ORecur::Daily );
+	convertMap.insert( QString( "Weekly" ), ORecur::Weekly );
+	convertMap.insert( QString( "MonthlyDay" ), ORecur::MonthlyDay );
+	convertMap.insert( QString( "MonthlyDate" ), ORecur::MonthlyDate );
+	convertMap.insert( QString( "Yearly" ), ORecur::Yearly );
+	convertMap.insert( QString( "NoRepeat" ), ORecur::NoRepeat );
+
+	return convertMap;
+}
+
+
+QMap<int, QString> ORecur::toMap() const
+{
+	QMap<int, QString> retMap;
+	
+	retMap.insert( ORecur::RType, rTypeString() );
+	retMap.insert( ORecur::RWeekdays, QString::number( static_cast<int>( data->days ) ) );
+	retMap.insert( ORecur::RPosition, QString::number(data->pos ) );
+	retMap.insert( ORecur::RFreq, QString::number( data->freq ) );
+	retMap.insert( ORecur::RHasEndDate, QString::number( static_cast<int>( data->hasEnd ) ) );
+	if( data -> hasEnd )
+		retMap.insert( ORecur::EndDate, QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) );
+	retMap.insert( ORecur::Created, QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) );
+	
+	if ( data->list.isEmpty() ) return retMap;
+
+	// save exceptions list here!!
+	ExceptionList::ConstIterator it;
+	ExceptionList list = data->list;
+	QString exceptBuf;
+	QDate date;
+	for ( it = list.begin(); it != list.end(); ++it ) {
+		date = (*it);
+		if ( it != list.begin() ) exceptBuf += " ";
+		
+		exceptBuf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() );
+	}
+
+	retMap.insert( ORecur::Exceptions, exceptBuf );
+
+	return retMap;
+}
+
+void ORecur::fromMap( const QMap<int, QString>& map )
+{
+	QMap<QString, RepeatType> repTypeMap = rTypeValueConvertMap(); 
+
+	data -> type  = repTypeMap[ map [ORecur::RType] ];
+	data -> days  = (char) map[ ORecur::RWeekdays ].toInt();
+	data -> pos   = map[ ORecur::RPosition ].toInt();
+	data -> freq = map[ ORecur::RFreq ].toInt();
+	data -> hasEnd= map[ ORecur::RHasEndDate ].toInt() ? true : false;
+	OTimeZone utc = OTimeZone::utc();
+	if ( data -> hasEnd ){
+		data -> end = utc.fromUTCDateTime( (time_t) map[ ORecur::EndDate ].toLong() ).date();
+	}
+	data -> create = utc.fromUTCDateTime( (time_t) map[ ORecur::Created ].toLong() ).date();
+
+#if 0
+	// FIXME: Exceptions currently not supported...
+	// Convert the list of exceptions from QString into ExceptionList
+	data -> list.clear();
+	QString exceptStr = map[ ORecur::Exceptions ];
+	QStringList exceptList = QStringList::split( " ", exceptStr );
+	...
+#endif
+	
+	
+}
diff --git a/libopie/pim/orecur.h b/libopie/pim/orecur.h
index b214b3f..47901b0 100644
--- a/libopie/pim/orecur.h
+++ b/libopie/pim/orecur.h
@@ -1,91 +1,101 @@
 /*
  * GPL from TT
  */
 
 #ifndef OPIE_RECUR_H
 #define OPIE_RECUR_H
 
 #include <sys/types.h>
 
 #include <qdatetime.h>
 #include <qvaluelist.h>
-
+#include <qmap.h>
 
 class ORecur {
 public:
     typedef QValueList<QDate> ExceptionList;
     enum RepeatType{ NoRepeat = -1, Daily, Weekly, MonthlyDay,
                      MonthlyDate, Yearly };
     enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08,
                 FRI = 0x10, SAT = 0x20, SUN = 0x40 };
+    enum Fields{ RType = 0, RWeekdays, RPosition, RFreq, RHasEndDate, 
+		 EndDate, Created, Exceptions };
+
     ORecur();
     ORecur( const ORecur& );
     ~ORecur();
 
     ORecur &operator=( const ORecur& );
     bool operator==(const ORecur& )const;
 
     bool doesRecur()const;
     /* if it recurrs on that day */
     bool doesRecur( const QDate& );
     RepeatType type()const;
     int frequency()const;
     int position()const;
     char days()const;
     bool hasEndDate()const;
     QDate start()const;
     QDate endDate()const;
     QDateTime createdDateTime()const;
     /**
      * starting on monday=0, sunday=6
      * for convience
      */
     bool repeatOnWeekDay( int day )const;
 
     /**
      * FromWhereToStart is not included!!!
      */
     bool nextOcurrence( const QDate& FromWhereToStart, QDate &recurDate );
 
     /**
      * The module this ORecur belongs to
      */
     QString service()const;
 
     /*
      * reference to the exception list
      */
     ExceptionList &exceptions();
 
     /**
      * the current repetition
      */
     int repetition()const;
 
     void setType( const RepeatType& );
     void setFrequency( int freq );
     void setPosition( int pos );
     void setDays( char c);
     void setEndDate( const QDate& dt );
     void setStart( const QDate& dt );
     void setCreatedDateTime( const QDateTime& );
     void setHasEndDate( bool b );
     void setRepitition(int );
 
     void setService( const QString& ser );
+    
+    QMap<int, QString> toMap() const;
+    void fromMap( const QMap<int, QString>& map );
 
     /* almost internal */
     QString toString()const;
 private:
     bool p_nextOccurrence( const QDate& from, QDate& next );
     void deref();
     inline void checkOrModify();
 
+    /* Converts rType to String */
+    QString rTypeString() const;
+    /* Returns a map to convert Stringname for RType to RepeatType */
+    QMap<QString, RepeatType> rTypeValueConvertMap() const;
 
     class Data;
     Data* data;
     class ORecurPrivate;
     ORecurPrivate *d;
 };
 
 #endif
diff --git a/libopie/pim/otodoaccesssql.cpp b/libopie/pim/otodoaccesssql.cpp
index ebd03bb..3913661 100644
--- a/libopie/pim/otodoaccesssql.cpp
+++ b/libopie/pim/otodoaccesssql.cpp
@@ -1,667 +1,690 @@
 
 #include <qdatetime.h>
 
 #include <qpe/global.h>
 
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
 #include "otodoaccesssql.h"
 #include "opimstate.h"
 #include "opimnotifymanager.h"
 #include "orecur.h"
 
 /*
  * first some query
  * CREATE query
  * LOAD query
  * INSERT
  * REMOVE
  * CLEAR
  */
 namespace {
     /**
      * CreateQuery for the Todolist Table
      */
     class CreateQuery : public OSQLQuery {
     public:
         CreateQuery();
         ~CreateQuery();
         QString query()const;
     };
 
     /**
      * LoadQuery
      * this one queries for all uids
      */
     class LoadQuery : public OSQLQuery {
     public:
         LoadQuery();
         ~LoadQuery();
         QString query()const;
     };
 
     /**
      * inserts/adds a OTodo to the table
      */
     class InsertQuery : public OSQLQuery {
     public:
         InsertQuery(const OTodo& );
         ~InsertQuery();
         QString query()const;
     private:
         OTodo m_todo;
     };
 
     /**
      * removes one from the table
      */
     class RemoveQuery : public OSQLQuery {
     public:
         RemoveQuery(int uid );
         ~RemoveQuery();
         QString query()const;
     private:
         int m_uid;
     };
 
     /**
      * Clears (delete) a Table
      */
     class ClearQuery : public OSQLQuery {
     public:
         ClearQuery();
         ~ClearQuery();
         QString query()const;
 
     };
 
     /**
      * a find query
      */
     class FindQuery : public OSQLQuery {
     public:
         FindQuery(int uid);
         FindQuery(const QArray<int>& );
         ~FindQuery();
         QString query()const;
     private:
         QString single()const;
         QString multi()const;
         QArray<int> m_uids;
         int m_uid;
     };
 
     /**
      * overdue query
      */
     class OverDueQuery : public OSQLQuery {
     public:
         OverDueQuery();
         ~OverDueQuery();
         QString query()const;
     };
     class EffQuery : public OSQLQuery {
     public:
         EffQuery( const QDate&, const QDate&, bool inc );
         ~EffQuery();
         QString query()const;
     private:
         QString with()const;
         QString out()const;
         QDate m_start;
         QDate m_end;
         bool m_inc :1;
     };
 
 
     CreateQuery::CreateQuery() : OSQLQuery() {}
     CreateQuery::~CreateQuery() {}
     QString CreateQuery::query()const {
         QString qu;
         qu += "create table todolist( uid PRIMARY KEY, categories, completed, ";
         qu += "description, summary, priority, DueDate, progress ,  state, ";
-	qu += "Recurrence, reminders, alarms, maintainer, startdate, completeddate);";
+	// This is the recurrance-stuff .. Exceptions are currently not supported (see ORecur.cpp) ! (eilers)
+	qu += "RType, RWeekdays, RPosition, RFreq, RHasEndDate, EndDate, Created, Exceptions, "; 
+	qu += "reminders, alarms, maintainer, startdate, completeddate);";
 	qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
         return qu;
     }
 
     LoadQuery::LoadQuery() : OSQLQuery() {}
     LoadQuery::~LoadQuery() {}
     QString LoadQuery::query()const {
         QString qu;
 	// We do not need "distinct" here. The primary key is always unique..
         //qu += "select distinct uid from todolist";
         qu += "select uid from todolist";
 
         return qu;
     }
 
     InsertQuery::InsertQuery( const OTodo& todo )
         : OSQLQuery(), m_todo( todo ) {
     }
     InsertQuery::~InsertQuery() {
     }
     /*
      * converts from a OTodo to a query
      * we leave out X-Ref + Alarms
      */
     QString InsertQuery::query()const{
 
         int year, month, day;
         year = month = day = 0;
         if (m_todo.hasDueDate() ) {
             QDate date = m_todo.dueDate();
             year = date.year();
             month = date.month();
             day = date.day();
 	}
 	int sYear = 0, sMonth = 0, sDay = 0;
 	if( m_todo.hasStartDate() ){
 		QDate sDate = m_todo.startDate();
 		sYear = sDate.year();
 		sMonth= sDate.month();
 		sDay  = sDate.day();
 	} 
 
 	int eYear = 0, eMonth = 0, eDay = 0;
 	if( m_todo.hasCompletedDate() ){
 		QDate eDate = m_todo.completedDate();
 		eYear = eDate.year();
 		eMonth= eDate.month();
 		eDay  = eDate.day();
 	} 
         QString qu;
+	QMap<int, QString> recMap = m_todo.recurrence().toMap();
         qu  = "insert into todolist VALUES(" 
 		+  QString::number( m_todo.uid() ) + "," 
 		+ "'" + m_todo.idsToString( m_todo.categories() ) + "'" + ","
 		+       QString::number( m_todo.isCompleted() )         + ","  
 		+ "'" + m_todo.description()                      + "'" + ","
 		+ "'" + m_todo.summary()                          + "'" + "," 
 		+       QString::number(m_todo.priority() )             + ","
 		+ "'" + QString::number(year) + "-" 
 		+       QString::number(month)
 		+       "-" + QString::number( day )              + "'" + ","
 		+       QString::number( m_todo.progress() )            + ","
  		+       QString::number( m_todo.state().state() )       + ","
-		+ "'" + m_todo.recurrence().toString()            + "'"+ ",";
+		+ "'" + recMap[ ORecur::RType ]                   + "'" + ","
+		+ "'" + recMap[ ORecur::RWeekdays ]               + "'" + ","
+		+ "'" + recMap[ ORecur::RPosition ]               + "'" + ","
+		+ "'" + recMap[ ORecur::RFreq ]                   + "'" + ","
+		+ "'" + recMap[ ORecur::RHasEndDate ]             + "'" + ","
+		+ "'" + recMap[ ORecur::EndDate ]                 + "'" + ","
+		+ "'" + recMap[ ORecur::Created ]                 + "'" + ","
+		+ "'" + recMap[ ORecur::Exceptions ]              + "'" + ",";
 	
 	if ( m_todo.hasNotifiers() ) {
 		OPimNotifyManager manager = m_todo.notifiers();
 		qu += "'" + manager.remindersToString()           + "'" + ","		
 			+ "'" + manager.alarmsToString()          + "'" + ",";
 	}
 	else{
 		qu += QString( "''" )                                   + ","
 			+ "''"                                          + ",";
 	}
 
 	qu +=   QString( "''" )                             + QString( "," ) // Maintainers (cur. not supported !)
 		+ "'" + QString::number(sYear) + "-" 
 		+ QString::number(sMonth)
 		+ "-" + QString::number(sDay)                     + "'" + ","
 		+ "'" + QString::number(eYear) + "-"
 		+       QString::number(eMonth)
 		+       "-"+QString::number(eDay)                 + "'"
 		+ ")";
 
         qWarning("add %s", qu.latin1() );
         return qu;
     }
 
     RemoveQuery::RemoveQuery(int uid )
         : OSQLQuery(), m_uid( uid ) {}
     RemoveQuery::~RemoveQuery() {}
     QString RemoveQuery::query()const {
         QString qu = "DELETE from todolist where uid = " + QString::number(m_uid);
         return qu;
     }
 
 
     ClearQuery::ClearQuery()
         : OSQLQuery() {}
     ClearQuery::~ClearQuery() {}
     QString ClearQuery::query()const {
         QString qu = "drop table todolist";
         return qu;
     }
     FindQuery::FindQuery(int uid)
         : OSQLQuery(), m_uid(uid ) {
     }
     FindQuery::FindQuery(const QArray<int>& ints)
         : OSQLQuery(), m_uids(ints){
     }
     FindQuery::~FindQuery() {
     }
     QString FindQuery::query()const{
         if (m_uids.count() == 0 )
             return single();
         else
             return multi();
     }
     QString FindQuery::single()const{
         QString qu = "select * from todolist where uid = " + QString::number(m_uid);
         return qu;
     }
     QString FindQuery::multi()const {
         QString qu = "select * from todolist where ";
         for (uint i = 0; i < m_uids.count(); i++ ) {
             qu += " UID = " + QString::number( m_uids[i] ) + " OR";
         }
         qu.remove( qu.length()-2, 2 );
         return qu;
     }
 
     OverDueQuery::OverDueQuery(): OSQLQuery() {}
     OverDueQuery::~OverDueQuery() {}
     QString OverDueQuery::query()const {
         QDate date = QDate::currentDate();
         QString str;
         str = QString("select uid from todolist where DueDate ='%1-%2-%3'").arg(date.year() ).arg(date.month() ).arg(date.day() );
 
         return str;
     }
 
 
     EffQuery::EffQuery( const QDate& start, const QDate& end, bool inc )
         : OSQLQuery(), m_start( start ), m_end( end ),m_inc(inc) {}
     EffQuery::~EffQuery() {}
     QString EffQuery::query()const {
         return m_inc ? with() : out();
     }
     QString EffQuery::with()const {
         QString str;
         str = QString("select uid from todolist where ( DueDate >= '%1-%2-%3' AND DueDate <= '%4-%5-%6' ) OR DueDate = '0-0-0' ")
             .arg( m_start.year() ).arg( m_start.month() ).arg( m_start.day() )
             .arg( m_end  .year() ).arg( m_end  .month() ).arg( m_end  .day() );
         return str;
     }
     QString EffQuery::out()const {
         QString str;
         str = QString("select uid from todolist where DueDate >= '%1-%2-%3' AND  DueDate <= '%4-%5-%6'")
             .arg(m_start.year() ).arg(m_start.month() ).arg( m_start.day() )
             .arg(m_end.  year() ).arg(m_end.  month() ).arg(m_end.day() );
 
         return str;
     }
 };
 
 OTodoAccessBackendSQL::OTodoAccessBackendSQL( const QString& file )
     : OTodoAccessBackend(), m_dict(15), m_dirty(true)
 {
     QString fi = file;
     if ( fi.isEmpty() )
         fi = Global::applicationFileName( "todolist", "todolist.db" );
     OSQLManager man;
     m_driver = man.standard();
     m_driver->setUrl(fi);
     // fillDict();
 }
 
 OTodoAccessBackendSQL::~OTodoAccessBackendSQL(){
 }
 bool OTodoAccessBackendSQL::load(){
     if (!m_driver->open() )
         return false;
 
     CreateQuery creat;
     OSQLResult res = m_driver->query(&creat );
 
     m_dirty = true;
     return true;
 }
 bool OTodoAccessBackendSQL::reload(){
     return load();
 }
 
 bool OTodoAccessBackendSQL::save(){
     return m_driver->close();
 }
 QArray<int> OTodoAccessBackendSQL::allRecords()const {
     if (m_dirty )
         update();
 
     return m_uids;
 }
 QArray<int> OTodoAccessBackendSQL::queryByExample( const OTodo& , int, const QDateTime& ){
     QArray<int> ints(0);
     return ints;
 }
 OTodo OTodoAccessBackendSQL::find(int uid ) const{
     FindQuery query( uid );
     return todo( m_driver->query(&query) );
 
 }
 OTodo OTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
                                    uint cur, Frontend::CacheDirection dir ) const{
     uint CACHE = readAhead();
     qWarning("searching for %d", uid );
     QArray<int> search( CACHE );
     uint size =0;
     OTodo to;
 
     // we try to cache CACHE items
     switch( dir ) {
         /* forward */
     case 0: // FIXME: Not a good style to use magic numbers here (eilers)
         for (uint i = cur; i < ints.count() && size < CACHE; i++ ) {
             qWarning("size %d %d", size,  ints[i] );
             search[size] = ints[i];
             size++;
         }
         break;
         /* reverse */
     case 1: // FIXME: Not a good style to use magic numbers here (eilers)
         for (uint i = cur; i != 0 && size <  CACHE; i-- ) {
             search[size] = ints[i];
             size++;
         }
         break;
     }
     search.resize( size );
     FindQuery query( search );
     OSQLResult res = m_driver->query( &query  );
     if ( res.state() != OSQLResult::Success )
         return to;
 
     return todo( res );
 }
 void OTodoAccessBackendSQL::clear() {
     ClearQuery cle;
     OSQLResult res = m_driver->query( &cle );
     CreateQuery qu;
     res = m_driver->query(&qu);
 }
 bool OTodoAccessBackendSQL::add( const OTodo& t) {
     InsertQuery ins( t );
     OSQLResult res = m_driver->query( &ins );
 
     if ( res.state() == OSQLResult::Failure )
         return false;
     int c = m_uids.count();
     m_uids.resize( c+1 );
     m_uids[c] = t.uid();
 
     return true;
 }
 bool OTodoAccessBackendSQL::remove( int uid ) {
     RemoveQuery rem( uid );
     OSQLResult res = m_driver->query(&rem );
 
     if ( res.state() == OSQLResult::Failure )
         return false;
 
     m_dirty = true;
     return true;
 }
 /*
  * FIXME better set query
  * but we need the cache for that
  * now we remove
  */
 bool OTodoAccessBackendSQL::replace( const OTodo& t) {
     remove( t.uid() );
     bool b= add(t);
     m_dirty = false; // we changed some stuff but the UID stayed the same
     return b;
 }
 QArray<int> OTodoAccessBackendSQL::overDue() {
     OverDueQuery qu;
     return uids( m_driver->query(&qu ) );
 }
 QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s,
                                                    const QDate& t,
                                                    bool u) {
     EffQuery ef(s, t, u );
     return uids (m_driver->query(&ef) );
 }
 /*
  *
  */
 QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
                                            int sortFilter, int cat ) {
     qWarning("sorted %d, %d", asc, sortOrder );
     QString query;
     query = "select uid from todolist WHERE ";
 
     /*
      * Sort Filter stuff
      * not that straight forward
      * FIXME: Replace magic numbers
      *
      */
     /* Category */
     if ( sortFilter & 1 ) {
         QString str;
         if (cat != 0 ) str = QString::number( cat );
         query += " categories like '%" +str+"%' AND";
     }
     /* Show only overdue */
     if ( sortFilter & 2 ) {
         QDate date = QDate::currentDate();
         QString due;
         QString base;
         base = QString("DueDate <= '%1-%2-%3' AND completed = 0").arg( date.year() ).arg( date.month() ).arg( date.day() );
         query += " " + base + " AND";
     }
     /* not show completed */
     if ( sortFilter & 4 ) {
         query += " completed = 0 AND";
     }else{
        query += " ( completed = 1 OR  completed = 0) AND";
     }
     /* srtip the end */
     query = query.remove( query.length()-3, 3 );
 
 
     /*
      * sort order stuff
      * quite straight forward
      */
     query += "ORDER BY ";
     switch( sortOrder ) {
         /* completed */
     case 0:
         query += "completed";
         break;
     case 1:
         query += "priority";
         break;
     case 2:
         query += "summary";
         break;
     case 3:
         query += "DueDate";
         break;
     }
 
     if ( !asc ) {
         qWarning("not ascending!");
         query += " DESC";
     }
 
     qWarning( query );
     OSQLRawQuery raw(query );
     return uids( m_driver->query(&raw) );
 }
 bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{
     if ( str == "0-0-0" )
         return false;
     else{
         int day, year, month;
         QStringList list = QStringList::split("-", str );
         year = list[0].toInt();
         month = list[1].toInt();
         day = list[2].toInt();
         da.setYMD( year, month, day );
         return true;
     }
 }
 OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{
     if ( res.state() == OSQLResult::Failure ) {
         OTodo to;
         return to;
     }
 
     OSQLResultItem::ValueList list = res.results();
     OSQLResultItem::ValueList::Iterator it = list.begin();
     qWarning("todo1");
     OTodo to = todo( (*it) );
     cache( to );
     ++it;
 
     for ( ; it != list.end(); ++it ) {
         qWarning("caching");
         cache( todo( (*it) ) );
     }
     return to;
 }
 OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
     qWarning("todo");
     bool hasDueDate = false; QDate dueDate = QDate::currentDate();
     hasDueDate = date( dueDate, item.data("DueDate") );
     QStringList cats = QStringList::split(";", item.data("categories") );
 
+    qWarning("Item is completed: %d", item.data("completed").toInt() );
+
     OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(),
               cats, item.data("summary"), item.data("description"),
               item.data("progress").toUShort(), hasDueDate, dueDate,
               item.data("uid").toInt() );
 
     bool isOk;
     int prioInt = QString( item.data("priority") ).toInt( &isOk );
     if ( isOk )
 	    to.setPriority( prioInt );
 
     bool hasStartDate = false; QDate startDate = QDate::currentDate();
     hasStartDate = date( startDate, item.data("startdate") );
     bool hasCompletedDate = false; QDate completedDate = QDate::currentDate();
     hasCompletedDate = date( completedDate, item.data("completeddate") );
 
     if ( hasStartDate )
 	    to.setStartDate( startDate );
     if ( hasCompletedDate )
 	    to.setCompletedDate( completedDate );
     
     OPimNotifyManager& manager = to.notifiers();
     manager.alarmsFromString( item.data("alarms") );
     manager.remindersFromString( item.data("reminders") );
 
     OPimState pimState;
     pimState.setState( QString( item.data("state") ).toInt() );
     to.setState( pimState );
 
-    // Recurrence not supported yet
-    // to.setRecurrence( 
+    QMap<int, QString> recMap;
+    recMap.insert( ORecur::RType      , item.data("RType") );
+    recMap.insert( ORecur::RWeekdays  , item.data("RWeekdays") );
+    recMap.insert( ORecur::RPosition  , item.data("RPosition") );
+    recMap.insert( ORecur::RFreq      , item.data("RFreq") );
+    recMap.insert( ORecur::RHasEndDate, item.data("RHasEndDate") );
+    recMap.insert( ORecur::EndDate    , item.data("EndDate") );
+    recMap.insert( ORecur::Created    , item.data("Created") );
+    recMap.insert( ORecur::Exceptions , item.data("Exceptions") );
+    
+    ORecur recur;
+    recur.fromMap( recMap );
+    to.setRecurrence( recur );
 
     return to;
 }
 OTodo OTodoAccessBackendSQL::todo( int uid )const {
     FindQuery find( uid );
     return todo( m_driver->query(&find) );
 }
 /*
  * update the dict
  */
 void OTodoAccessBackendSQL::fillDict() {
     /* initialize dict */
     /*
      * UPDATE dict if you change anything!!!
      * FIXME: Isn't this dict obsolete ? (eilers)
      */
     m_dict.setAutoDelete( TRUE );
     m_dict.insert("Categories" ,     new int(OTodo::Category)         );
     m_dict.insert("Uid" ,            new int(OTodo::Uid)              );
     m_dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
     m_dict.insert("Completed" ,      new int(OTodo::Completed)        );
     m_dict.insert("Description" ,    new int(OTodo::Description)      );
     m_dict.insert("Summary" ,        new int(OTodo::Summary)          );
     m_dict.insert("Priority" ,       new int(OTodo::Priority)         );
     m_dict.insert("DateDay" ,        new int(OTodo::DateDay)          );
     m_dict.insert("DateMonth" ,      new int(OTodo::DateMonth)        );
     m_dict.insert("DateYear" ,       new int(OTodo::DateYear)         );
     m_dict.insert("Progress" ,       new int(OTodo::Progress)         );
     m_dict.insert("Completed",       new int(OTodo::Completed)        ); // Why twice ? (eilers)
     m_dict.insert("CrossReference",  new int(OTodo::CrossReference)   );
 //    m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); // old stuff (eilers)
 //    m_dict.insert("AlarmDateTime",   new int(OTodo::AlarmDateTime)    ); // old stuff (eilers)
 }
 /*
  * need to be const so let's fool the
  * compiler :(
  */
 void OTodoAccessBackendSQL::update()const {
     ((OTodoAccessBackendSQL*)this)->m_dirty = false;
     LoadQuery lo;
     OSQLResult res = m_driver->query(&lo);
     if ( res.state() != OSQLResult::Success )
         return;
 
     ((OTodoAccessBackendSQL*)this)->m_uids = uids( res );
 }
 QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{
 
     OSQLResultItem::ValueList list = res.results();
     OSQLResultItem::ValueList::Iterator it;
     QArray<int> ints(list.count() );
     qWarning(" count = %d", list.count() );
 
     int i = 0;
     for (it = list.begin(); it != list.end(); ++it ) {
         ints[i] =  (*it).data("uid").toInt();
         i++;
     }
     return ints;
 }
 
 QArray<int> OTodoAccessBackendSQL::matchRegexp(  const QRegExp &r ) const
 {
 
 #warning OTodoAccessBackendSQL::matchRegexp() not implemented !!
 
 #if 0
 
 	Copied from xml-backend by not adapted to sql (eilers)
 
 	QArray<int> m_currentQuery( m_events.count() );
 	uint arraycounter = 0;
 
 
 
         QMap<int, OTodo>::ConstIterator it;
         for (it = m_events.begin(); it != m_events.end(); ++it ) {
 		if ( it.data().match( r ) )
 			m_currentQuery[arraycounter++] = it.data().uid();
 
 	}
 	// Shrink to fit..
 	m_currentQuery.resize(arraycounter);
 
 	return m_currentQuery;
 #endif
 	QArray<int> empty;
 	return empty;
 }
 QBitArray OTodoAccessBackendSQL::supports()const {
 
 	return sup();
 }
 
 QBitArray OTodoAccessBackendSQL::sup() const{
 
 	QBitArray ar( OTodo::CompletedDate + 1 );
 	ar.fill( true );
 	ar[OTodo::CrossReference] = false;
 	ar[OTodo::State ] = false;
 	ar[OTodo::Reminders] = false;
 	ar[OTodo::Notifiers] = false;
 	ar[OTodo::Maintainer] = false;
 	
 	return ar;
 }
 
 void OTodoAccessBackendSQL::removeAllCompleted(){
 #warning OTodoAccessBackendSQL::removeAllCompleted() not implemented !!
 
 }
diff --git a/libopie2/opiecore/oglobalsettings.h b/libopie2/opiecore/oglobalsettings.h
index d3f357e..e3ac148 100644
--- a/libopie2/opiecore/oglobalsettings.h
+++ b/libopie2/opiecore/oglobalsettings.h
@@ -1,373 +1,373 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
                              Inspired by KDE OGlobalSettings
                              Copyright (C) 2000 David Faure <faure@kde.org>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       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
 ..}^=.=       =       ;      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 OGLOBALSETTINGS_H
 #define OGLOBALSETTINGS_H
 
 #include <qstring.h>
 #include <qcolor.h>
 #include <qfont.h>
 
 #define OPIE_DEFAULT_SINGLECLICK true
 #define OPIE_DEFAULT_INSERTTEAROFFHANDLES true
 #define OPIE_DEFAULT_AUTOSELECTDELAY -1
 #define OPIE_DEFAULT_CHANGECURSOR true
 #define OPIE_DEFAULT_LARGE_CURSOR false
 #define OPIE_DEFAULT_VISUAL_ACTIVATE true
 #define OPIE_DEFAULT_VISUAL_ACTIVATE_SPEED 50
 
 //FIXME: There's still a whole lot of stuff in here which has to be revised
 //FIXME: before public usage... lack of time to do it at once - so it will
 //FIXME: happen step-by-step. ML.
 // we should not habe too much configure options!!!!!! -zecke
 
 /**
  * Access the OPIE global configuration settings.
  *
  */
 class OGlobalSettings
 {
   public:
 
     /**
      * Returns a threshold in pixels for drag & drop operations.
      * As long as the mouse movement has not exceeded this number
      * of pixels in either X or Y direction no drag operation may
      * be started. This prevents spurious drags when the user intended
      * to click on something but moved the mouse a bit while doing so.
      *
      * For this to work you must save the position of the mouse (oldPos)
      * in the @ref QWidget::mousePressEvent().
      * When the position of the mouse (newPos)
      * in a  @ref QWidget::mouseMoveEvent() exceeds this threshold
      * you may start a drag
      * which should originate from oldPos.
      *
      * Example code:
      * <pre>
      * void OColorCells::mousePressEvent( QMouseEvent *e )
      * {
      *    mOldPos = e->pos();
      * }
      *
      * void OColorCells::mouseMoveEvent( QMouseEvent *e )
      * {
      *    if( !(e->state() && LeftButton)) return;
      *
      *    int delay = OGlobalSettings::dndEventDelay();
      *    QPoint newPos = e->pos();
      *    if(newPos.x() > mOldPos.x()+delay || newPos.x() < mOldPos.x()-delay ||
      *       newPos.y() > mOldPos.y()+delay || newPos.y() < mOldPos.y()-delay)
      *    {
      *       // Drag color object
      *       int cell = posToCell(mOldPos); // Find color at mOldPos
      *       if ((cell != -1) && colors[cell].isValid())
      *       {
      *          OColorDrag *d = OColorDrag::makeDrag( colors[cell], this);
      *          d->dragCopy();
      *       }
      *    }
      * }
      * </pre>
      *
      */
 
     // we do not support DND at the momemt -zecke
     static int dndEventDelay();
 
     /**
      * Returns whether OPIE runs in single (default) or double click
      * mode.
      *
      * @return @p true if single click mode, or @p false if double click mode.
      *
      * see @ref http://opie.handhelds.org/documentation/standards/opie/style/mouse/index.html
      **/
     static bool singleClick();
 
     /**
      * Returns whether tear-off handles are inserted in OPopupMenus.
      **/
     // would clutter the small screen -zecke
     static bool insertTearOffHandle();
 
     /**
      * @return the OPIE setting for "change cursor over icon"
      */
     static bool changeCursorOverIcon();
 
     /**
      * @return whether to show some feedback when an item (specifically an
      * icon) is activated.
      */
     static bool visualActivate();
     static unsigned int visualActivateSpeed();
 
     /**
      * Returns the OPIE setting for the auto-select option
      *
      * @return the auto-select delay or -1 if auto-select is disabled.
      */
     static int autoSelectDelay();
 
     /**
      * Returns the OPIE setting for the shortcut key to open
      * context menus.
      *
      * @return the key that pops up context menus.
      */
     static int contextMenuKey();
 
     /**
      * Returns the OPIE setting for context menus.
      *
      * @return whether context menus should be shown on button press
      * or button release (click).
      */
     static bool showContextMenusOnPress ();
 
     /**
      * This enum describes the completion mode used for by the @ref OCompletion class.
      * See <a href="http://opie.handhelds.org/documentation/standards/opie/style/keys/completion.html">
      * the styleguide</a>.
      **/
     enum Completion {
        /**
         * No completion is used.
         */
         CompletionNone=1,
        /**
         * Text is automatically filled in whenever possible.
         */
         CompletionAuto,
        /**
         * Same as automatic except shortest match is used for completion.
         */
         CompletionMan,
        /**
         * Complete text much in the same way as a typical *nix shell would.
         */
         CompletionShell,
        /**
         * Lists all possible matches in a popup list-box to choose from.
         */
         CompletionPopup,
        /**
         * Lists all possible matches in a popup list-box to choose from, and automatically
         * fill the result whenever possible.
         */
         CompletionPopupAuto
     };
     /**
      * Returns the preferred completion mode setting.
      *
      * @return @ref Completion.  Default is @p CompletionPopup.
      */
     static Completion completionMode();
 
     /**
      * This enum describes the debug mode used for by the @ref odbgstream class.
      * See <a href="http://opie.handhelds.org/documentation/standards/opie/style/debug/debug.html">
      * the styleguide</a>.
      **/
     enum Debug {
        /**
         * Debug messages are ignored.
         */
         DebugNone=-1,
        /**
-        * Debug output is sent to files /var/log/***.
+        * Debug output is sent to files /var/log/.
         */
         DebugFiles=0,
        /**
         * Debug output is written in a QMessageBox.
         */
         DebugMsgBox=1,
        /**
         * Debug output is sent to stderr.
         */
         DebugStdErr=2,
        /**
         * Debug output is sent to syslog.
         */
         DebugSysLog=3,
        /**
         * Debug output is sent via udp over a socket.
         */
         DebugSocket=4
     };
     /**
      * Returns the preferred debug mode setting.
      *
      * @return @ref Debug.  Default is @p DebugStdErr.
      */
     static Debug debugMode();
 
     /**
      * Returns additional information for debug output (dependent on the debug mode).
      *
      * @return Additional debug output information.
      */
     static QString debugOutput();
     /**
      * This is a structure containing the possible mouse settings.
      */
     struct OMouseSettings
     {
         enum { RightHanded = 0, LeftHanded = 1 };
         int handed; // left or right
     };
 
     /**
      * This returns the current mouse settings.
      */
     static OMouseSettings & mouseSettings();
 
     /**
      * The path to the desktop directory of the current user.
      */
      // below handled by Global stuff and QPEApplication
     static QString desktopPath() { initStatic(); return *s_desktopPath; }
 
     /**
      * The path to the autostart directory of the current user.
      */
     static QString autostartPath() { initStatic(); return *s_autostartPath; }
 
     /**
      * The path to the trash directory of the current user.    
      */
      // we do not have that concept -zecke
     static QString trashPath() { initStatic(); return *s_trashPath; }
 
     /**
      * The path where documents are stored of the current user.
      */
     static QString documentPath() { initStatic(); return *s_documentPath; }
 
 
     /**
      * The default color to use when highlighting toolbar buttons
      */
     static QColor toolBarHighlightColor();
     static QColor inactiveTitleColor();
     static QColor inactiveTextColor();
     static QColor activeTitleColor();
     static QColor activeTextColor();
     static int contrast();
 
     /**
      * The default colors to use for text and links.
      */
     static QColor baseColor(); // Similair to QColorGroup::base()
     static QColor textColor(); // Similair to QColorGroup::text()
     static QColor linkColor();
     static QColor visitedLinkColor();
     static QColor highlightedTextColor(); // Similair to QColorGroup::hightlightedText()
     static QColor highlightColor(); // Similair to QColorGroup::highlight()
 
     /**
      * Returns the alternate background color used by @ref OListView with
      * @ref OListViewItem. Any other list that uses alternating background
      * colors should use this too, to obey to the user's preferences. Returns
      * an invalid color if the user doesn't want alternating backgrounds.
      * @see #calculateAlternateBackgroundColor
      */
     static QColor alternateBackgroundColor();
     /**
      * Calculates a color based on @p base to be used as alternating
      * color for e.g. listviews.
      * @see #alternateBackgroundColor
      */
     static QColor calculateAlternateBackgroundColor(const QColor& base);
 
 
     static QFont generalFont();
     static QFont fixedFont();
     static QFont toolBarFont();
     static QFont menuFont();
     static QFont windowTitleFont();
     static QFont taskbarFont();
 
     /**
      * Returns if the user specified multihead. In case the display
      * has multiple screens, the return value of this function specifies
      * if the user wants OPIE to run on all of them or just on the primary
      */
     static bool isMultiHead();
 
 private:
     /**
      * reads in all paths from kdeglobals
      */
     static void initStatic();
     /**
      * initialise kde2Blue
      */
     static void initColors();
     /**
      * drop cached values for fonts (called by OApplication)
      */
     static void rereadFontSettings();
     /**
      * drop cached values for paths (called by OApplication)
      */
     static void rereadPathSettings();
     /**
      * drop cached values for mouse settings (called by OApplication)
      */
     static void rereadMouseSettings();
 
 
     static QString* s_desktopPath;
     static QString* s_autostartPath;
     static QString* s_trashPath;
     static QString* s_documentPath;
     static QFont *_generalFont;
     static QFont *_fixedFont;
     static QFont *_toolBarFont;
     static QFont *_menuFont;
     static QFont *_windowTitleFont;
     static QFont *_taskbarFont;
     static QColor * kde2Gray;
     static QColor * kde2Blue;
     static QColor * kde2AlternateColor;
     static OMouseSettings *s_mouseSettings;
 
     static QColor * OpieGray;
     static QColor * OpieBlue;
     static QColor * OpieAlternate;   
     static QColor * OpieHighlight;
     
     friend class OApplication;
 };
 
 #endif
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro
index bf547ab..6a4e8f1 100644
--- a/libopie2/opiedb/opiedb.pro
+++ b/libopie2/opiedb/opiedb.pro
@@ -1,39 +1,41 @@
 TEMPLATE    = lib
 #CONFIG      += qt warn_on debug
 CONFIG      += qt warn_on release
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = osqlbackend.h      \
                 osqldriver.h     \
                 osqlerror.h      \
                 osqlmanager.h    \
                 osqlquery.h      \
                 osqlresult.h     \
                 osqltable.h      \
                 osqlbackendmanager.h \
                 osqlitedriver.h
 SOURCES     = osqlbackend.cpp    \
                 osqldriver.cpp   \
                 osqlerror.cpp    \
                 osqlmanager.cpp  \
                 osqlquery.cpp    \
                 osqlresult.cpp   \
                 osqltable.cpp    \
                 osqlbackendmanager.cpp \
                 osqlitedriver.cpp
 INTERFACES  =
 TARGET      = opiedb2
 VERSION     = 1.8.1
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 
+LIBS += -lsqlite -lqpe
+
 !contains( platform, x11 ) {
   include ( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
-  LIBS        = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
+  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
 }
 
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index ebd03bb..3913661 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -1,667 +1,690 @@
 
 #include <qdatetime.h>
 
 #include <qpe/global.h>
 
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
 #include "otodoaccesssql.h"
 #include "opimstate.h"
 #include "opimnotifymanager.h"
 #include "orecur.h"
 
 /*
  * first some query
  * CREATE query
  * LOAD query
  * INSERT
  * REMOVE
  * CLEAR
  */
 namespace {
     /**
      * CreateQuery for the Todolist Table
      */
     class CreateQuery : public OSQLQuery {
     public:
         CreateQuery();
         ~CreateQuery();
         QString query()const;
     };
 
     /**
      * LoadQuery
      * this one queries for all uids
      */
     class LoadQuery : public OSQLQuery {
     public:
         LoadQuery();
         ~LoadQuery();
         QString query()const;
     };
 
     /**
      * inserts/adds a OTodo to the table
      */
     class InsertQuery : public OSQLQuery {
     public:
         InsertQuery(const OTodo& );
         ~InsertQuery();
         QString query()const;
     private:
         OTodo m_todo;
     };
 
     /**
      * removes one from the table
      */
     class RemoveQuery : public OSQLQuery {
     public:
         RemoveQuery(int uid );
         ~RemoveQuery();
         QString query()const;
     private:
         int m_uid;
     };
 
     /**
      * Clears (delete) a Table
      */
     class ClearQuery : public OSQLQuery {
     public:
         ClearQuery();
         ~ClearQuery();
         QString query()const;
 
     };
 
     /**
      * a find query
      */
     class FindQuery : public OSQLQuery {
     public:
         FindQuery(int uid);
         FindQuery(const QArray<int>& );
         ~FindQuery();
         QString query()const;
     private:
         QString single()const;
         QString multi()const;
         QArray<int> m_uids;
         int m_uid;
     };
 
     /**
      * overdue query
      */
     class OverDueQuery : public OSQLQuery {
     public:
         OverDueQuery();
         ~OverDueQuery();
         QString query()const;
     };
     class EffQuery : public OSQLQuery {
     public:
         EffQuery( const QDate&, const QDate&, bool inc );
         ~EffQuery();
         QString query()const;
     private:
         QString with()const;
         QString out()const;
         QDate m_start;
         QDate m_end;
         bool m_inc :1;
     };
 
 
     CreateQuery::CreateQuery() : OSQLQuery() {}
     CreateQuery::~CreateQuery() {}
     QString CreateQuery::query()const {
         QString qu;
         qu += "create table todolist( uid PRIMARY KEY, categories, completed, ";
         qu += "description, summary, priority, DueDate, progress ,  state, ";
-	qu += "Recurrence, reminders, alarms, maintainer, startdate, completeddate);";
+	// This is the recurrance-stuff .. Exceptions are currently not supported (see ORecur.cpp) ! (eilers)
+	qu += "RType, RWeekdays, RPosition, RFreq, RHasEndDate, EndDate, Created, Exceptions, "; 
+	qu += "reminders, alarms, maintainer, startdate, completeddate);";
 	qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
         return qu;
     }
 
     LoadQuery::LoadQuery() : OSQLQuery() {}
     LoadQuery::~LoadQuery() {}
     QString LoadQuery::query()const {
         QString qu;
 	// We do not need "distinct" here. The primary key is always unique..
         //qu += "select distinct uid from todolist";
         qu += "select uid from todolist";
 
         return qu;
     }
 
     InsertQuery::InsertQuery( const OTodo& todo )
         : OSQLQuery(), m_todo( todo ) {
     }
     InsertQuery::~InsertQuery() {
     }
     /*
      * converts from a OTodo to a query
      * we leave out X-Ref + Alarms
      */
     QString InsertQuery::query()const{
 
         int year, month, day;
         year = month = day = 0;
         if (m_todo.hasDueDate() ) {
             QDate date = m_todo.dueDate();
             year = date.year();
             month = date.month();
             day = date.day();
 	}
 	int sYear = 0, sMonth = 0, sDay = 0;
 	if( m_todo.hasStartDate() ){
 		QDate sDate = m_todo.startDate();
 		sYear = sDate.year();
 		sMonth= sDate.month();
 		sDay  = sDate.day();
 	} 
 
 	int eYear = 0, eMonth = 0, eDay = 0;
 	if( m_todo.hasCompletedDate() ){
 		QDate eDate = m_todo.completedDate();
 		eYear = eDate.year();
 		eMonth= eDate.month();
 		eDay  = eDate.day();
 	} 
         QString qu;
+	QMap<int, QString> recMap = m_todo.recurrence().toMap();
         qu  = "insert into todolist VALUES(" 
 		+  QString::number( m_todo.uid() ) + "," 
 		+ "'" + m_todo.idsToString( m_todo.categories() ) + "'" + ","
 		+       QString::number( m_todo.isCompleted() )         + ","  
 		+ "'" + m_todo.description()                      + "'" + ","
 		+ "'" + m_todo.summary()                          + "'" + "," 
 		+       QString::number(m_todo.priority() )             + ","
 		+ "'" + QString::number(year) + "-" 
 		+       QString::number(month)
 		+       "-" + QString::number( day )              + "'" + ","
 		+       QString::number( m_todo.progress() )            + ","
  		+       QString::number( m_todo.state().state() )       + ","
-		+ "'" + m_todo.recurrence().toString()            + "'"+ ",";
+		+ "'" + recMap[ ORecur::RType ]                   + "'" + ","
+		+ "'" + recMap[ ORecur::RWeekdays ]               + "'" + ","
+		+ "'" + recMap[ ORecur::RPosition ]               + "'" + ","
+		+ "'" + recMap[ ORecur::RFreq ]                   + "'" + ","
+		+ "'" + recMap[ ORecur::RHasEndDate ]             + "'" + ","
+		+ "'" + recMap[ ORecur::EndDate ]                 + "'" + ","
+		+ "'" + recMap[ ORecur::Created ]                 + "'" + ","
+		+ "'" + recMap[ ORecur::Exceptions ]              + "'" + ",";
 	
 	if ( m_todo.hasNotifiers() ) {
 		OPimNotifyManager manager = m_todo.notifiers();
 		qu += "'" + manager.remindersToString()           + "'" + ","		
 			+ "'" + manager.alarmsToString()          + "'" + ",";
 	}
 	else{
 		qu += QString( "''" )                                   + ","
 			+ "''"                                          + ",";
 	}
 
 	qu +=   QString( "''" )                             + QString( "," ) // Maintainers (cur. not supported !)
 		+ "'" + QString::number(sYear) + "-" 
 		+ QString::number(sMonth)
 		+ "-" + QString::number(sDay)                     + "'" + ","
 		+ "'" + QString::number(eYear) + "-"
 		+       QString::number(eMonth)
 		+       "-"+QString::number(eDay)                 + "'"
 		+ ")";
 
         qWarning("add %s", qu.latin1() );
         return qu;
     }
 
     RemoveQuery::RemoveQuery(int uid )
         : OSQLQuery(), m_uid( uid ) {}
     RemoveQuery::~RemoveQuery() {}
     QString RemoveQuery::query()const {
         QString qu = "DELETE from todolist where uid = " + QString::number(m_uid);
         return qu;
     }
 
 
     ClearQuery::ClearQuery()
         : OSQLQuery() {}
     ClearQuery::~ClearQuery() {}
     QString ClearQuery::query()const {
         QString qu = "drop table todolist";
         return qu;
     }
     FindQuery::FindQuery(int uid)
         : OSQLQuery(), m_uid(uid ) {
     }
     FindQuery::FindQuery(const QArray<int>& ints)
         : OSQLQuery(), m_uids(ints){
     }
     FindQuery::~FindQuery() {
     }
     QString FindQuery::query()const{
         if (m_uids.count() == 0 )
             return single();
         else
             return multi();
     }
     QString FindQuery::single()const{
         QString qu = "select * from todolist where uid = " + QString::number(m_uid);
         return qu;
     }
     QString FindQuery::multi()const {
         QString qu = "select * from todolist where ";
         for (uint i = 0; i < m_uids.count(); i++ ) {
             qu += " UID = " + QString::number( m_uids[i] ) + " OR";
         }
         qu.remove( qu.length()-2, 2 );
         return qu;
     }
 
     OverDueQuery::OverDueQuery(): OSQLQuery() {}
     OverDueQuery::~OverDueQuery() {}
     QString OverDueQuery::query()const {
         QDate date = QDate::currentDate();
         QString str;
         str = QString("select uid from todolist where DueDate ='%1-%2-%3'").arg(date.year() ).arg(date.month() ).arg(date.day() );
 
         return str;
     }
 
 
     EffQuery::EffQuery( const QDate& start, const QDate& end, bool inc )
         : OSQLQuery(), m_start( start ), m_end( end ),m_inc(inc) {}
     EffQuery::~EffQuery() {}
     QString EffQuery::query()const {
         return m_inc ? with() : out();
     }
     QString EffQuery::with()const {
         QString str;
         str = QString("select uid from todolist where ( DueDate >= '%1-%2-%3' AND DueDate <= '%4-%5-%6' ) OR DueDate = '0-0-0' ")
             .arg( m_start.year() ).arg( m_start.month() ).arg( m_start.day() )
             .arg( m_end  .year() ).arg( m_end  .month() ).arg( m_end  .day() );
         return str;
     }
     QString EffQuery::out()const {
         QString str;
         str = QString("select uid from todolist where DueDate >= '%1-%2-%3' AND  DueDate <= '%4-%5-%6'")
             .arg(m_start.year() ).arg(m_start.month() ).arg( m_start.day() )
             .arg(m_end.  year() ).arg(m_end.  month() ).arg(m_end.day() );
 
         return str;
     }
 };
 
 OTodoAccessBackendSQL::OTodoAccessBackendSQL( const QString& file )
     : OTodoAccessBackend(), m_dict(15), m_dirty(true)
 {
     QString fi = file;
     if ( fi.isEmpty() )
         fi = Global::applicationFileName( "todolist", "todolist.db" );
     OSQLManager man;
     m_driver = man.standard();
     m_driver->setUrl(fi);
     // fillDict();
 }
 
 OTodoAccessBackendSQL::~OTodoAccessBackendSQL(){
 }
 bool OTodoAccessBackendSQL::load(){
     if (!m_driver->open() )
         return false;
 
     CreateQuery creat;
     OSQLResult res = m_driver->query(&creat );
 
     m_dirty = true;
     return true;
 }
 bool OTodoAccessBackendSQL::reload(){
     return load();
 }
 
 bool OTodoAccessBackendSQL::save(){
     return m_driver->close();
 }
 QArray<int> OTodoAccessBackendSQL::allRecords()const {
     if (m_dirty )
         update();
 
     return m_uids;
 }
 QArray<int> OTodoAccessBackendSQL::queryByExample( const OTodo& , int, const QDateTime& ){
     QArray<int> ints(0);
     return ints;
 }
 OTodo OTodoAccessBackendSQL::find(int uid ) const{
     FindQuery query( uid );
     return todo( m_driver->query(&query) );
 
 }
 OTodo OTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
                                    uint cur, Frontend::CacheDirection dir ) const{
     uint CACHE = readAhead();
     qWarning("searching for %d", uid );
     QArray<int> search( CACHE );
     uint size =0;
     OTodo to;
 
     // we try to cache CACHE items
     switch( dir ) {
         /* forward */
     case 0: // FIXME: Not a good style to use magic numbers here (eilers)
         for (uint i = cur; i < ints.count() && size < CACHE; i++ ) {
             qWarning("size %d %d", size,  ints[i] );
             search[size] = ints[i];
             size++;
         }
         break;
         /* reverse */
     case 1: // FIXME: Not a good style to use magic numbers here (eilers)
         for (uint i = cur; i != 0 && size <  CACHE; i-- ) {
             search[size] = ints[i];
             size++;
         }
         break;
     }
     search.resize( size );
     FindQuery query( search );
     OSQLResult res = m_driver->query( &query  );
     if ( res.state() != OSQLResult::Success )
         return to;
 
     return todo( res );
 }
 void OTodoAccessBackendSQL::clear() {
     ClearQuery cle;
     OSQLResult res = m_driver->query( &cle );
     CreateQuery qu;
     res = m_driver->query(&qu);
 }
 bool OTodoAccessBackendSQL::add( const OTodo& t) {
     InsertQuery ins( t );
     OSQLResult res = m_driver->query( &ins );
 
     if ( res.state() == OSQLResult::Failure )
         return false;
     int c = m_uids.count();
     m_uids.resize( c+1 );
     m_uids[c] = t.uid();
 
     return true;
 }
 bool OTodoAccessBackendSQL::remove( int uid ) {
     RemoveQuery rem( uid );
     OSQLResult res = m_driver->query(&rem );
 
     if ( res.state() == OSQLResult::Failure )
         return false;
 
     m_dirty = true;
     return true;
 }
 /*
  * FIXME better set query
  * but we need the cache for that
  * now we remove
  */
 bool OTodoAccessBackendSQL::replace( const OTodo& t) {
     remove( t.uid() );
     bool b= add(t);
     m_dirty = false; // we changed some stuff but the UID stayed the same
     return b;
 }
 QArray<int> OTodoAccessBackendSQL::overDue() {
     OverDueQuery qu;
     return uids( m_driver->query(&qu ) );
 }
 QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s,
                                                    const QDate& t,
                                                    bool u) {
     EffQuery ef(s, t, u );
     return uids (m_driver->query(&ef) );
 }
 /*
  *
  */
 QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
                                            int sortFilter, int cat ) {
     qWarning("sorted %d, %d", asc, sortOrder );
     QString query;
     query = "select uid from todolist WHERE ";
 
     /*
      * Sort Filter stuff
      * not that straight forward
      * FIXME: Replace magic numbers
      *
      */
     /* Category */
     if ( sortFilter & 1 ) {
         QString str;
         if (cat != 0 ) str = QString::number( cat );
         query += " categories like '%" +str+"%' AND";
     }
     /* Show only overdue */
     if ( sortFilter & 2 ) {
         QDate date = QDate::currentDate();
         QString due;
         QString base;
         base = QString("DueDate <= '%1-%2-%3' AND completed = 0").arg( date.year() ).arg( date.month() ).arg( date.day() );
         query += " " + base + " AND";
     }
     /* not show completed */
     if ( sortFilter & 4 ) {
         query += " completed = 0 AND";
     }else{
        query += " ( completed = 1 OR  completed = 0) AND";
     }
     /* srtip the end */
     query = query.remove( query.length()-3, 3 );
 
 
     /*
      * sort order stuff
      * quite straight forward
      */
     query += "ORDER BY ";
     switch( sortOrder ) {
         /* completed */
     case 0:
         query += "completed";
         break;
     case 1:
         query += "priority";
         break;
     case 2:
         query += "summary";
         break;
     case 3:
         query += "DueDate";
         break;
     }
 
     if ( !asc ) {
         qWarning("not ascending!");
         query += " DESC";
     }
 
     qWarning( query );
     OSQLRawQuery raw(query );
     return uids( m_driver->query(&raw) );
 }
 bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{
     if ( str == "0-0-0" )
         return false;
     else{
         int day, year, month;
         QStringList list = QStringList::split("-", str );
         year = list[0].toInt();
         month = list[1].toInt();
         day = list[2].toInt();
         da.setYMD( year, month, day );
         return true;
     }
 }
 OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{
     if ( res.state() == OSQLResult::Failure ) {
         OTodo to;
         return to;
     }
 
     OSQLResultItem::ValueList list = res.results();
     OSQLResultItem::ValueList::Iterator it = list.begin();
     qWarning("todo1");
     OTodo to = todo( (*it) );
     cache( to );
     ++it;
 
     for ( ; it != list.end(); ++it ) {
         qWarning("caching");
         cache( todo( (*it) ) );
     }
     return to;
 }
 OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
     qWarning("todo");
     bool hasDueDate = false; QDate dueDate = QDate::currentDate();
     hasDueDate = date( dueDate, item.data("DueDate") );
     QStringList cats = QStringList::split(";", item.data("categories") );
 
+    qWarning("Item is completed: %d", item.data("completed").toInt() );
+
     OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(),
               cats, item.data("summary"), item.data("description"),
               item.data("progress").toUShort(), hasDueDate, dueDate,
               item.data("uid").toInt() );
 
     bool isOk;
     int prioInt = QString( item.data("priority") ).toInt( &isOk );
     if ( isOk )
 	    to.setPriority( prioInt );
 
     bool hasStartDate = false; QDate startDate = QDate::currentDate();
     hasStartDate = date( startDate, item.data("startdate") );
     bool hasCompletedDate = false; QDate completedDate = QDate::currentDate();
     hasCompletedDate = date( completedDate, item.data("completeddate") );
 
     if ( hasStartDate )
 	    to.setStartDate( startDate );
     if ( hasCompletedDate )
 	    to.setCompletedDate( completedDate );
     
     OPimNotifyManager& manager = to.notifiers();
     manager.alarmsFromString( item.data("alarms") );
     manager.remindersFromString( item.data("reminders") );
 
     OPimState pimState;
     pimState.setState( QString( item.data("state") ).toInt() );
     to.setState( pimState );
 
-    // Recurrence not supported yet
-    // to.setRecurrence( 
+    QMap<int, QString> recMap;
+    recMap.insert( ORecur::RType      , item.data("RType") );
+    recMap.insert( ORecur::RWeekdays  , item.data("RWeekdays") );
+    recMap.insert( ORecur::RPosition  , item.data("RPosition") );
+    recMap.insert( ORecur::RFreq      , item.data("RFreq") );
+    recMap.insert( ORecur::RHasEndDate, item.data("RHasEndDate") );
+    recMap.insert( ORecur::EndDate    , item.data("EndDate") );
+    recMap.insert( ORecur::Created    , item.data("Created") );
+    recMap.insert( ORecur::Exceptions , item.data("Exceptions") );
+    
+    ORecur recur;
+    recur.fromMap( recMap );
+    to.setRecurrence( recur );
 
     return to;
 }
 OTodo OTodoAccessBackendSQL::todo( int uid )const {
     FindQuery find( uid );
     return todo( m_driver->query(&find) );
 }
 /*
  * update the dict
  */
 void OTodoAccessBackendSQL::fillDict() {
     /* initialize dict */
     /*
      * UPDATE dict if you change anything!!!
      * FIXME: Isn't this dict obsolete ? (eilers)
      */
     m_dict.setAutoDelete( TRUE );
     m_dict.insert("Categories" ,     new int(OTodo::Category)         );
     m_dict.insert("Uid" ,            new int(OTodo::Uid)              );
     m_dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
     m_dict.insert("Completed" ,      new int(OTodo::Completed)        );
     m_dict.insert("Description" ,    new int(OTodo::Description)      );
     m_dict.insert("Summary" ,        new int(OTodo::Summary)          );
     m_dict.insert("Priority" ,       new int(OTodo::Priority)         );
     m_dict.insert("DateDay" ,        new int(OTodo::DateDay)          );
     m_dict.insert("DateMonth" ,      new int(OTodo::DateMonth)        );
     m_dict.insert("DateYear" ,       new int(OTodo::DateYear)         );
     m_dict.insert("Progress" ,       new int(OTodo::Progress)         );
     m_dict.insert("Completed",       new int(OTodo::Completed)        ); // Why twice ? (eilers)
     m_dict.insert("CrossReference",  new int(OTodo::CrossReference)   );
 //    m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); // old stuff (eilers)
 //    m_dict.insert("AlarmDateTime",   new int(OTodo::AlarmDateTime)    ); // old stuff (eilers)
 }
 /*
  * need to be const so let's fool the
  * compiler :(
  */
 void OTodoAccessBackendSQL::update()const {
     ((OTodoAccessBackendSQL*)this)->m_dirty = false;
     LoadQuery lo;
     OSQLResult res = m_driver->query(&lo);
     if ( res.state() != OSQLResult::Success )
         return;
 
     ((OTodoAccessBackendSQL*)this)->m_uids = uids( res );
 }
 QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{
 
     OSQLResultItem::ValueList list = res.results();
     OSQLResultItem::ValueList::Iterator it;
     QArray<int> ints(list.count() );
     qWarning(" count = %d", list.count() );
 
     int i = 0;
     for (it = list.begin(); it != list.end(); ++it ) {
         ints[i] =  (*it).data("uid").toInt();
         i++;
     }
     return ints;
 }
 
 QArray<int> OTodoAccessBackendSQL::matchRegexp(  const QRegExp &r ) const
 {
 
 #warning OTodoAccessBackendSQL::matchRegexp() not implemented !!
 
 #if 0
 
 	Copied from xml-backend by not adapted to sql (eilers)
 
 	QArray<int> m_currentQuery( m_events.count() );
 	uint arraycounter = 0;
 
 
 
         QMap<int, OTodo>::ConstIterator it;
         for (it = m_events.begin(); it != m_events.end(); ++it ) {
 		if ( it.data().match( r ) )
 			m_currentQuery[arraycounter++] = it.data().uid();
 
 	}
 	// Shrink to fit..
 	m_currentQuery.resize(arraycounter);
 
 	return m_currentQuery;
 #endif
 	QArray<int> empty;
 	return empty;
 }
 QBitArray OTodoAccessBackendSQL::supports()const {
 
 	return sup();
 }
 
 QBitArray OTodoAccessBackendSQL::sup() const{
 
 	QBitArray ar( OTodo::CompletedDate + 1 );
 	ar.fill( true );
 	ar[OTodo::CrossReference] = false;
 	ar[OTodo::State ] = false;
 	ar[OTodo::Reminders] = false;
 	ar[OTodo::Notifiers] = false;
 	ar[OTodo::Maintainer] = false;
 	
 	return ar;
 }
 
 void OTodoAccessBackendSQL::removeAllCompleted(){
 #warning OTodoAccessBackendSQL::removeAllCompleted() not implemented !!
 
 }
diff --git a/libopie2/opiepim/core/orecur.cpp b/libopie2/opiepim/core/orecur.cpp
index eae1fdc..8c9ad46 100644
--- a/libopie2/opiepim/core/orecur.cpp
+++ b/libopie2/opiepim/core/orecur.cpp
@@ -203,308 +203,383 @@ bool ORecur::p_nextOccurrence( const QDate& from, QDate& next ) {
 		if (imonth > 12) {
 		    imonth--;
 		    iyear += imonth / 12;
 		    imonth = imonth % 12;
 		    imonth++;
 		}
 		tmpDate = QDate( iyear, imonth, 1 );
 		/* these loops could go for a while, check end case now */
 		if ((tmpDate > endDate()) && hasEndDate() )
 		    return FALSE;
 		iday = 1;
 		iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7;
 		iday += 7 * weekOfMonth;
 	    }
 	    tmpDate = QDate(iyear, imonth, iday);
 
 	    if (tmpDate >= from) {
 		next = tmpDate;
 		if ((next > endDate() ) && hasEndDate() )
 		    return FALSE;
 		return TRUE;
 	    }
 
 	    /* need to find the next iteration */
 	    do {
 		imonth += freq;
 		if (imonth > 12) {
 		    imonth--;
 		    iyear += imonth / 12;
 		    imonth = imonth % 12;
 		    imonth++;
 		}
 		tmpDate = QDate( iyear, imonth, 1 );
 		/* these loops could go for a while, check end case now */
 		if ((tmpDate > endDate()) && hasEndDate() )
 		    return FALSE;
 		iday = 1;
 		iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7;
 		iday += 7 * weekOfMonth;
 	    } while (iday > tmpDate.daysInMonth());
 	    tmpDate = QDate(iyear, imonth, iday);
 
 	    next = tmpDate;
 	    if ((next > endDate()) && hasEndDate() )
 		return FALSE;
 	    return TRUE;
 	case MonthlyDate:
 	    iday = start().day();
 	    iyear = from.year();
 	    imonth = from.month();
 
 	    a = from.year() - start().year();
 	    a *= 12;
 	    a = a + (imonth - start().month());
 	    /* a is e.start()monthsFrom(from); */
 	    if(a % freq) {
 		a = freq - (a % freq);
 		imonth = from.month() + a;
 		if (imonth > 12) {
 		    imonth--;
 		    iyear += imonth / 12;
 		    imonth = imonth % 12;
 		    imonth++;
 		}
 	    }
 	    /* imonth is now the first month after or on
 	       from that matches the frequencey given */
 
 	    /* this could go for a while, worse case, 4*12 iterations, probably */
 	    while(!QDate::isValid(iyear, imonth, iday) ) {
 		imonth += freq;
 		if (imonth > 12) {
 		    imonth--;
 		    iyear += imonth / 12;
 		    imonth = imonth % 12;
 		    imonth++;
 		}
 		/* these loops could go for a while, check end case now */
 		if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() )
 		    return FALSE;
 	    }
 
 	    if(QDate(iyear, imonth, iday) >= from) {
 		/* done */
 		next = QDate(iyear, imonth, iday);
 		if ((next > endDate()) && hasEndDate() )
 		    return FALSE;
 		return TRUE;
 	    }
 
 	    /* ok, need to cycle */
 	    imonth += freq;
 	    imonth--;
 	    iyear += imonth / 12;
 	    imonth = imonth % 12;
 	    imonth++;
 
 	    while(!QDate::isValid(iyear, imonth, iday) ) {
 		imonth += freq;
 		imonth--;
 		iyear += imonth / 12;
 		imonth = imonth % 12;
 		imonth++;
 		if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() )
 		    return FALSE;
 	    }
 
 	    next = QDate(iyear, imonth, iday);
 	    if ((next > endDate()) && hasEndDate() )
 		return FALSE;
 	    return TRUE;
 	case Yearly:
 	    iday = start().day();
 	    imonth = start().month();
 	    iyear = from.year(); // after all, we want to start in this year
 
 	    diff = 1;
 	    if(imonth == 2 && iday > 28) {
 		/* leap year, and it counts, calculate actual frequency */
 		if(freq % 4)
 		    if (freq % 2)
 			freq = freq * 4;
 		    else
 			freq = freq * 2;
 		/* else divides by 4 already, leave freq alone */
 		diff = 4;
 	    }
 
 	    a = from.year() - start().year();
 	    if(a % freq) {
 		a = freq - (a % freq);
 		iyear = iyear + a;
 	    }
 
 	    /* under the assumption we won't hit one of the special not-leap years twice */
 	    if(!QDate::isValid(iyear, imonth, iday)) {
 		/* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */
 		iyear += freq;
 	    }
 
 	    if(QDate(iyear, imonth, iday) >= from) {
 		next = QDate(iyear, imonth, iday);
 
 		if ((next > endDate()) && hasEndDate() )
 		    return FALSE;
 		return TRUE;
 	    }
 	    /* iyear == from.year(), need to advance again */
 	    iyear += freq;
 	    /* under the assumption we won't hit one of the special not-leap years twice */
 	    if(!QDate::isValid(iyear, imonth, iday)) {
 		/* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */
 		iyear += freq;
 	    }
 
 	    next = QDate(iyear, imonth, iday);
 	    if ((next > endDate()) && hasEndDate() )
 		return FALSE;
 	    return TRUE;
 	default:
 	    return FALSE;
     }
 }
 ORecur::RepeatType ORecur::type()const{
     return data->type;
 }
 int ORecur::frequency()const {
     return data->freq;
 }
 int ORecur::position()const {
     return data->pos;
 }
 char ORecur::days() const{
     return data->days;
 }
 bool ORecur::hasEndDate()const {
     return data->hasEnd;
 }
 QDate ORecur::endDate()const {
     return data->end;
 }
 QDate ORecur::start()const{
     return data->start;
 }
 QDateTime ORecur::createdDateTime()const {
     return data->create;
 }
 int ORecur::repetition()const {
     return data->rep;
 }
 QString ORecur::service()const {
     return data->app;
 }
 ORecur::ExceptionList& ORecur::exceptions() {
     return data->list;
 }
 void ORecur::setType( const RepeatType& z) {
     checkOrModify();
     data->type = z;
 }
 void ORecur::setFrequency( int freq ) {
     checkOrModify();
     data->freq = freq;
 }
 void ORecur::setPosition( int pos ) {
     checkOrModify();
     data->pos = pos;
 }
 void ORecur::setDays( char c ) {
     checkOrModify();
     data->days = c;
 }
 void ORecur::setEndDate( const QDate& dt) {
     checkOrModify();
     data->end = dt;
 }
 void ORecur::setCreatedDateTime( const QDateTime& t) {
     checkOrModify();
     data->create = t;
 }
 void ORecur::setHasEndDate( bool b) {
     checkOrModify();
     data->hasEnd = b;
 }
 void ORecur::setRepitition( int rep ) {
     checkOrModify();
     data->rep = rep;
 }
 void ORecur::setService( const QString& app ) {
     checkOrModify();
     data->app = app;
 }
 void ORecur::setStart( const QDate& dt ) {
     checkOrModify();
     data->start = dt;
 }
 void ORecur::checkOrModify() {
     if ( data->count !=  1 ) {
         data->deref();
         Data* d2 = new Data;
         d2->days = data->days;
         d2->type = data->type;
         d2->freq = data->freq;
         d2->pos  = data->pos;
         d2->hasEnd = data->hasEnd;
         d2->end  = data->end;
         d2->create = data->create;
         d2->rep = data->rep;
         d2->app = data->app;
         d2->list = data->list;
         d2->start = data->start;
         data = d2;
     }
 }
 QString ORecur::toString()const {
     QString buf;
+    QMap<int, QString> recMap = toMap();
 
     buf += " rtype=\"";
-    switch ( data->type ) {
-    case ORecur::Daily:
-        buf += "Daily";
-        break;
-    case ORecur::Weekly:
-        buf += "Weekly";
-        break;
-    case ORecur::MonthlyDay:
-        buf += "MonthlyDay";
-        break;
-    case ORecur::MonthlyDate:
-        buf += "MonthlyDate";
-        break;
-    case ORecur::Yearly:
-        buf += "Yearly";
-        break;
-    default:
-        buf += "NoRepeat";
-        break;
-    }
+    buf += recMap[ORecur::RType];
     buf += "\"";
     if (data->days > 0 )
-	buf += " rweekdays=\"" + QString::number( static_cast<int>( data->days ) ) + "\"";
+	buf += " rweekdays=\"" + recMap[ORecur::RWeekdays] + "\"";
     if ( data->pos != 0 )
-	buf += " rposition=\"" + QString::number(data->pos ) + "\"";
+	buf += " rposition=\"" + recMap[ORecur::RPosition] + "\"";
 
-    buf += " rfreq=\"" + QString::number( data->freq ) + "\"";
-    buf += " rhasenddate=\"" + QString::number( static_cast<int>( data->hasEnd ) ) + "\"";
+    buf += " rfreq=\"" + recMap[ORecur::RFreq] + "\"";
+    buf += " rhasenddate=\"" + recMap[ORecur::RHasEndDate]+ "\"";
     if ( data->hasEnd )
 	buf += " enddt=\""
-	       + QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) )
+	       + recMap[ORecur::EndDate]
 	       + "\"";
-    buf += " created=\"" + QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) + "\"";
+    buf += " created=\"" + recMap[ORecur::Created] + "\"";
 
     if ( data->list.isEmpty() ) return buf;
-    // save exceptions list here!!
-    ExceptionList::ConstIterator it;
-    ExceptionList list = data->list;
     buf += " exceptions=\"";
-    QDate date;
-    for ( it = list.begin(); it != list.end(); ++it ) {
-        date = (*it);
-        if ( it != list.begin() ) buf += " ";
-
-        buf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() );
-    }
+    buf += recMap[ORecur::Exceptions];
     buf += "\" ";
 
     return buf;
 }
+
+QString ORecur::rTypeString() const
+{
+	QString retString;
+	switch ( data->type ) {
+	case ORecur::Daily:
+		retString = "Daily";
+		break;
+	case ORecur::Weekly:
+		retString = "Weekly";
+		break;
+	case ORecur::MonthlyDay:
+		retString = "MonthlyDay";
+		break;
+	case ORecur::MonthlyDate:
+		retString = "MonthlyDate";
+		break;
+	case ORecur::Yearly:
+		retString = "Yearly";
+		break;
+	default:
+		retString = "NoRepeat";
+		break;
+
+	}
+
+	return retString;
+}
+
+QMap<QString, ORecur::RepeatType> ORecur::rTypeValueConvertMap() const
+{
+	QMap<QString, RepeatType> convertMap;
+
+	convertMap.insert( QString( "Daily" ), ORecur::Daily );
+	convertMap.insert( QString( "Weekly" ), ORecur::Weekly );
+	convertMap.insert( QString( "MonthlyDay" ), ORecur::MonthlyDay );
+	convertMap.insert( QString( "MonthlyDate" ), ORecur::MonthlyDate );
+	convertMap.insert( QString( "Yearly" ), ORecur::Yearly );
+	convertMap.insert( QString( "NoRepeat" ), ORecur::NoRepeat );
+
+	return convertMap;
+}
+
+
+QMap<int, QString> ORecur::toMap() const
+{
+	QMap<int, QString> retMap;
+	
+	retMap.insert( ORecur::RType, rTypeString() );
+	retMap.insert( ORecur::RWeekdays, QString::number( static_cast<int>( data->days ) ) );
+	retMap.insert( ORecur::RPosition, QString::number(data->pos ) );
+	retMap.insert( ORecur::RFreq, QString::number( data->freq ) );
+	retMap.insert( ORecur::RHasEndDate, QString::number( static_cast<int>( data->hasEnd ) ) );
+	if( data -> hasEnd )
+		retMap.insert( ORecur::EndDate, QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) );
+	retMap.insert( ORecur::Created, QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) );
+	
+	if ( data->list.isEmpty() ) return retMap;
+
+	// save exceptions list here!!
+	ExceptionList::ConstIterator it;
+	ExceptionList list = data->list;
+	QString exceptBuf;
+	QDate date;
+	for ( it = list.begin(); it != list.end(); ++it ) {
+		date = (*it);
+		if ( it != list.begin() ) exceptBuf += " ";
+		
+		exceptBuf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() );
+	}
+
+	retMap.insert( ORecur::Exceptions, exceptBuf );
+
+	return retMap;
+}
+
+void ORecur::fromMap( const QMap<int, QString>& map )
+{
+	QMap<QString, RepeatType> repTypeMap = rTypeValueConvertMap(); 
+
+	data -> type  = repTypeMap[ map [ORecur::RType] ];
+	data -> days  = (char) map[ ORecur::RWeekdays ].toInt();
+	data -> pos   = map[ ORecur::RPosition ].toInt();
+	data -> freq = map[ ORecur::RFreq ].toInt();
+	data -> hasEnd= map[ ORecur::RHasEndDate ].toInt() ? true : false;
+	OTimeZone utc = OTimeZone::utc();
+	if ( data -> hasEnd ){
+		data -> end = utc.fromUTCDateTime( (time_t) map[ ORecur::EndDate ].toLong() ).date();
+	}
+	data -> create = utc.fromUTCDateTime( (time_t) map[ ORecur::Created ].toLong() ).date();
+
+#if 0
+	// FIXME: Exceptions currently not supported...
+	// Convert the list of exceptions from QString into ExceptionList
+	data -> list.clear();
+	QString exceptStr = map[ ORecur::Exceptions ];
+	QStringList exceptList = QStringList::split( " ", exceptStr );
+	...
+#endif
+	
+	
+}
diff --git a/libopie2/opiepim/core/orecur.h b/libopie2/opiepim/core/orecur.h
index b214b3f..47901b0 100644
--- a/libopie2/opiepim/core/orecur.h
+++ b/libopie2/opiepim/core/orecur.h
@@ -1,91 +1,101 @@
 /*
  * GPL from TT
  */
 
 #ifndef OPIE_RECUR_H
 #define OPIE_RECUR_H
 
 #include <sys/types.h>
 
 #include <qdatetime.h>
 #include <qvaluelist.h>
-
+#include <qmap.h>
 
 class ORecur {
 public:
     typedef QValueList<QDate> ExceptionList;
     enum RepeatType{ NoRepeat = -1, Daily, Weekly, MonthlyDay,
                      MonthlyDate, Yearly };
     enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08,
                 FRI = 0x10, SAT = 0x20, SUN = 0x40 };
+    enum Fields{ RType = 0, RWeekdays, RPosition, RFreq, RHasEndDate, 
+		 EndDate, Created, Exceptions };
+
     ORecur();
     ORecur( const ORecur& );
     ~ORecur();
 
     ORecur &operator=( const ORecur& );
     bool operator==(const ORecur& )const;
 
     bool doesRecur()const;
     /* if it recurrs on that day */
     bool doesRecur( const QDate& );
     RepeatType type()const;
     int frequency()const;
     int position()const;
     char days()const;
     bool hasEndDate()const;
     QDate start()const;
     QDate endDate()const;
     QDateTime createdDateTime()const;
     /**
      * starting on monday=0, sunday=6
      * for convience
      */
     bool repeatOnWeekDay( int day )const;
 
     /**
      * FromWhereToStart is not included!!!
      */
     bool nextOcurrence( const QDate& FromWhereToStart, QDate &recurDate );
 
     /**
      * The module this ORecur belongs to
      */
     QString service()const;
 
     /*
      * reference to the exception list
      */
     ExceptionList &exceptions();
 
     /**
      * the current repetition
      */
     int repetition()const;
 
     void setType( const RepeatType& );
     void setFrequency( int freq );
     void setPosition( int pos );
     void setDays( char c);
     void setEndDate( const QDate& dt );
     void setStart( const QDate& dt );
     void setCreatedDateTime( const QDateTime& );
     void setHasEndDate( bool b );
     void setRepitition(int );
 
     void setService( const QString& ser );
+    
+    QMap<int, QString> toMap() const;
+    void fromMap( const QMap<int, QString>& map );
 
     /* almost internal */
     QString toString()const;
 private:
     bool p_nextOccurrence( const QDate& from, QDate& next );
     void deref();
     inline void checkOrModify();
 
+    /* Converts rType to String */
+    QString rTypeString() const;
+    /* Returns a map to convert Stringname for RType to RepeatType */
+    QMap<QString, RepeatType> rTypeValueConvertMap() const;
 
     class Data;
     Data* data;
     class ORecurPrivate;
     ORecurPrivate *d;
 };
 
 #endif
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf
index 04f1c8b..7bc67c7 100644
--- a/mkspecs/qws/macx-generic-g++/qmake.conf
+++ b/mkspecs/qws/macx-generic-g++/qmake.conf
@@ -1,81 +1,81 @@
 #
 # $Id$
 #
 # qmake configuration for macx-g++ with Qt/Embedded
 #
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release
 QMAKE_EXTENSION_SHLIB	= dylib
 
 QMAKE_CC		= $(TB)cc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		= -pipe $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	=
 QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline)
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= $(TB)c++
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) -DQ_OS_MACX -DQT_NO_SOUND -DOPIE_NO_OVERRIDE_QT
+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) -DQ_OS_MACX -DQT_NO_SOUND -DOPIE_NO_OVERRIDE_QT -DOPIE_NO_BACKTRACE
 QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
 QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
-QMAKE_INCDIR		=
-QMAKE_LIBDIR		=
+QMAKE_INCDIR		= /sw/include
+QMAKE_LIBDIR		= /sw/lib
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= $$QMAKE_CXX
 QMAKE_LINK_SHLIB	= $$QMAKE_CXX
 QMAKE_LFLAGS		= $(LFLAGS_EXTRA)
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -dynamiclib 
 QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
 QMAKE_LFLAGS_PLUGIN	= -bundle
 QMAKE_LFLAGS_SONAME	= 
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= 
 
 QMAKE_LIBS		= $(LIBS_EXTRA)
 QMAKE_LIBS_X11		=
 QMAKE_LIBS_X11SM	=
 QMAKE_LIBS_QT		= -lqte
 #QMAKE_LIBS_QT		= libqte.dylib
 QMAKE_LIBS_QT_THREAD	= -lqte-mt
 QMAKE_LIBS_QT_OPENGL	= -lqgl
 QMAKE_LIBS_THREAD	= 
 
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
 QMAKE_TAR		= tar -cf
 QMAKE_GZIP		= gzip -9f
 
 QMAKE_COPY		= cp -f
 QMAKE_MOVE		= mv -f
 QMAKE_DEL_FILE		= rm -f
 QMAKE_DEL_DIR		= rmdir