6 files changed, 38 insertions, 32 deletions
diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h
index 75bb33c..36728b8 100644
--- a/libopie/pim/orecordlist.h
+++ b/libopie/pim/orecordlist.h
@@ -31,25 +31,25 @@ public:
     * The standard c'tor
     */
    ORecordListIterator();
    ~ORecordListIterator();
    ORecordListIterator( const ORecordListIterator& );
    ORecordListIterator &operator=(const ORecordListIterator& );
    /**
     * a * operator ;)
     * use it like this T = (*it);
     */
-    T &operator*();
+    T operator*();
    ORecordListIterator &operator++();
    ORecordListIterator &operator--();
    bool operator==( const ORecordListIterator& it );
    bool operator!=( const ORecordListIterator& it );
 private:
    QArray<int> m_uids;
    int m_current;
    const Base* m_temp;
    bool m_end : 1;
    T m_record;
@@ -90,54 +90,55 @@ public:
    */
 private:
    QArray<int> m_ids;
    const Base* m_acc;
 };
 /* ok now implement it  */
 template <class T>
 ORecordListIterator<T>::ORecordListIterator() {
    m_current = 0;
    m_temp = 0l;
    m_end = true;
+    m_record = T();
 }
 template <class T>
 ORecordListIterator<T>::~ORecordListIterator() {
 /* nothing to delete */
 }
 template <class T>
 ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) {
-    qWarning("ORecordListIterator");
+//    qWarning("ORecordListIterator copy c'tor");
    m_uids = it.m_uids;
    m_current = it.m_current;
    m_temp = it.m_temp;
    m_end = it.m_end;
    m_record = it.m_record;
 }
 template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) {
    m_uids = it.m_uids;
    m_current = it.m_current;
    m_temp = it.m_temp;
    m_end = it.m_end;
-    m_record = it.m_record;
+//    m_record = it.m_record;
    return *this;
 }
 template <class T>
-T &ORecordListIterator<T>::operator*() {
+T ORecordListIterator<T>::operator*() {
-    qWarning("operator* %d %d", m_current,  m_uids[m_current] );
+//    qWarning("operator* %d %d", m_current,  m_uids[m_current] );
    if (!m_end )
        m_record = m_temp->find( m_uids[m_current] );
    else
        m_record = T();
    return m_record;
 }
 template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator++() {
    if (m_current < (int)m_uids.count() ) {
        m_end = false;
@@ -184,25 +185,24 @@ ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids,
 template <class T>
 ORecordList<T>::ORecordList( const QArray<int>& ids,
                             const Base* acc )
    : m_ids( ids ), m_acc( acc )
 {
 }
 template <class T>
 ORecordList<T>::~ORecordList() {
 /* nothing to do here */
 }
 template <class T>
 ORecordList<T>::Iterator ORecordList<T>::begin() {
-    qWarning("ORecordList::begin");
    Iterator it( m_ids, m_acc );
    return it;
 }
 template <class T>
 ORecordList<T>::Iterator ORecordList<T>::end() {
    Iterator it( m_ids, m_acc );
    it.m_end = true;
    it.m_current = m_ids.count();
    return it;
 }
 #endif
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index b3c14e6..cc46b21 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -27,71 +27,72 @@ struct OTodo::OTodoData : public QShared {
    QString desc;
    QString sum;
    QMap<QString, QString> extra;
    ushort prog;
    bool hasAlarmDateTime :1;
    QDateTime alarmDateTime;
 };
 OTodo::OTodo(const OTodo &event )
    : OPimRecord( event ),  data( event.data )
 {
    data->ref();
-    qWarning("ref up");
+//    qWarning("ref up");
 }
 OTodo::~OTodo() {
-    qWarning("~OTodo " + data->sum );
+//    qWarning("~OTodo "  );
    if ( data->deref() ) {
-        qWarning("OTodo::dereffing");
+//        qWarning("OTodo::dereffing");
        delete data;
        data = 0l;
    }
 }
 OTodo::OTodo(bool completed, int priority,
                     const QArray<int> &category,
                     const QString& summary,
                     const QString &description,
                     ushort progress,
                     bool hasDate, QDate date, int uid )
    : OPimRecord(  uid )
 {
-    qWarning("OTodoData " + summary);
+//    qWarning("OTodoData " + summary);
    setCategories( category );
    data = new OTodoData;
    data->date = date;
    data->isCompleted = completed;
    data->hasDate = hasDate;
    data->priority = priority;
    data->sum = summary;
    data->prog = progress;
    data->desc = Qtopia::simplifyMultiLineSpace(description );
    data->hasAlarmDateTime = false;
 }
 OTodo::OTodo(bool completed, int priority,
                     const QStringList &category,
                     const QString& summary,
                     const QString &description,
                     ushort progress,
                     bool hasDate, QDate date, int uid )
    : OPimRecord(  uid )
 {
-    qWarning("OTodoData" + summary);
+//    qWarning("OTodoData" + summary);
    setCategories( idsFromString( category.join(";") ) );
    data = new OTodoData;
-    data->date = date;
+    data->date = date;
    data->isCompleted = completed;
    data->hasDate = hasDate;
    data->priority = priority;
    data->sum = summary;
    data->prog = progress;
    data->desc = Qtopia::simplifyMultiLineSpace(description );
    data->hasAlarmDateTime = false;
 }
 bool OTodo::match( const QRegExp &regExp )const
 {
  if( QString::number( data->priority ).find( regExp ) != -1 ){
@@ -151,24 +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 );
    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;
@@ -302,33 +304,34 @@ bool OTodo::operator==(const OTodo &toDoEvent )const
        return false;
    if ( data->alarmDateTime != toDoEvent.data->alarmDateTime )
        return false;
    return OPimRecord::operator==( toDoEvent );
 }
 void OTodo::deref() {
    //qWarning("deref in ToDoEvent");
    if ( data->deref() ) {
        //qWarning("deleting");
        delete data;
-        d= 0;
+        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() ) );
    map.insert( Category,  idsToString( categories() ) );
    map.insert( HasDate, QString::number( data->hasDate ) );
    map.insert( Completed, QString::number( data->isCompleted ) );
    map.insert( Description, data->desc );
@@ -346,25 +349,25 @@ QMap<int, QString> OTodo::toMap() const {
 }
 QMap<QString, QString> OTodo::toExtraMap()const {
    return data->extra;
 }
 /**
 *  change or modify looks at the ref count and either
 *  creates a new QShared Object or it can modify it
 * right in place
 */
 void OTodo::changeOrModify() {
    if ( data->count != 1 ) {
-        qWarning("changeOrModify");
+//        qWarning("changeOrModify");
        data->deref();
        OTodoData* d2 = new OTodoData();
        copy(data, d2 );
        data = d2;
    }
 }
 void OTodo::copy( OTodoData* src, OTodoData* dest ) {
    dest->date = src->date;
    dest->isCompleted = src->isCompleted;
    dest->hasDate = src->hasDate;
    dest->priority = src->priority;
    dest->desc = src->desc;
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp
index 21756c9..3a72881 100644
--- a/libopie/pim/otodoaccessxml.cpp
+++ b/libopie/pim/otodoaccessxml.cpp
@@ -59,32 +59,32 @@ 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();
        }
-        return true;
    }else {
        qWarning("could not parse");
        return false;;
    }
    delete root;
    m_opened = true;
+    qWarning("Access %d" + m_events.count() );
    return true;
 }
 bool OTodoAccessXML::reload() {
    return load();
 }
 bool OTodoAccessXML::save() {
    if (!m_opened || !m_changed )
        return true;
    QString strNewFile = m_file + ".new";
    QFile f( strNewFile );
    if (!f.open( IO_WriteOnly|IO_Raw ) )
        return false;
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 21756c9..3a72881 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -59,32 +59,32 @@ 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();
        }
-        return true;
    }else {
        qWarning("could not parse");
        return false;;
    }
    delete root;
    m_opened = true;
