summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/otodo.cpp81
-rw-r--r--libopie/pim/otodo.h16
-rw-r--r--libopie2/opiepim/otodo.cpp81
-rw-r--r--libopie2/opiepim/otodo.h16
4 files changed, 164 insertions, 30 deletions
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index ea66d39..f3df119 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -20,28 +20,32 @@
#include "otodo.h"
struct OTodo::OTodoData : public QShared {
OTodoData() : QShared() {
+ recur = 0;
+ state = 0;
+ maintainer = 0;
+ notifiers = 0;
};
QDate date;
bool isCompleted:1;
bool hasDate:1;
int priority;
QString desc;
QString sum;
QMap<QString, QString> extra;
ushort prog;
- OPimState state;
- ORecur recur;
- OPimMaintainer maintainer;
+ OPimState *state;
+ ORecur *recur;
+ OPimMaintainer *maintainer;
QDate start;
QDate completed;
- OPimNotifyManager notifiers;
+ OPimNotifyManager *notifiers;
};
OTodo::OTodo(const OTodo &event )
: OPimRecord( event ), data( event.data )
{
data->ref();
@@ -148,20 +152,42 @@ QDate OTodo::completedDate()const {
return data->completed;
}
QString OTodo::description()const
{
return data->desc;
}
+bool OTodo::hasState() const{
+ if (!data->state ) return false;
+ return ( data->state->state() != OPimState::Undefined );
+}
OPimState OTodo::state()const {
- return data->state;
+ if (!data->state ) {
+ OPimState state;
+ return state;
+ }
+
+ return (*data->state);
+}
+bool OTodo::hasRecurrence()const {
+ if (!data->recur) return false;
+ return data->recur->doesRecur();
}
ORecur OTodo::recurrence()const {
- return data->recur;
+ if (!data->recur) return ORecur();
+
+ return (*data->recur);
+}
+bool OTodo::hasMaintainer()const {
+ if (!data->maintainer) return false;
+
+ return (data->maintainer->mode() != OPimMaintainer::Undefined );
}
OPimMaintainer OTodo::maintainer()const {
- return data->maintainer;
+ if (!data->maintainer) return OPimMaintainer();
+
+ return (*data->maintainer);
}
void OTodo::setCompleted( bool completed )
{
changeOrModify();
data->isCompleted = completed;
}
@@ -198,21 +224,31 @@ void OTodo::setStartDate( const QDate& date ) {
void OTodo::setCompletedDate( const QDate& date ) {
changeOrModify();
data->completed = date;
}
void OTodo::setState( const OPimState& state ) {
changeOrModify();
- data->state = state;
+ if (data->state )
+ (*data->state) = state;
+ else
+ data->state = new OPimState( state );
}
void OTodo::setRecurrence( const ORecur& rec) {
changeOrModify();
- data->recur = rec;
+ if (data->recur )
+ (*data->recur) = rec;
+ else
+ data->recur = new ORecur( rec );
}
void OTodo::setMaintainer( const OPimMaintainer& pim ) {
changeOrModify();
- data->maintainer = pim;
+
+ if (data->maintainer )
+ (*data->maintainer) = pim;
+ else
+ data->maintainer = new OPimMaintainer( pim );
}
bool OTodo::isOverdue( )
{
if( data->hasDate && !data->isCompleted)
return QDate::currentDate() > data->date;
return false;
@@ -257,14 +293,20 @@ QString OTodo::toRichText() const
text += "<b>" + QObject::tr( "Category:") + "</b> ";
text += categoryNames( "Todo List" ).join(", ");
text += "<br>";
return text;
}
+bool OTodo::hasNotifiers()const {
+ if (!data->notifiers) return false;
+ return data->notifiers->isEmpty();
+}
OPimNotifyManager& OTodo::notifiers() {
- return data->notifiers;
+ if (!data->notifiers )
+ data->notifiers = new OPimNotifyManager;
+ return (*data->notifiers);
}
bool OTodo::operator<( const OTodo &toDoEvent )const{
if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
if( !hasDueDate() && toDoEvent.hasDueDate() ) return false;
if( hasDueDate() && toDoEvent.hasDueDate() ){
@@ -402,18 +444,27 @@ void OTodo::copy( OTodoData* src, OTodoData* dest ) {
dest->hasDate = src->hasDate;
dest->priority = src->priority;
dest->desc = src->desc;
dest->sum = src->sum;
dest->extra = src->extra;
dest->prog = src->prog;
- dest->state = src->state;
- dest->recur = src->recur;
- dest->maintainer = src->maintainer;
+
+ if (src->state )
+ dest->state = new OPimState( *src->state );
+
+ if (src->recur )
+ dest->recur = new ORecur( *src->recur );
+
+ if (src->maintainer )
+ dest->maintainer = new OPimMaintainer( *src->maintainer )
+ ;
dest->start = src->start;
dest->completed = src->completed;
- dest->notifiers = src->notifiers;
+
+ if (src->notifiers )
+ dest->notifiers = new OPimNotifyManager( *src->notifiers );
}
QString OTodo::type() const {
return QString::fromLatin1("OTodo");
}
QString OTodo::recordField(int /*id*/ )const {
return QString::null;
diff --git a/libopie/pim/otodo.h b/libopie/pim/otodo.h
index 2f66f55..a58d9aa 100644
--- a/libopie/pim/otodo.h
+++ b/libopie/pim/otodo.h
@@ -125,22 +125,37 @@ public:
/**
* When was it completed?
*/
QDate completedDate()const;
/**
+ * does it have a state?
+ */
+ bool hasState()const;
+
+ /**
* What is the state of this OTodo?
*/
OPimState state()const;
/**
+ * has recurrence?
+ */
+ bool hasRecurrence()const;
+
+ /**
* the recurrance of this
*/
ORecur recurrence()const;
/**
+ * does this OTodo have a maintainer?
+ */
+ bool hasMaintainer()const;
+
+ /**
* the Maintainer of this OTodo
*/
OPimMaintainer maintainer()const;
/**
* The description of the todo
@@ -155,12 +170,13 @@ public:
/**
* @reimplemented
* Return this todoevent in a RichText formatted QString
*/
QString toRichText() const;
+ bool hasNotifiers()const;
/*
* check if the sharing is still fine!! -zecke
*/
/**
* return a reference to our notifiers...
*/
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index ea66d39..f3df119 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -20,28 +20,32 @@
#include "otodo.h"
struct OTodo::OTodoData : public QShared {
OTodoData() : QShared() {
+ recur = 0;
+ state = 0;
+ maintainer = 0;
+ notifiers = 0;
};
QDate date;
bool isCompleted:1;
bool hasDate:1;
int priority;
QString desc;
QString sum;
QMap<QString, QString> extra;
ushort prog;
- OPimState state;
- ORecur recur;
- OPimMaintainer maintainer;
+ OPimState *state;
+ ORecur *recur;
+ OPimMaintainer *maintainer;
QDate start;
QDate completed;
- OPimNotifyManager notifiers;
+ OPimNotifyManager *notifiers;
};
OTodo::OTodo(const OTodo &event )
: OPimRecord( event ), data( event.data )
{
data->ref();
@@ -148,20 +152,42 @@ QDate OTodo::completedDate()const {
return data->completed;
}
QString OTodo::description()const
{
return data->desc;
}
+bool OTodo::hasState() const{
+ if (!data->state ) return false;
+ return ( data->state->state() != OPimState::Undefined );
+}
OPimState OTodo::state()const {
- return data->state;
+ if (!data->state ) {
+ OPimState state;
+ return state;
+ }
+
+ return (*data->state);
+}
+bool OTodo::hasRecurrence()const {
+ if (!data->recur) return false;
+ return data->recur->doesRecur();
}
ORecur OTodo::recurrence()const {
- return data->recur;
+ if (!data->recur) return ORecur();
+
+ return (*data->recur);
+}
+bool OTodo::hasMaintainer()const {
+ if (!data->maintainer) return false;
+
+ return (data->maintainer->mode() != OPimMaintainer::Undefined );
}
OPimMaintainer OTodo::maintainer()const {
- return data->maintainer;
+ if (!data->maintainer) return OPimMaintainer();
+
+ return (*data->maintainer);
}
void OTodo::setCompleted( bool completed )
{
changeOrModify();
data->isCompleted = completed;
}
@@ -198,21 +224,31 @@ void OTodo::setStartDate( const QDate& date ) {
void OTodo::setCompletedDate( const QDate& date ) {
changeOrModify();
data->completed = date;
}
void OTodo::setState( const OPimState& state ) {
changeOrModify();
- data->state = state;
+ if (data->state )
+ (*data->state) = state;
+ else
+ data->state = new OPimState( state );
}
void OTodo::setRecurrence( const ORecur& rec) {
changeOrModify();
- data->recur = rec;
+ if (data->recur )
+ (*data->recur) = rec;
+ else
+ data->recur = new ORecur( rec );
}
void OTodo::setMaintainer( const OPimMaintainer& pim ) {
changeOrModify();
- data->maintainer = pim;
+
+ if (data->maintainer )
+ (*data->maintainer) = pim;
+ else
+ data->maintainer = new OPimMaintainer( pim );
}
bool OTodo::isOverdue( )
{
if( data->hasDate && !data->isCompleted)
return QDate::currentDate() > data->date;
return false;
@@ -257,14 +293,20 @@ QString OTodo::toRichText() const
text += "<b>" + QObject::tr( "Category:") + "</b> ";
text += categoryNames( "Todo List" ).join(", ");
text += "<br>";
return text;
}
+bool OTodo::hasNotifiers()const {
+ if (!data->notifiers) return false;
+ return data->notifiers->isEmpty();
+}
OPimNotifyManager& OTodo::notifiers() {
- return data->notifiers;
+ if (!data->notifiers )
+ data->notifiers = new OPimNotifyManager;
+ return (*data->notifiers);
}
bool OTodo::operator<( const OTodo &toDoEvent )const{
if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
if( !hasDueDate() && toDoEvent.hasDueDate() ) return false;
if( hasDueDate() && toDoEvent.hasDueDate() ){
@@ -402,18 +444,27 @@ void OTodo::copy( OTodoData* src, OTodoData* dest ) {
dest->hasDate = src->hasDate;
dest->priority = src->priority;
dest->desc = src->desc;
dest->sum = src->sum;
dest->extra = src->extra;
dest->prog = src->prog;
- dest->state = src->state;
- dest->recur = src->recur;
- dest->maintainer = src->maintainer;
+
+ if (src->state )
+ dest->state = new OPimState( *src->state );
+
+ if (src->recur )
+ dest->recur = new ORecur( *src->recur );
+
+ if (src->maintainer )
+ dest->maintainer = new OPimMaintainer( *src->maintainer )
+ ;
dest->start = src->start;
dest->completed = src->completed;
- dest->notifiers = src->notifiers;
+
+ if (src->notifiers )
+ dest->notifiers = new OPimNotifyManager( *src->notifiers );
}
QString OTodo::type() const {
return QString::fromLatin1("OTodo");
}
QString OTodo::recordField(int /*id*/ )const {
return QString::null;
diff --git a/libopie2/opiepim/otodo.h b/libopie2/opiepim/otodo.h
index 2f66f55..a58d9aa 100644
--- a/libopie2/opiepim/otodo.h
+++ b/libopie2/opiepim/otodo.h
@@ -125,22 +125,37 @@ public:
/**
* When was it completed?
*/
QDate completedDate()const;
/**
+ * does it have a state?
+ */
+ bool hasState()const;
+
+ /**
* What is the state of this OTodo?
*/
OPimState state()const;
/**
+ * has recurrence?
+ */
+ bool hasRecurrence()const;
+
+ /**
* the recurrance of this
*/
ORecur recurrence()const;
/**
+ * does this OTodo have a maintainer?
+ */
+ bool hasMaintainer()const;
+
+ /**
* the Maintainer of this OTodo
*/
OPimMaintainer maintainer()const;
/**
* The description of the todo
@@ -155,12 +170,13 @@ public:
/**
* @reimplemented
* Return this todoevent in a RichText formatted QString
*/
QString toRichText() const;
+ bool hasNotifiers()const;
/*
* check if the sharing is still fine!! -zecke
*/
/**
* return a reference to our notifiers...
*/