author | eilers <eilers> | 2003-08-01 12:30:16 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-08-01 12:30:16 (UTC) |
commit | 6c715b67a8f0e32a4edca5be91332622834c8d91 (patch) (unidiff) | |
tree | ae2d660e1fd9c990c2d725c075ce6c42480b0af8 /libopie2/opiepim/otodo.cpp | |
parent | cb45aa10043fdd6fddcab42ef0e07ddafc3d506d (diff) | |
download | opie-6c715b67a8f0e32a4edca5be91332622834c8d91.zip opie-6c715b67a8f0e32a4edca5be91332622834c8d91.tar.gz opie-6c715b67a8f0e32a4edca5be91332622834c8d91.tar.bz2 |
Merging changes from BRANCH_1_0 to HEAD
-rw-r--r-- | libopie2/opiepim/otodo.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp index 38b93f7..5a18c37 100644 --- a/libopie2/opiepim/otodo.cpp +++ b/libopie2/opiepim/otodo.cpp | |||
@@ -28,6 +28,11 @@ struct OTodo::OTodoData : public QShared { | |||
28 | maintainer = 0; | 28 | maintainer = 0; |
29 | notifiers = 0; | 29 | notifiers = 0; |
30 | }; | 30 | }; |
31 | ~OTodoData() { | ||
32 | delete recur; | ||
33 | delete maintainer; | ||
34 | delete notifiers; | ||
35 | } | ||
31 | 36 | ||
32 | QDate date; | 37 | QDate date; |
33 | bool isCompleted:1; | 38 | bool isCompleted:1; |
@@ -274,7 +279,7 @@ QString OTodo::toRichText() const | |||
274 | QStringList catlist; | 279 | QStringList catlist; |
275 | 280 | ||
276 | // summary | 281 | // summary |
277 | text += "<b><h3><img src=\"todo/TodoList\">"; | 282 | text += "<b><h3><img src=\"todo/TodoList\"> "; |
278 | if ( !summary().isEmpty() ) { | 283 | if ( !summary().isEmpty() ) { |
279 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "" ); | 284 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "" ); |
280 | } | 285 | } |
@@ -282,16 +287,15 @@ QString OTodo::toRichText() const | |||
282 | 287 | ||
283 | // description | 288 | // description |
284 | if( !description().isEmpty() ){ | 289 | if( !description().isEmpty() ){ |
285 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; | 290 | text += "<b>" + QObject::tr( "Notes:" ) + "</b><br>"; |
286 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ; | 291 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
287 | } | 292 | } |
288 | 293 | ||
289 | // priority | 294 | // priority |
290 | int priorityval = priority(); | 295 | int priorityval = priority(); |
291 | text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" + | 296 | text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" + |
292 | QString::number( priorityval ) + "\">"; | 297 | QString::number( priorityval ) + "\"> "; |
293 | // text += "<b>" + QObject::tr( "Priority:") +"</b><img src=\"todo/priority" + | 298 | |
294 | // QString::number( priority() ) + "\"><br>"; | ||
295 | switch ( priorityval ) | 299 | switch ( priorityval ) |
296 | { | 300 | { |
297 | case 1 : text += QObject::tr( "Very high" ); | 301 | case 1 : text += QObject::tr( "Very high" ); |