+    qWarning("Access %d" + m_events.count() );
    return true;
 }
 bool OTodoAccessXML::reload() {
    return load();
 }
 bool OTodoAccessXML::save() {
    if (!m_opened || !m_changed )
        return true;
    QString strNewFile = m_file + ".new";
    QFile f( strNewFile );
    if (!f.open( IO_WriteOnly|IO_Raw ) )
        return false;
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index 75bb33c..36728b8 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -31,25 +31,25 @@ public:
     * The standard c'tor
     */
    ORecordListIterator();
    ~ORecordListIterator();
    ORecordListIterator( const ORecordListIterator& );
    ORecordListIterator &operator=(const ORecordListIterator& );
    /**
     * a * operator ;)
     * use it like this T = (*it);
     */
-    T &operator*();
+    T operator*();
    ORecordListIterator &operator++();
    ORecordListIterator &operator--();
    bool operator==( const ORecordListIterator& it );
    bool operator!=( const ORecordListIterator& it );
 private:
    QArray<int> m_uids;
    int m_current;
    const Base* m_temp;
    bool m_end : 1;
    T m_record;
@@ -90,54 +90,55 @@ public:
    */
 private:
    QArray<int> m_ids;
    const Base* m_acc;
 };
 /* ok now implement it  */
 template <class T>
 ORecordListIterator<T>::ORecordListIterator() {
    m_current = 0;
    m_temp = 0l;
    m_end = true;
+    m_record = T();
 }
 template <class T>
 ORecordListIterator<T>::~ORecordListIterator() {
 /* nothing to delete */
 }
 template <class T>
 ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) {
-    qWarning("ORecordListIterator");
+//    qWarning("ORecordListIterator copy c'tor");
    m_uids = it.m_uids;
    m_current = it.m_current;
    m_temp = it.m_temp;
    m_end = it.m_end;
    m_record = it.m_record;
 }
 template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) {
    m_uids = it.m_uids;
    m_current = it.m_current;
    m_temp = it.m_temp;
    m_end = it.m_end;
-    m_record = it.m_record;
+//    m_record = it.m_record;
    return *this;
 }
 template <class T>
