author | zecke <zecke> | 2003-02-22 18:51:44 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-02-22 18:51:44 (UTC) |
commit | 7b04887e382227c80c8985495f01dad2b1890719 (patch) (side-by-side diff) | |
tree | 31db88fd0519c7f03ff05560f21ba69256765d5e /libopie/pim | |
parent | 2424bcd292444b3a03c9b92dbc7f5b392c355755 (diff) | |
download | opie-7b04887e382227c80c8985495f01dad2b1890719.zip opie-7b04887e382227c80c8985495f01dad2b1890719.tar.gz opie-7b04887e382227c80c8985495f01dad2b1890719.tar.bz2 |
Fix saving
remove the transport medium from the opimmainwindow
-rw-r--r-- | libopie/pim/odatebookaccessbackend_xml.cpp | 7 | ||||
-rw-r--r-- | libopie/pim/opimmainwindow.h | 2 | ||||
-rw-r--r-- | libopie/pim/test/oevent_test.cpp | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/libopie/pim/odatebookaccessbackend_xml.cpp b/libopie/pim/odatebookaccessbackend_xml.cpp index 24b69fe..4a6b7b8 100644 --- a/libopie/pim/odatebookaccessbackend_xml.cpp +++ b/libopie/pim/odatebookaccessbackend_xml.cpp @@ -83,8 +83,9 @@ namespace { FRecChildren, FExceptions }; inline void save( const OEvent& ev, QString& buf ) { + qWarning("Saving %d %s", ev.uid(), ev.description().latin1() ); buf += " description=\"" + Qtopia::escapeString(ev.description() ) + "\""; if (!ev.location().isEmpty() ) buf += " location=\"" + Qtopia::escapeString(ev.location() ) + "\""; @@ -124,8 +125,9 @@ namespace { if ( ev.timeZone().isEmpty() ) buf += "None"; else buf += ev.timeZone(); + buf += "\""; if (ev.parent() != 0 ) { buf += " recparent=\""+QString::number(ev.parent() )+"\""; } @@ -433,9 +435,8 @@ bool ODateBookAccessBackend_XML::loadFile() { } } /* time to finalize */ finalizeRecord( ev ); - add( ev ); delete rec; } ::munmap(map_addr, attribute.st_size ); m_changed = false; // changed during add @@ -450,10 +451,12 @@ void ODateBookAccessBackend_XML::finalizeRecord( OEvent& ev ) { ev.setEndDateTime ( utc.fromUTCDateTime( end ) ); ev.setTimeZone( "UTC"); // make sure it is really utc }else { /* to current date time */ + qWarning(" Start is %d", start ); OTimeZone zone( ev.timeZone().isEmpty() ? OTimeZone::current() : ev.timeZone() ); QDateTime date = zone.toDateTime( start ); + qWarning(" Start is %s", date.toString().latin1() ); ev.setStartDateTime( zone.toDateTime( date, OTimeZone::current() ) ); date = zone.toDateTime( end ); ev.setEndDateTime ( zone.toDateTime( date, OTimeZone::current() ) ); @@ -472,10 +475,12 @@ void ODateBookAccessBackend_XML::finalizeRecord( OEvent& ev ) { OPimAlarm al( snd , dt ); ev.notifiers().add( al ); } if ( m_raw.contains( ev.uid() ) || m_rep.contains( ev.uid() ) ) { + qWarning("already contains assign uid"); ev.setUid( 1 ); } + qWarning("addind %d %s", ev.uid(), ev.description().latin1() ); if ( ev.hasRecurrence() ) m_rep.insert( ev.uid(), ev ); else m_raw.insert( ev.uid(), ev ); diff --git a/libopie/pim/opimmainwindow.h b/libopie/pim/opimmainwindow.h index 34b8a71..dca3c82 100644 --- a/libopie/pim/opimmainwindow.h +++ b/libopie/pim/opimmainwindow.h @@ -45,9 +45,9 @@ protected slots: virtual int create() = 0; /** remove a record with UID == uid */ virtual bool remove( int uid ) = 0; /** beam the record with UID = uid */ - virtual void beam( int uid , int transport = IrDa) = 0; + virtual void beam( int uid ) = 0; /** show the record with UID == uid */ virtual void show( int uid ) = 0; /** edit the record */ diff --git a/libopie/pim/test/oevent_test.cpp b/libopie/pim/test/oevent_test.cpp index d83ee0b..9f16911 100644 --- a/libopie/pim/test/oevent_test.cpp +++ b/libopie/pim/test/oevent_test.cpp @@ -13,9 +13,10 @@ int main(int argc, char* argv ) { for( it = list.begin(); it != list.end(); ++it ){ OEvent ev = (*it); qWarning("Summary: %s",ev.description().latin1() ); qWarning("Start: %s End: %s",ev.startDateTime().toString().latin1(), ev.endDateTime().toString().latin1() ); - qWarning("All Day: %d",ev.isAllDay() ); + qWarning("All Day: %d Recurrence: %d",ev.isAllDay(), ev.hasRecurrence() ); + qWarning("UID %d", ev.uid() ); } QDate date1(2003,02,01 ); QDate date2(2003,03,01 ); @@ -27,7 +28,8 @@ int main(int argc, char* argv ) { OEffectiveEvent ef = (*effIt); qWarning("Summary: %s", ef.description().latin1() ); qWarning("Date: %s", ef.date().toString().latin1() ); } + acc.save(); return 0; } |