| -rw-r--r-- | libopie2/opiepim/backend/otodoaccessxml.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp index ab50604..7a08f12 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.cpp +++ b/libopie2/opiepim/backend/otodoaccessxml.cpp @@ -498,170 +498,170 @@ void OPimTodoAccessXML::todo( QAsciiDict<int>* dict, OPimTodo& ev, else if ( val == "Yearly" ) recur()->setType( OPimRecurrence::Yearly ); else recur()->setType( OPimRecurrence::NoRepeat ); break; case FRWeekdays: recur()->setDays( val.toInt() ); break; case FRPosition: recur()->setPosition( val.toInt() ); break; case FRFreq: recur()->setFrequency( val.toInt() ); break; case FRHasEndDate: recur()->setHasEndDate( val.toInt() ); break; case FREndDate: { rp_end = (time_t) val.toLong(); break; } default: ev.setCustomField( attr, val ); break; } } // from PalmtopRecord... GPL ### FIXME namespace { QString customToXml(const QMap<QString, QString>& customMap ) { QString buf(" "); for ( QMap<QString, QString>::ConstIterator cit = customMap.begin(); cit != customMap.end(); ++cit) { buf += cit.key(); buf += "=\""; buf += Qtopia::escapeString(cit.data()); buf += "\" "; } return buf; } } QString OPimTodoAccessXML::toString( const OPimTodo& ev )const { QString str; - str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\" "; - str += "HasDate=\"" + QString::number( ev.hasDueDate() ) + "\" "; - str += "Priority=\"" + QString::number( ev.priority() ) + "\" "; - str += "Progress=\"" + QString::number(ev.progress() ) + "\" "; + str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\""; + str += " HasDate=\"" + QString::number( ev.hasDueDate() ) + "\""; + 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() ) + "\" "; + 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() ) + "\" "; + str += " DateYear=\"" + QString::number( ev.dueDate().year() ) + "\""; + str += " DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\""; + str += " DateDay=\"" + QString::number( ev.dueDate().day() ) + "\""; } - str += "Uid=\"" + QString::number( 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; for (extIt = extras.begin(); extIt != extras.end(); ++extIt ) - str += extIt.key() + "=\"" + extIt.data() + "\" "; + str += " " + extIt.key() + "=\"" + extIt.data() + "\""; */ // cross refernce if ( ev.hasRecurrence() ) { str += ev.recurrence().toString(); } if ( ev.hasStartDate() ) - str += "StartDate=\""+ OPimDateConversion::dateToString( ev.startDate() ) +"\" "; + str += " StartDate=\""+ OPimDateConversion::dateToString( ev.startDate() ) +"\""; if ( ev.hasCompletedDate() ) - str += "CompletedDate=\""+ OPimDateConversion::dateToString( ev.completedDate() ) +"\" "; + str += " CompletedDate=\""+ OPimDateConversion::dateToString( ev.completedDate() ) +"\""; if ( ev.hasState() ) - str += "State=\""+QString::number( ev.state().state() )+"\" "; + str += " State=\""+QString::number( ev.state().state() )+"\""; /* * save reminders and notifiers! * DATE_TIME:DURATION:SOUND:NOT_USED_YET;OTHER_DATE_TIME:OTHER_DURATION:SOUND:.... */ if ( ev.hasNotifiers() ) { OPimNotifyManager manager = ev.notifiers(); OPimNotifyManager::Alarms alarms = manager.alarms(); if (!alarms.isEmpty() ) { QStringList als; OPimNotifyManager::Alarms::Iterator it = alarms.begin(); for ( ; it != alarms.end(); ++it ) { /* only if time is valid */ if ( (*it).dateTime().isValid() ) { als << OPimDateConversion::dateTimeToString( (*it).dateTime() ) + ":" + QString::number( (*it).duration() ) + ":" + QString::number( (*it).sound() ) + ":"; } } // now write the list - str += "Alarms=\""+als.join(";") +"\" "; + str += " Alarms=\""+als.join(";") +"\""; } /* * now the same for reminders but more easy. We just save the uid of the OPimEvent. */ OPimNotifyManager::Reminders reminders = manager.reminders(); if (!reminders.isEmpty() ) { OPimNotifyManager::Reminders::Iterator it = reminders.begin(); QStringList records; for ( ; it != reminders.end(); ++it ) { records << QString::number( (*it).recordUid() ); } - str += "Reminders=\""+ records.join(";") +"\" "; + str += " Reminders=\""+ records.join(";") +"\""; } } str += customToXml( ev.toExtraMap() ); return str; } QString OPimTodoAccessXML::toString( const QArray<int>& ints ) const { return Qtopia::Record::idsToString( ints ); } QArray<int> OPimTodoAccessXML::sorted( const UIDArray& events, bool asc, int sortOrder,int sortFilter, const QArray<int>& categories )const { Internal::OPimTodoSortVector vector(events.count(), asc,sortOrder ); int item = 0; bool bCat = sortFilter & OPimTodoAccess::FilterCategory ? true : false; bool bOnly = sortFilter & OPimTodoAccess::OnlyOverDue ? true : false; bool comp = sortFilter & OPimTodoAccess::DoNotShowCompleted ? true : false; bool catPassed = false; int cat; for ( uint i = 0; i < events.count(); ++i ) { /* Guard against creating a new item... */ if ( !m_events.contains( events[i] ) ) continue; OPimTodo todo = m_events[events[i]]; /* show category */ /* -1 == unfiled */ catPassed = false; for ( uint cat_nu = 0; cat_nu < categories.count(); ++cat_nu ) { cat = categories[cat_nu]; if ( bCat && cat == -1 ) { if(!todo.categories().isEmpty() ) continue; } else if ( bCat && cat != 0) if (!todo.categories().contains( cat ) ) continue; catPassed = true; break; } /* * If none of the Categories matched |