-T &ORecordListIterator<T>::operator*() {
+T ORecordListIterator<T>::operator*() {
-    qWarning("operator* %d %d", m_current,  m_uids[m_current] );
+//    qWarning("operator* %d %d", m_current,  m_uids[m_current] );
    if (!m_end )
        m_record = m_temp->find( m_uids[m_current] );
    else
        m_record = T();
    return m_record;
 }
 template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator++() {
    if (m_current < (int)m_uids.count() ) {
        m_end = false;
@@ -184,25 +185,24 @@ ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids,
 template <class T>
 ORecordList<T>::ORecordList( const QArray<int>& ids,
                             const Base* acc )
    : m_ids( ids ), m_acc( acc )
 {
 }
 template <class T>
 ORecordList<T>::~ORecordList() {
 /* nothing to do here */
 }
 template <class T>
 ORecordList<T>::Iterator ORecordList<T>::begin() {
-    qWarning("ORecordList::begin");
    Iterator it( m_ids, m_acc );
    return it;
 }
 template <class T>
 ORecordList<T>::Iterator ORecordList<T>::end() {
    Iterator it( m_ids, m_acc );
    it.m_end = true;
    it.m_current = m_ids.count();
    return it;
 }
 #endif
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index b3c14e6..cc46b21 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -27,71 +27,72 @@ struct OTodo::OTodoData : public QShared {
    QString desc;
    QString sum;
    QMap<QString, QString> extra;
    ushort prog;
    bool hasAlarmDateTime :1;
    QDateTime alarmDateTime;
 };
 OTodo::OTodo(const OTodo &event )
    : OPimRecord( event ),  data( event.data )
 {
    data->ref();
-    qWarning("ref up");
+//    qWarning("ref up");
 }
 OTodo::~OTodo() {
-    qWarning("~OTodo " + data->sum );
+//    qWarning("~OTodo "  );
    if ( data->deref() ) {
-        qWarning("OTodo::dereffing");
+//        qWarning("OTodo::dereffing");
        delete data;
        data = 0l;
    }
 }
 OTodo::OTodo(bool completed, int priority,
                     const QArray<int> &category,
                     const QString& summary,
                     const QString &description,
                     ushort progress,
                     bool hasDate, QDate date, int uid )
    : OPimRecord(  uid )
 {
-    qWarning("OTodoData " + summary);
+//    qWarning("OTodoData " + summary);
    setCategories( category );
    data = new OTodoData;
    data->date = date;
    data->isCompleted = completed;
    data->hasDate = hasDate;
    data->priority = priority;
    data->sum = summary;
    data->prog = progress;
    data->desc = Qtopia::simplifyMultiLineSpace(description );
    data->hasAlarmDateTime = false;
 }
 OTodo::OTodo(bool completed, int priority,
                     const QStringList &category,
                     const QString& summary,
                     const QString &description,
                     ushort progress,
                     bool hasDate, QDate date, int uid )
    : OPimRecord(  uid )
 {
-    qWarning("OTodoData" + summary);
+//    qWarning("OTodoData" + summary);
    setCategories( idsFromString( category.join(";") ) );
    data = new OTodoData;
-    data->date = date;
+    data->date = date;
    data->isCompleted = completed;
    data->hasDate = hasDate;
    data->priority = priority;
    data->sum = summary;
    data->prog = progress;
    data->desc = Qtopia::simplifyMultiLineSpace(description );
    data->hasAlarmDateTime = false;
 }
 bool OTodo::match( const QRegExp &regExp )const
 {
  if( QString::number( data->priority ).find( regExp ) != -1 ){
@@ -151,24 +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 );
    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;
@@ -302,33 +304,34 @@ bool OTodo::operator==(const OTodo &toDoEvent )const
        return false;
    if ( data->alarmDateTime != toDoEvent.data->alarmDateTime )
        return false;
    return OPimRecord::operator==( toDoEvent );
 }
 void OTodo::deref() {
    //qWarning("deref in ToDoEvent");
    if ( data->deref() ) {
        //qWarning("deleting");
        delete data;
-        d= 0;
+        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() ) );
    map.insert( Category,  idsToString( categories() ) );
    map.insert( HasDate, QString::number( data->hasDate ) );
    map.insert( Completed, QString::number( data->isCompleted ) );
    map.insert( Description, data->desc );
@@ -346,25 +349,25 @@ QMap<int, QString> OTodo::toMap() const {
 }
 QMap<QString, QString> OTodo::toExtraMap()const {
    return data->extra;
 }
 /**
 *  change or modify looks at the ref count and either
 *  creates a new QShared Object or it can modify it
 * right in place
 */
 void OTodo::changeOrModify() {
    if ( data->count != 1 ) {
-        qWarning("changeOrModify");
+//        qWarning("changeOrModify");
        data->deref();
        OTodoData* d2 = new OTodoData();
        copy(data, d2 );
        data = d2;
    }
 }
 void OTodo::copy( OTodoData* src, OTodoData* dest ) {
    dest->date = src->date;
    dest->isCompleted = src->isCompleted;
    dest->hasDate = src->hasDate;
    dest->priority = src->priority;
    dest->desc = src->desc;