Updates

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
@@ -117,17 +117,18 @@ QString OPimRecord::crossToString()const {
     }
     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
@@ -66,16 +66,18 @@ 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();
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
@@ -156,17 +156,17 @@ void OTodo::setHasDueDate( bool 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;
 }
@@ -313,17 +313,17 @@ void OTodo::deref() {
     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;
 }
 
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
@@ -10,17 +10,17 @@ 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,
@@ -58,14 +58,14 @@ 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
@@ -16,17 +16,17 @@ OTodoAccessXML::OTodoAccessXML( const QString& appName,
         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)         );
@@ -64,31 +64,33 @@ bool OTodoAccessXML::load() {
             }
             /* 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";
@@ -117,17 +119,17 @@ bool OTodoAccessXML::save() {
         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() );
@@ -155,16 +157,17 @@ OTodo OTodoAccessXML::find( int uid )const {
 }
 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 );
@@ -212,28 +215,28 @@ QArray<int> OTodoAccessXML::overDue() {
     }
     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;
@@ -315,16 +318,17 @@ QString OTodoAccessXML::toString( const OTodo& ev )const {
     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
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
@@ -16,17 +16,17 @@ OTodoAccessXML::OTodoAccessXML( const QString& appName,
         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)         );
@@ -64,31 +64,33 @@ bool OTodoAccessXML::load() {
             }
             /* 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";
@@ -117,17 +119,17 @@ bool OTodoAccessXML::save() {
         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() );
@@ -155,16 +157,17 @@ OTodo OTodoAccessXML::find( int uid )const {
 }
 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 );
@@ -212,28 +215,28 @@ QArray<int> OTodoAccessXML::overDue() {
     }
     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;
@@ -315,16 +318,17 @@ QString OTodoAccessXML::toString( const OTodo& ev )const {
     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
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
@@ -117,17 +117,18 @@ QString OPimRecord::crossToString()const {
     }
     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
@@ -10,17 +10,17 @@ 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,
@@ -58,14 +58,14 @@ 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
@@ -66,16 +66,18 @@ 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();
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
@@ -156,17 +156,17 @@ void OTodo::setHasDueDate( bool 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;
 }
@@ -313,17 +313,17 @@ void OTodo::deref() {
     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;
 }