From 55dd11ddae09bfc4907399c473f0387c135fdae6 Mon Sep 17 00:00:00 2001 From: zecke Date: Fri, 20 Sep 2002 17:28:20 +0000 Subject: OTodo know is the first implementation of OPimRecord --- (limited to 'libopie/pim/otodo.cpp') diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp index d8e0447..3c93838 100644 --- a/libopie/pim/otodo.cpp +++ b/libopie/pim/otodo.cpp @@ -11,14 +11,13 @@ #include #include -#include "todoevent.h" -using namespace Opie; -Qtopia::UidGen ToDoEvent::m_gen; +#include "otodo.h" -struct ToDoEvent::ToDoEventData : public QShared { - ToDoEventData() : QShared() { + +struct OTodo::OTodoData : public QShared { + OTodoData() : QShared() { }; QDate date; @@ -29,62 +28,47 @@ struct ToDoEvent::ToDoEventData : public QShared { QString desc; QString sum; QMap extra; - QMap > relations; - int uid; ushort prog; bool hasAlarmDateTime :1; QDateTime alarmDateTime; }; -ToDoEvent::ToDoEvent(const ToDoEvent &event ) - : data( event.data ) +OTodo::OTodo(const OTodo &event ) + : OPimRecord( event ), data( event.data ) { data->ref(); //qWarning("ref up"); } -ToDoEvent::~ToDoEvent() { +OTodo::~OTodo() { if ( data->deref() ) { - //qWarning("ToDoEvent::dereffing"); + //qWarning("OTodo::dereffing"); delete data; data = 0l; } } -ToDoEvent::ToDoEvent(bool completed, int priority, +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("ToDoEventData"); - data = new ToDoEventData; + //qWarning("OTodoData"); + setCategories( idsFromString( category.join(";") ) ); + data = new OTodoData; data->date = date; data->isCompleted = completed; data->hasDate = hasDate; data->priority = priority; - data->category = category; data->sum = summary; data->prog = progress; data->desc = Qtopia::simplifyMultiLineSpace(description ); - if (uid == -1 ) { - uid = m_gen.generate(); - - }// generated the ids - m_gen.store( uid ); - - data->uid = uid; data->hasAlarmDateTime = false; } -QArray ToDoEvent::categories()const -{ - qWarning( "ToDoEvent:cats" + data->category.join(";") ); - QArray array(data->category.count() ); // currently the datebook can be only in one category - array = Qtopia::Record::idsFromString( data->category.join(";") ); - return array; -} -bool ToDoEvent::match( const QRegExp ®Exp )const +bool OTodo::match( const QRegExp ®Exp )const { if( QString::number( data->priority ).find( regExp ) != -1 ){ return true; @@ -92,200 +76,107 @@ bool ToDoEvent::match( const QRegExp ®Exp )const return true; }else if(data->desc.find( regExp ) != -1 ){ return true; + }else if(data->sum.find( regExp ) != -1 ) { + return true; } return false; } -bool ToDoEvent::isCompleted() const +bool OTodo::isCompleted() const { return data->isCompleted; } -bool ToDoEvent::hasDueDate() const +bool OTodo::hasDueDate() const { return data->hasDate; } -bool ToDoEvent::hasAlarmDateTime() const +bool OTodo::hasAlarmDateTime() const { return data->hasAlarmDateTime; } -int ToDoEvent::priority()const +int OTodo::priority()const { return data->priority; } -QStringList ToDoEvent::allCategories()const -{ - return data->category; -} -QString ToDoEvent::extra(const QString& )const -{ - return QString::null; -} -QString ToDoEvent::summary() const +QString OTodo::summary() const { return data->sum; } -ushort ToDoEvent::progress() const +ushort OTodo::progress() const { return data->prog; } -QStringList ToDoEvent::relatedApps() const -{ - QStringList list; - QMap >::ConstIterator it; - for ( it = data->relations.begin(); it != data->relations.end(); ++it ) { - list << it.key(); - } - return list; -} -QArray ToDoEvent::relations( const QString& app)const -{ - QArray tmp; - QMap >::ConstIterator it; - it = data->relations.find( app); - if ( it != data->relations.end() ) - tmp = it.data(); - return tmp; -} -void ToDoEvent::insertCategory(const QString &str ) -{ - changeOrModify(); - qWarning("insert category;" + str ); - data->category.append( str ); -} -void ToDoEvent::clearCategories() -{ - changeOrModify(); - data->category.clear(); -} -void ToDoEvent::setCategories(const QStringList &list ) -{ - changeOrModify(); - qWarning("set categories" + list.join(";") ); - data->category = list; -} -QDate ToDoEvent::dueDate()const +QDate OTodo::dueDate()const { return data->date; } -QDateTime ToDoEvent::alarmDateTime() const +QDateTime OTodo::alarmDateTime() const { return data->alarmDateTime; } -QString ToDoEvent::description()const +QString OTodo::description()const { return data->desc; } -void ToDoEvent::setCompleted( bool completed ) +void OTodo::setCompleted( bool completed ) { changeOrModify(); data->isCompleted = completed; } -void ToDoEvent::setHasDueDate( bool hasDate ) +void OTodo::setHasDueDate( bool hasDate ) { changeOrModify(); data->hasDate = hasDate; } -void ToDoEvent::setHasAlarmDateTime( bool hasAlarmDateTime ) +void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime ) { changeOrModify(); data->hasAlarmDateTime = hasAlarmDateTime; } -void ToDoEvent::setDescription(const QString &desc ) +void OTodo::setDescription(const QString &desc ) { changeOrModify(); data->desc = Qtopia::simplifyMultiLineSpace(desc ); } -void ToDoEvent::setExtra( const QString&, const QString& ) -{ - -} -void ToDoEvent::setSummary( const QString& sum ) +void OTodo::setSummary( const QString& sum ) { changeOrModify(); data->sum = sum; } -void ToDoEvent::setCategory( const QString &cat ) -{ - changeOrModify(); - //qWarning("setCategory %s", cat.latin1() ); - data->category.clear(); - data->category << cat; -} -void ToDoEvent::setPriority(int prio ) +void OTodo::setPriority(int prio ) { changeOrModify(); data->priority = prio; } -void ToDoEvent::setDueDate( QDate date ) +void OTodo::setDueDate( QDate date ) { changeOrModify(); data->date = date; } -void ToDoEvent::setAlarmDateTime( const QDateTime& alarm ) +void OTodo::setAlarmDateTime( const QDateTime& alarm ) { changeOrModify(); data->alarmDateTime = alarm; } -void ToDoEvent::addRelated( const QString &app, int id ) -{ - changeOrModify(); - - QMap >::Iterator it; - QArray tmp; - it = data->relations.find( app ); - if ( it == data->relations.end() ) { - tmp.resize(1 ); - tmp[0] = id; - }else{ - tmp = it.data(); - tmp.resize( tmp.size() + 1 ); - tmp[tmp.size() - 1] = id; - } - data->relations.replace( app, tmp ); -} -void ToDoEvent::addRelated(const QString& app, QArray ids ) -{ - changeOrModify(); - - QMap >::Iterator it; - QArray tmp; - it = data->relations.find( app); - if ( it == data->relations.end() ) { // not there - /** tmp.resize( ids.size() ); stupid?? - */ - tmp = ids; - }else{ - tmp = it.data(); - int offset = tmp.size()-1; - tmp.resize( tmp.size() + ids.size() ); - for (uint i = 0; i < ids.size(); i++ ) { - tmp[offset+i] = ids[i]; - } - - } - data->relations.replace( app, tmp ); -} -void ToDoEvent::clearRelated( const QString& app ) -{ - changeOrModify(); - data->relations.remove( app ); -} -bool ToDoEvent::isOverdue( ) +bool OTodo::isOverdue( ) { if( data->hasDate ) return QDate::currentDate() > data->date; return false; } -void ToDoEvent::setProgress(ushort progress ) +void OTodo::setProgress(ushort progress ) { changeOrModify(); data->prog = progress; } +QString OTodo::toShortText() const { + return summary(); +} /*! Returns a richt text string */ -QString ToDoEvent::richText() const +QString OTodo::toRichText() const { QString text; QStringList catlist; @@ -316,28 +207,14 @@ QString ToDoEvent::richText() const text += "
"; } - // Open database of all categories and get the list of - // the categories this todoevent belongs to. - // Then print them... - // I am not sure whether there is no better way doing this !? - Categories catdb; - bool firstloop = true; - catdb.load( categoryFileName() ); - catlist = allCategories(); - text += "" + QObject::tr( "Category:") + " "; - for ( QStringList::Iterator it = catlist.begin(); it != catlist.end(); ++it ) { - if (!firstloop){ - text += ", "; - } - firstloop = false; - text += catdb.label ("todo", (*it).toInt()); - } + text += categoryNames().join(", "); text += "
"; + return text; } -bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{ +bool OTodo::operator<( const OTodo &toDoEvent )const{ if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; if( hasDueDate() && toDoEvent.hasDueDate() ){ @@ -349,7 +226,7 @@ bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{ } return false; } -bool ToDoEvent::operator<=(const ToDoEvent &toDoEvent )const +bool OTodo::operator<=(const OTodo &toDoEvent )const { if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; if( !hasDueDate() && toDoEvent.hasDueDate() ) return true; @@ -362,7 +239,7 @@ bool ToDoEvent::operator<=(const ToDoEvent &toDoEvent )const } return true; } -bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const +bool OTodo::operator>(const OTodo &toDoEvent )const { if( !hasDueDate() && !toDoEvent.hasDueDate() ) return false; if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; @@ -375,7 +252,7 @@ bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const } return false; } -bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const +bool OTodo::operator>=(const OTodo &toDoEvent )const { if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; @@ -388,7 +265,7 @@ bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const } return true; } -bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const +bool OTodo::operator==(const OTodo &toDoEvent )const { if( data->priority == toDoEvent.data->priority && data->priority == toDoEvent.data->prog && @@ -404,7 +281,7 @@ bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const return false; } -void ToDoEvent::deref() { +void OTodo::deref() { //qWarning("deref in ToDoEvent"); if ( data->deref() ) { @@ -413,23 +290,21 @@ void ToDoEvent::deref() { d= 0; } } -ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item ) +OTodo &OTodo::operator=(const OTodo &item ) { + OPimRecord::operator=( item ); //qWarning("operator= ref "); item.data->ref(); deref(); - data = item.data; - - return *this; } -QMap ToDoEvent::toMap() const { +QMap OTodo::toMap() const { QMap map; - map.insert( Uid, QString::number( data->uid ) ); - map.insert( Category, data->category.join(";") ); + 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 ); @@ -446,32 +321,7 @@ QMap ToDoEvent::toMap() const { return map; } - -QString ToDoEvent::crossToString()const { - QString str; - QMap >::ConstIterator it; - for (it = data->relations.begin(); it != data->relations.end(); ++it ) { - QArray 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; -} -int ToDoEvent::uid()const { - return data->uid; -} -void ToDoEvent::setUid( int id ) { - if ( id == -1 ) - id = m_gen.generate(); - m_gen.store(id ); - changeOrModify(); - data->uid = id; -} -QMap ToDoEvent::extras()const { +QMap OTodo::toExtraMap()const { return data->extra; } /** @@ -479,26 +329,23 @@ QMap ToDoEvent::extras()const { * creates a new QShared Object or it can modify it * right in place */ -void ToDoEvent::changeOrModify() { +void OTodo::changeOrModify() { if ( data->count != 1 ) { //qWarning("changeOrModify"); data->deref(); - ToDoEventData* d2 = new ToDoEventData(); + OTodoData* d2 = new OTodoData(); copy(data, d2 ); data = d2; } } -void ToDoEvent::copy( ToDoEventData* src, ToDoEventData* dest ) { +void OTodo::copy( OTodoData* src, OTodoData* dest ) { dest->date = src->date; dest->isCompleted = src->isCompleted; dest->hasDate = src->hasDate; dest->priority = src->priority; - dest->category = src->category; dest->desc = src->desc; dest->sum = src->sum; dest->extra = src->extra; - dest->relations = src->relations; - dest->uid = src->uid; dest->prog = src->prog; dest->hasAlarmDateTime = src->hasAlarmDateTime; dest->alarmDateTime = src->alarmDateTime; -- cgit v0.9.0.2