Merged branches from BRANCH_1_0

1 files changed, 2 insertions, 2 deletions

diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp
index 2f33255..000ff71 100644
--- a/library/datebookdb.cpp
+++ b/library/datebookdb.cpp
@@ -834,25 +834,25 @@ void DateBookDB::loadFile( const QString &strFile )
                 else if ( value == "MonthlyDay" )
                     rp.type = Event::MonthlyDay;
                 else if ( value == "MonthlyDate" )
                     rp.type = Event::MonthlyDate;
                 else if ( value == "Yearly" )
                     rp.type = Event::Yearly;
                 else
                     rp.type = Event::NoRepeat;
                 break;
             case FRWeekdays:
                     // QtopiaDesktop 1.6 sometimes creates 'rweekdays="0"'
                     // when it goes mad. This causes datebook to crash.. (se)
-                    if ( value.toInt() != 0 ) 
+                    if ( value.toInt() != 0 )
                             rp.days = value.toInt();
                     else
                             rp.days = 1;
                 break;
             case FRPosition:
                 rp.position = value.toInt();
                 break;
             case FRFreq:
                 rp.frequency = value.toInt();
                 break;
             case FRHasEndDate:
                 rp.hasEndDate = value.toInt();
@@ -1031,25 +1031,25 @@ void DateBookDB::reload()
     }
     eventList.clear();
     repeatEvents.clear(); // should be a NOP
     init();
 }
 
 bool DateBookDB::removeRepeat( const Event &ev )
 {
     time_t removeMe = ev.repeatPattern().createTime;
     QValueListIterator<Event> it;
     for ( it = repeatEvents.begin(); it != repeatEvents.end(); ++it ) {
         if ( removeMe == (*it).repeatPattern().createTime ) {
-            repeatEvents.remove( *it );
+            (void)repeatEvents.remove( it );
             // best break, or we are going into undefined territory!
             return TRUE;
         }
     }
     return FALSE;
 }
 
 bool DateBookDB::origRepeat( const Event &ev, Event &orig ) const
 {
     time_t removeMe = ev.repeatPattern().createTime;
     QValueListConstIterator<Event> it;
     for ( it = repeatEvents.begin(); it != repeatEvents.end(); ++it ) {