summaryrefslogtreecommitdiff
authordrw <drw>2005-02-16 19:45:54 (UTC)
committer drw <drw>2005-02-16 19:45:54 (UTC)
commit28feca2d605de0bd5a1ccf2217dfef2a17466307 (patch) (unidiff)
tree0badbaa8bbbecfbe0541f1686572e12c2b8f383a
parent5ad21664e5db417a18682903a660f4651c68ff12 (diff)
downloadopie-28feca2d605de0bd5a1ccf2217dfef2a17466307.zip
opie-28feca2d605de0bd5a1ccf2217dfef2a17466307.tar.gz
opie-28feca2d605de0bd5a1ccf2217dfef2a17466307.tar.bz2
Fix for bug #1542 - todo crashes when priority < 1 or > 5
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/core/opimtodo.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/libopie2/opiepim/core/opimtodo.cpp b/libopie2/opiepim/core/opimtodo.cpp
index 16ca987..5bdc648 100644
--- a/libopie2/opiepim/core/opimtodo.cpp
+++ b/libopie2/opiepim/core/opimtodo.cpp
@@ -96,70 +96,78 @@ OPimTodo::~OPimTodo()
96 96
97 if ( data->deref() ) 97 if ( data->deref() )
98 { 98 {
99 delete data; 99 delete data;
100 data = 0l; 100 data = 0l;
101 } 101 }
102} 102}
103 103
104 104
105OPimTodo::OPimTodo( bool completed, int priority, 105OPimTodo::OPimTodo( bool completed, int priority,
106 const QArray<int> &category, 106 const QArray<int> &category,
107 const QString& summary, 107 const QString& summary,
108 const QString &description, 108 const QString &description,
109 ushort progress, 109 ushort progress,
110 bool hasDate, QDate date, int uid ) 110 bool hasDate, QDate date, int uid )
111 : OPimRecord( uid ) 111 : OPimRecord( uid )
112{ 112{
113 setCategories( category ); 113 setCategories( category );
114 114
115 data = new OPimTodoData; 115 data = new OPimTodoData;
116 116
117 data->date = date; 117 data->date = date;
118 data->isCompleted = completed; 118 data->isCompleted = completed;
119 data->hasDate = hasDate; 119 data->hasDate = hasDate;
120 if ( priority < 1 )
121 priority = 1;
122 else if ( priority > 5 )
123 priority = 5;
120 data->priority = priority; 124 data->priority = priority;
121 data->sum = summary; 125 data->sum = summary;
122 data->prog = progress; 126 data->prog = progress;
123 data->desc = Qtopia::simplifyMultiLineSpace( description ); 127 data->desc = Qtopia::simplifyMultiLineSpace( description );
124} 128}
125 129
126 130
127OPimTodo::OPimTodo( bool completed, int priority, 131OPimTodo::OPimTodo( bool completed, int priority,
128 const QStringList &category, 132 const QStringList &category,
129 const QString& summary, 133 const QString& summary,
130 const QString &description, 134 const QString &description,
131 ushort progress, 135 ushort progress,
132 bool hasDate, QDate date, int uid ) 136 bool hasDate, QDate date, int uid )
133 : OPimRecord( uid ) 137 : OPimRecord( uid )
134{ 138{
135 setCategories( idsFromString( category.join( ";" ) ) ); 139 setCategories( idsFromString( category.join( ";" ) ) );
136 140
137 data = new OPimTodoData; 141 data = new OPimTodoData;
138 142
139 data->date = date; 143 data->date = date;
140 data->isCompleted = completed; 144 data->isCompleted = completed;
141 data->hasDate = hasDate; 145 data->hasDate = hasDate;
146 if ( priority < 1 )
147 priority = 1;
148 else if ( priority > 5 )
149 priority = 5;
142 data->priority = priority; 150 data->priority = priority;
143 data->sum = summary; 151 data->sum = summary;
144 data->prog = progress; 152 data->prog = progress;
145 data->desc = Qtopia::simplifyMultiLineSpace( description ); 153 data->desc = Qtopia::simplifyMultiLineSpace( description );
146} 154}
147 155
148 156
149bool OPimTodo::match( const QRegExp &regExp ) const 157bool OPimTodo::match( const QRegExp &regExp ) const
150{ 158{
151 if ( QString::number( data->priority ).find( regExp ) != -1 ) 159 if ( QString::number( data->priority ).find( regExp ) != -1 )
152 { 160 {
153 setLastHitField( Priority ); 161 setLastHitField( Priority );
154 return true; 162 return true;
155 } 163 }
156 else if ( data->hasDate && data->date.toString().find( regExp ) != -1 ) 164 else if ( data->hasDate && data->date.toString().find( regExp ) != -1 )
157 { 165 {
158 setLastHitField( HasDate ); 166 setLastHitField( HasDate );
159 return true; 167 return true;
160 } 168 }
161 else if ( data->desc.find( regExp ) != -1 ) 169 else if ( data->desc.find( regExp ) != -1 )
162 { 170 {
163 setLastHitField( Description ); 171 setLastHitField( Description );
164 return true; 172 return true;
165 } 173 }
@@ -318,48 +326,52 @@ void OPimTodo::setCompleted( bool completed )
318void OPimTodo::setHasDueDate( bool hasDate ) 326void OPimTodo::setHasDueDate( bool hasDate )
319{ 327{
320 changeOrModify(); 328 changeOrModify();
321 data->hasDate = hasDate; 329 data->hasDate = hasDate;
322} 330}
323 331
324 332
325void OPimTodo::setDescription( const QString &desc ) 333void OPimTodo::setDescription( const QString &desc )
326{ 334{
327 changeOrModify(); 335 changeOrModify();
328 data->desc = Qtopia::simplifyMultiLineSpace( desc ); 336 data->desc = Qtopia::simplifyMultiLineSpace( desc );
329} 337}
330 338
331 339
332void OPimTodo::setSummary( const QString& sum ) 340void OPimTodo::setSummary( const QString& sum )
333{ 341{
334 changeOrModify(); 342 changeOrModify();
335 data->sum = sum; 343 data->sum = sum;
336} 344}
337 345
338 346
339void OPimTodo::setPriority( int prio ) 347void OPimTodo::setPriority( int prio )
340{ 348{
341 changeOrModify(); 349 changeOrModify();
350 if ( prio < 1 )
351 prio = 1;
352 else if ( prio > 5 )
353 prio = 5;
342 data->priority = prio; 354 data->priority = prio;
343} 355}
344 356
345 357
346void OPimTodo::setDueDate( const QDate& date ) 358void OPimTodo::setDueDate( const QDate& date )
347{ 359{
348 changeOrModify(); 360 changeOrModify();
349 data->date = date; 361 data->date = date;
350} 362}
351 363
352 364
353void OPimTodo::setStartDate( const QDate& date ) 365void OPimTodo::setStartDate( const QDate& date )
354{ 366{
355 changeOrModify(); 367 changeOrModify();
356 data->start = date; 368 data->start = date;
357} 369}
358 370
359 371
360void OPimTodo::setCompletedDate( const QDate& date ) 372void OPimTodo::setCompletedDate( const QDate& date )
361{ 373{
362 changeOrModify(); 374 changeOrModify();
363 data->completed = date; 375 data->completed = date;
364} 376}
365 377