-rw-r--r-- | korganizer/calendarview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7292dcd..7ac5b11 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1241,9 +1241,9 @@ bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a | |||
1241 | ev->setFloats( true ); | 1241 | ev->setFloats( true ); |
1242 | Recurrence * rec = ev->recurrence(); | 1242 | Recurrence * rec = ev->recurrence(); |
1243 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); | 1243 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); |
1244 | rec->addYearlyNum( date.month() ); | 1244 | rec->addYearlyNum( date.month() ); |
1245 | if ( !mCalendar->addEventNoDup( ev ) ) { | 1245 | if ( !mCalendar->addAnniversaryNoDup( ev ) ) { |
1246 | delete ev; | 1246 | delete ev; |
1247 | return false; | 1247 | return false; |
1248 | } | 1248 | } |
1249 | return true; | 1249 | return true; |
@@ -2037,9 +2037,9 @@ void CalendarView::removeCategories() | |||
2037 | int i; | 2037 | int i; |
2038 | int count = 0; | 2038 | int count = 0; |
2039 | while ( inc ) { | 2039 | while ( inc ) { |
2040 | newCatList.clear(); | 2040 | newCatList.clear(); |
2041 | catIncList = QStringList::split (",", inc->categoriesStr() ); | 2041 | catIncList = inc->categories() ; |
2042 | for( i = 0; i< catIncList.count(); ++i ) { | 2042 | for( i = 0; i< catIncList.count(); ++i ) { |
2043 | if ( catList.contains (catIncList[i])) | 2043 | if ( catList.contains (catIncList[i])) |
2044 | newCatList.append( catIncList[i] ); | 2044 | newCatList.append( catIncList[i] ); |
2045 | } | 2045 | } |
@@ -2057,9 +2057,9 @@ int CalendarView::addCategories() | |||
2057 | Incidence* inc = incList.first(); | 2057 | Incidence* inc = incList.first(); |
2058 | int i; | 2058 | int i; |
2059 | int count = 0; | 2059 | int count = 0; |
2060 | while ( inc ) { | 2060 | while ( inc ) { |
2061 | catIncList = QStringList::split (",", inc->categoriesStr() ); | 2061 | catIncList = inc->categories() ; |
2062 | for( i = 0; i< catIncList.count(); ++i ) { | 2062 | for( i = 0; i< catIncList.count(); ++i ) { |
2063 | if ( !catList.contains (catIncList[i])) { | 2063 | if ( !catList.contains (catIncList[i])) { |
2064 | catList.append( catIncList[i] ); | 2064 | catList.append( catIncList[i] ); |
2065 | //qDebug("add cat %s ", catIncList[i].latin1()); | 2065 | //qDebug("add cat %s ", catIncList[i].latin1()); |