10 files changed, 40 insertions, 26 deletions
diff --git a/libopie/pim/opimrecord.cpp b/libopie/pim/opimrecord.cpp
index 60cdbf3..62dc353 100644
--- a/libopie/pim/opimrecord.cpp
+++ b/libopie/pim/opimrecord.cpp
@@ -113,21 +113,22 @@ QString OPimRecord::crossToString()const {
        QArray<int> id = it.data();
        for ( uint i = 0; i < id.size(); ++i ) {
            str += it.key() + "," + QString::number( i ) + ";";
        }
    }
    str = str.remove( str.length()-1, 1); // strip the ;
    //qWarning("IDS " + str );
    return str;
 }
 /* if uid = 1 assign a new one */
 void OPimRecord::setUid( int uid ) {
+//    qWarning("setting uid" );
    if ( uid == 1)
        uid = uidGen().generate();
+//    qWarning(" uid %d",  uid);
    Qtopia::Record::setUid( uid );
 };
 Qtopia::UidGen &OPimRecord::uidGen() {
    return m_uidGen;
 }
diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h
index 36728b8..1795938 100644
--- a/libopie/pim/orecordlist.h
+++ b/libopie/pim/orecordlist.h
@@ -62,24 +62,26 @@ private:
 * The recordlist used as a return type
 * from OPimAccessTemplate
 */
 template <class T = OPimRecord >
 class ORecordList {
 public:
    typedef OTemplateBase<T> Base;
    typedef ORecordListIterator<T> Iterator;
    /**
     * c'tor
     */
+    ORecordList () {
+    }
    ORecordList( const QArray<int>& ids,
                 const Base* );
    ~ORecordList();
    /**
     * the first iterator
     */
    Iterator begin();
    /**
     * the end
     */
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index cc46b21..6dd4c0e 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -152,25 +152,25 @@ void OTodo::setCompleted( bool completed )
 void OTodo::setHasDueDate( bool hasDate )
 {
    changeOrModify();
    data->hasDate = hasDate;
 }
 void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime )
 {
    changeOrModify();
    data->hasAlarmDateTime = hasAlarmDateTime;
 }
 void OTodo::setDescription(const QString &desc )
 {
-    qWarning( "desc " + desc );
+//    qWarning( "desc " + desc );
    changeOrModify();
    data->desc = Qtopia::simplifyMultiLineSpace(desc );
 }
 void OTodo::setSummary( const QString& sum )
 {
    changeOrModify();
    data->sum = sum;
 }
 void OTodo::setPriority(int prio )
 {
    changeOrModify();
    data->priority = prio;
@@ -309,25 +309,25 @@ bool OTodo::operator==(const OTodo &toDoEvent )const
 }
 void OTodo::deref() {
 //    qWarning("deref in ToDoEvent");
    if ( data->deref() ) {
 //        qWarning("deleting");
        delete data;
        data= 0;
    }
 }
 OTodo &OTodo::operator=(const OTodo &item )
 {
-//    OPimRecord::operator=( item );
+    OPimRecord::operator=( item );
    //qWarning("operator= ref ");
    item.data->ref();
    deref();
    data = item.data;
    return *this;
 }
 QMap<int, QString> OTodo::toMap() const {
    QMap<int, QString> map;
    map.insert( Uid, QString::number( uid() ) );
diff --git a/libopie/pim/otodoaccess.cpp b/libopie/pim/otodoaccess.cpp
index a65cf5c..8ec09bc 100644
--- a/libopie/pim/otodoaccess.cpp
+++ b/libopie/pim/otodoaccess.cpp
@@ -6,25 +6,25 @@
 #include "otodoaccess.h"
 OTodoAccess::OTodoAccess( OTodoAccessBackend* end )
    : QObject(), OPimAccessTemplate<OTodo>( end ),  m_todoBackEnd( end )
 {
    if (end == 0l )
        m_todoBackEnd = new OTodoAccessXML( "Todolist" );
    setBackEnd( m_todoBackEnd );
 }
 OTodoAccess::~OTodoAccess() {
-    qWarning("~OTodoAccess");
+//    qWarning("~OTodoAccess");
 }
 void OTodoAccess::mergeWith( const QValueList<OTodo>& list ) {
    QValueList<OTodo>::ConstIterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        replace( (*it) );
    }
 }
 OTodoAccess::List OTodoAccess::effectiveToDos( const QDate& start,
                                               const QDate& end,
                                               bool includeNoDates ) {
    QArray<int> ints = m_todoBackEnd->effectiveToDos( start, end, includeNoDates );
@@ -54,18 +54,18 @@ void OTodoAccess::addAlarm( const OTodo& event) {
    }
 }
 void OTodoAccess::delAlarm( int uid) {
    QDateTime schedule; // Create null DateTime
    // I hope this will remove all scheduled alarms
    // with the given uid !?
    // If not: I have to rethink how to remove already
    // scheduled events... (se)
    //  it should be fine -zecke
-    qWarning("Removing alarm for event with uid %d", uid );
+//    qWarning("Removing alarm for event with uid %d", uid );
    AlarmServer::deleteAlarm( schedule ,
                              "QPE/Application/todolist",
                              "alarm(QDateTime,int)", uid );
 }
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp
index 3a72881..5fe733c 100644
--- a/libopie/pim/otodoaccessxml.cpp
+++ b/libopie/pim/otodoaccessxml.cpp
@@ -12,25 +12,25 @@ OTodoAccessXML::OTodoAccessXML( const QString& appName,
                                const QString& fileName )
    : OTodoAccessBackend(), m_app( appName ),  m_opened( false ), m_changed( false )
 {
    if (!fileName.isEmpty() )
        m_file = fileName;
    else
        m_file = Global::applicationFileName( "todolist", "todolist.xml" );
 }
 OTodoAccessXML::~OTodoAccessXML() {
 }
 bool OTodoAccessXML::load() {
-    m_opened = false;
+    m_opened = true;
    m_changed = false;
    /* initialize dict */
    /*
     * UPDATE dict if you change anything!!!
     */
    QAsciiDict<int> dict(15);
    dict.setAutoDelete( TRUE );
    dict.insert("Categories" ,     new int(OTodo::Category)         );
    dict.insert("Uid" ,            new int(OTodo::Uid)              );
    dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
    dict.insert("Completed" ,      new int(OTodo::Completed)        );
    dict.insert("Description" ,    new int(OTodo::Description)      );
@@ -60,39 +60,41 @@ bool OTodoAccessXML::load() {
        while ( element ) {
            if ( element->tagName() != QString::fromLatin1("Task") ) {
                element = element->nextChild();
                continue;
            }
            /* here is the right element for a task */
            OTodo ev = todo( &dict, element );
            m_events.insert( ev.uid(), ev );
            element = element->nextChild();
        }
    }else {
-        qWarning("could not parse");
+//        qWarning("could not parse");
        return false;;
    }
    delete root;
-    m_opened = true;
+//    qWarning("Access %d" + m_events.count() );
-    qWarning("Access %d" + m_events.count() );
    return true;
 }
 bool OTodoAccessXML::reload() {
    return load();
 }
 bool OTodoAccessXML::save() {
-    if (!m_opened || !m_changed )
+//    qWarning("saving");
+    if (!m_opened || !m_changed ) {
+//        qWarning("not saving");
        return true;
+    }
    QString strNewFile = m_file + ".new";
    QFile f( strNewFile );
    if (!f.open( IO_WriteOnly|IO_Raw ) )
        return false;
    int written;
    QString out;
    out = "<!DOCTYPE Tasks>\n<Tasks>\n";
    // for all todos
    QMap<int, OTodo>::Iterator it;
    for (it = m_events.begin(); it != m_events.end(); ++it ) {
@@ -113,25 +115,25 @@ bool OTodoAccessXML::save() {
    QCString cstr = out.utf8();
    written = f.writeBlock( cstr.data(), cstr.length() );
    if ( written != (int)cstr.length() ) {
        f.close();
        QFile::remove( strNewFile );
        return false;
    }
    /* flush before renaming */
    f.close();
    if( ::rename( strNewFile.latin1(),  m_file.latin1() ) < 0 ) {
-        qWarning("error renaming");
+//        qWarning("error renaming");
        QFile::remove( strNewFile );
    }
    m_changed = false;
    return true;
 }
 QArray<int> OTodoAccessXML::allRecords()const {
    QArray<int> ids( m_events.count() );
    QMap<int, OTodo>::ConstIterator it;
    int i = 0;
    for ( it = m_events.begin(); it != m_events.end(); ++it ) {
@@ -151,24 +153,25 @@ OTodo OTodoAccessXML::find( int uid )const {
    if ( it != m_events.end() )
        todo = it.data();
    return todo;
 }
 void OTodoAccessXML::clear() {
    if (m_opened )
        m_changed = true;
    m_events.clear();
 }
 bool OTodoAccessXML::add( const OTodo& todo ) {
+//    qWarning("add");
    m_changed = true;
    m_events.insert( todo.uid(), todo );
    return true;
 }
 bool OTodoAccessXML::remove( int uid ) {
    m_changed = true;
    m_events.remove( uid );
    return true;
 }
 bool OTodoAccessXML::replace( const OTodo& todo) {
@@ -208,36 +211,36 @@ QArray<int> OTodoAccessXML::overDue() {
        if ( it.data().isOverdue() ) {
            ids[i] = it.key();
            i++;
        }
    }
    ids.resize( i );
    return ids;
 }
 /* private */
 OTodo OTodoAccessXML::todo( QAsciiDict<int>* dict, Opie::XMLElement* element)const {
-    qWarning("parse to do from XMLElement" );
+//    qWarning("parse to do from XMLElement" );
    OTodo ev;
    QMap<QString, QString> attributes = element->attributes();
    QMap<QString, QString>::Iterator it;
    int *find=0;
    int day, month, year;
    day = month = year = -1;
    for ( it = attributes.begin(); it != attributes.end(); ++it ) {
        find = (*dict)[ it.key() ];
        if (!find ) {
-            qWarning("Unknown option" + it.key() );
+//            qWarning("Unknown option" + it.key() );
            ev.setCustomField( it.key(), it.data() );
            continue;
        }
        switch( *find ) {
        case OTodo::Uid:
            ev.setUid( it.data().toInt() );
            break;
        case OTodo::Category:
            ev.setCategories( ev.idsFromString( it.data() ) );
            break;
        case OTodo::HasDate:
@@ -311,24 +314,25 @@ QString OTodoAccessXML::toString( const OTodo& ev )const {
    str += "Priority=\"" + QString::number( ev.priority() ) + "\" ";
    str += "Progress=\"" + QString::number(ev.progress() ) + "\" ";
    str += "Categories=\"" + toString( ev.categories() ) + "\" ";
    str += "Description=\"" + Qtopia::escapeString( ev.description() ) + "\" ";
    str += "Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\" ";
    if ( ev.hasDueDate() ) {
        str += "DateYear=\"" + QString::number( ev.dueDate().year() ) + "\" ";
        str += "DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\" ";
        str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" ";
    }
+//    qWarning( "Uid %d",  ev.uid() );
    str += "Uid=\"" + QString::number( ev.uid() ) + "\" ";
 // append the extra options
    /* FIXME Qtopia::Record this is currently not
     * possible you can set custom fields
     * but don' iterate over the list
     * I may do #define private protected
     * for this case - cough  --zecke
     */
    /*
    QMap<QString, QString> extras = ev.extras();
    QMap<QString, QString>::Iterator extIt;
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 3a72881..5fe733c 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -12,25 +12,25 @@ OTodoAccessXML::OTodoAccessXML( const QString& appName,
                                const QString& fileName )
    : OTodoAccessBackend(), m_app( appName ),  m_opened( false ), m_changed( false )
 {
    if (!fileName.isEmpty() )
        m_file = fileName;
    else
        m_file = Global::applicationFileName( "todolist", "todolist.xml" );
 }
 OTodoAccessXML::~OTodoAccessXML() {
 }
 bool OTodoAccessXML::load() {
-    m_opened = false;
+    m_opened = true;
    m_changed = false;
    /* initialize dict */
    /*
     * UPDATE dict if you change anything!!!
     */
    QAsciiDict<int> dict(15);
    dict.setAutoDelete( TRUE );
    dict.insert("Categories" ,     new int(OTodo::Category)         );
    dict.insert("Uid" ,            new int(OTodo::Uid)              );
    dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
    dict.insert("Completed" ,      new int(OTodo::Completed)        );
    dict.insert("Description" ,    new int(OTodo::Description)      );
@@ -60,39 +60,41 @@ bool OTodoAccessXML::load() {
        while ( element ) {
            if ( element->tagName() != QString::fromLatin1("Task") ) {
                element = element->nextChild();
                continue;
            }
            /* here is the right element for a task */
            OTodo ev = todo( &dict, element );
            m_events.insert( ev.uid(), ev );
            element = element->nextChild();
        }
    }else {
-        qWarning("could not parse");
+//        qWarning("could not parse");
        return false;;
    }
    delete root;
-    m_opened = true;
+//    qWarning("Access %d" + m_events.count() );
-    qWarning("Access %d" + m_events.count() );
    return true;
 }
 bool OTodoAccessXML::reload() {
    return load();
 }
 bool OTodoAccessXML::save() {
-    if (!m_opened || !m_changed )
+//    qWarning("saving");
+    if (!m_opened || !m_changed ) {
+//        qWarning("not saving");
        return true;
+    }
    QString strNewFile = m_file + ".new";
    QFile f( strNewFile );
    if (!f.open( IO_WriteOnly|IO_Raw ) )
        return false;
    int written;
    QString out;
    out = "<!DOCTYPE Tasks>\n<Tasks>\n";
    // for all todos
    QMap<int, OTodo>::Iterator it;
    for (it = m_events.begin(); it != m_events.end(); ++it ) {
@@ -113,25 +115,25 @@ bool OTodoAccessXML::save() {
    QCString cstr = out.utf8();
    written = f.writeBlock( cstr.data(), cstr.length() );
    if ( written != (int)cstr.length() ) {
        f.close();
        QFile::remove( strNewFile );
        return false;
    }
    /* flush before renaming */
    f.close();
    if( ::rename( strNewFile.latin1(),  m_file.latin1() ) < 0 ) {
-        qWarning("error renaming");
+//        qWarning("error renaming");
        QFile::remove( strNewFile );
    }
    m_changed = false;
    return true;
 }
 QArray<int> OTodoAccessXML::allRecords()const {
    QArray<int> ids( m_events.count() );
    QMap<int, OTodo>::ConstIterator it;
    int i = 0;
    for ( it = m_events.begin(); it != m_events.end(); ++it ) {
@@ -151,24 +153,25 @@ OTodo OTodoAccessXML::find( int uid )const {
    if ( it != m_events.end() )
        todo = it.data();
    return todo;
 }
 void OTodoAccessXML::clear() {
    if (m_opened )
        m_changed = true;
    m_events.clear();
 }
 bool OTodoAccessXML::add( const OTodo& todo ) {
+//    qWarning("add");
    m_changed = true;
    m_events.insert( todo.uid(), todo );
    return true;
 }
 bool OTodoAccessXML::remove( int uid ) {
    m_changed = true;
    m_events.remove( uid );
    return true;
 }
 bool OTodoAccessXML::replace( const OTodo& todo) {
@@ -208,36 +211,36 @@ QArray<int> OTodoAccessXML::overDue() {
        if ( it.data().isOverdue() ) {
            ids[i] = it.key();
            i++;
        }
    }
    ids.resize( i );
    return ids;
 }
 /* private */
 OTodo OTodoAccessXML::todo( QAsciiDict<int>* dict, Opie::XMLElement* element)const {
-    qWarning("parse to do from XMLElement" );
+//    qWarning("parse to do from XMLElement" );
    OTodo ev;
    QMap<QString, QString> attributes = element->attributes();
    QMap<QString, QString>::Iterator it;
    int *find=0;
    int day, month, year;
    day = month = year = -1;
    for ( it = attributes.begin(); it != attributes.end(); ++it ) {
        find = (*dict)[ it.key() ];
        if (!find ) {
-            qWarning("Unknown option" + it.key() );
+//            qWarning("Unknown option" + it.key() );
            ev.setCustomField( it.key(), it.data() );
            continue;
        }
        switch( *find ) {
        case OTodo::Uid:
            ev.setUid( it.data().toInt() );
            break;
        case OTodo::Category:
            ev.setCategories( ev.idsFromString( it.data() ) );
            break;
        case OTodo::HasDate:
@@ -311,24 +314,25 @@ QString OTodoAccessXML::toString( const OTodo& ev )const {
    str += "Priority=\"" + QString::number( ev.priority() ) + "\" ";
    str += "Progress=\"" + QString::number(ev.progress() ) + "\" ";
    str += "Categories=\"" + toString( ev.categories() ) + "\" ";
    str += "Description=\"" + Qtopia::escapeString( ev.description() ) + "\" ";
    str += "Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\" ";
    if ( ev.hasDueDate() ) {
        str += "DateYear=\"" + QString::number( ev.dueDate().year() ) + "\" ";
        str += "DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\" ";
        str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" ";
    }
+//    qWarning( "Uid %d",  ev.uid() );
    str += "Uid=\"" + QString::number( ev.uid() ) + "\" ";
 // append the extra options
    /* FIXME Qtopia::Record this is currently not
     * possible you can set custom fields
     * but don' iterate over the list
     * I may do #define private protected
     * for this case - cough  --zecke
     */
    /*
    QMap<QString, QString> extras = ev.extras();
    QMap<QString, QString>::Iterator extIt;
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp
index 60cdbf3..62dc353 100644
--- a/libopie2/opiepim/core/opimrecord.cpp
+++ b/libopie2/opiepim/core/opimrecord.cpp
@@ -113,21 +113,22 @@ QString OPimRecord::crossToString()const {
        QArray<int> id = it.data();
        for ( uint i = 0; i < id.size(); ++i ) {
            str += it.key() + "," + QString::number( i ) + ";";
        }
    }
    str = str.remove( str.length()-1, 1); // strip the ;
    //qWarning("IDS " + str );
    return str;
 }
 /* if uid = 1 assign a new one */
 void OPimRecord::setUid( int uid ) {
+//    qWarning("setting uid" );
    if ( uid == 1)
        uid = uidGen().generate();
+//    qWarning(" uid %d",  uid);
    Qtopia::Record::setUid( uid );
 };
 Qtopia::UidGen &OPimRecord::uidGen() {
    return m_uidGen;
 }
diff --git a/libopie2/opiepim/core/otodoaccess.cpp b/libopie2/opiepim/core/otodoaccess.cpp
index a65cf5c..8ec09bc 100644
--- a/libopie2/opiepim/core/otodoaccess.cpp
+++ b/libopie2/opiepim/core/otodoaccess.cpp
@@ -6,25 +6,25 @@
 #include "otodoaccess.h"
 OTodoAccess::OTodoAccess( OTodoAccessBackend* end )
    : QObject(), OPimAccessTemplate<OTodo>( end ),  m_todoBackEnd( end )
 {
    if (end == 0l )
        m_todoBackEnd = new OTodoAccessXML( "Todolist" );
    setBackEnd( m_todoBackEnd );
 }
 OTodoAccess::~OTodoAccess() {
-    qWarning("~OTodoAccess");
+//    qWarning("~OTodoAccess");
 }
 void OTodoAccess::mergeWith( const QValueList<OTodo>& list ) {
    QValueList<OTodo>::ConstIterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        replace( (*it) );
    }
 }
 OTodoAccess::List OTodoAccess::effectiveToDos( const QDate& start,
                                               const QDate& end,
                                               bool includeNoDates ) {
    QArray<int> ints = m_todoBackEnd->effectiveToDos( start, end, includeNoDates );
@@ -54,18 +54,18 @@ void OTodoAccess::addAlarm( const OTodo& event) {
    }
 }
 void OTodoAccess::delAlarm( int uid) {
    QDateTime schedule; // Create null DateTime
    // I hope this will remove all scheduled alarms
    // with the given uid !?
    // If not: I have to rethink how to remove already
    // scheduled events... (se)
    //  it should be fine -zecke
-    qWarning("Removing alarm for event with uid %d", uid );
+//    qWarning("Removing alarm for event with uid %d", uid );
    AlarmServer::deleteAlarm( schedule ,
                              "QPE/Application/todolist",
                              "alarm(QDateTime,int)", uid );
 }
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index 36728b8..1795938 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -62,24 +62,26 @@ private:
 * The recordlist used as a return type
 * from OPimAccessTemplate
 */
 template <class T = OPimRecord >
 class ORecordList {
 public:
    typedef OTemplateBase<T> Base;
    typedef ORecordListIterator<T> Iterator;
    /**
     * c'tor
     */
+    ORecordList () {
+    }
    ORecordList( const QArray<int>& ids,
                 const Base* );
    ~ORecordList();
    /**
     * the first iterator
     */
    Iterator begin();
    /**
     * the end
     */
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index cc46b21..6dd4c0e 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -152,25 +152,25 @@ void OTodo::setCompleted( bool completed )
 void OTodo::setHasDueDate( bool hasDate )
 {
    changeOrModify();
    data->hasDate = hasDate;
 }
 void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime )
 {
    changeOrModify();
    data->hasAlarmDateTime = hasAlarmDateTime;
 }
 void OTodo::setDescription(const QString &desc )
 {
-    qWarning( "desc " + desc );
+//    qWarning( "desc " + desc );
    changeOrModify();
    data->desc = Qtopia::simplifyMultiLineSpace(desc );
 }
 void OTodo::setSummary( const QString& sum )
 {
    changeOrModify();
    data->sum = sum;
 }
 void OTodo::setPriority(int prio )
 {
    changeOrModify();
    data->priority = prio;
@@ -309,25 +309,25 @@ bool OTodo::operator==(const OTodo &toDoEvent )const
 }
 void OTodo::deref() {
 //    qWarning("deref in ToDoEvent");
    if ( data->deref() ) {
 //        qWarning("deleting");
        delete data;
        data= 0;
    }
 }
 OTodo &OTodo::operator=(const OTodo &item )
 {
-//    OPimRecord::operator=( item );
+    OPimRecord::operator=( item );
    //qWarning("operator= ref ");
    item.data->ref();
    deref();
    data = item.data;
    return *this;
 }
 QMap<int, QString> OTodo::toMap() const {
    QMap<int, QString> map;
    map.insert( Uid, QString::number( uid() ) );