| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
| -rw-r--r-- | libkcal/vcalformat.cpp | 50 |
2 files changed, 10 insertions, 43 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 55b120f..81efb6c 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -7,4 +7,7 @@ Tooltips in month view were not sorted. Fixed. Daylabel in agenda view ( for display of one day ) was too short. Fixed. Conflict display dialog for syncing was not on top of other windows. Fixed. +Fixed some minor problems. + +Fixed an endless loop when importing vcs file with RESOURCES entry. ********** VERSION 2.0.16 ************ diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 223aa5a..62a31ae 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -232,5 +232,5 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) VObject *vtodo; QString tmpStr; - QStringList tmpStrList; + vtodo = newVObject(VCTodoProp); @@ -333,5 +333,5 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) // categories - tmpStrList = anEvent->categories(); + QStringList tmpStrList = anEvent->categories(); tmpStr = ""; QString catStr; @@ -397,6 +397,5 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) VObject *vevent; QString tmpStr; - QStringList tmpStrList; - + vevent = newVObject(VCEventProp); @@ -604,5 +603,5 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) // categories - tmpStrList = anEvent->categories(); + QStringList tmpStrList = anEvent->categories(); tmpStr = ""; QString catStr; @@ -870,22 +869,9 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) // categories - QStringList tmpStrList; - int index1 = 0; - int index2 = 0; if ((vo = isAPropertyOf(vtodo, VCCategoriesProp)) != 0) { s = fakeCString(vObjectUStringZValue(vo)); QString categories = QString::fromLocal8Bit(s); deleteStr(s); - //const char* category; - QString category; - while ((index2 = categories.find(',', index1)) != -1) { - //category = (const char *) categories.mid(index1, (index2 - index1)); - category = categories.mid(index1, (index2 - index1)); - tmpStrList.append(category); - index1 = index2+1; - } - // get last category - category = categories.mid(index1, (categories.length()-index1)); - tmpStrList.append(category); + QStringList tmpStrList = QStringList::split( ';', categories ); anEvent->setCategories(tmpStrList); } @@ -1329,26 +1315,13 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // categories QStringList tmpStrList; - int index1 = 0; - int index2 = 0; if ((vo = isAPropertyOf(vevent, VCCategoriesProp)) != 0) { s = fakeCString(vObjectUStringZValue(vo)); QString categories = QString::fromLocal8Bit(s); deleteStr(s); - //const char* category; - QString category; - while ((index2 = categories.find(',', index1)) != -1) { - //category = (const char *) categories.mid(index1, (index2 - index1)); - category = categories.mid(index1, (index2 - index1)); - tmpStrList.append(category); - index1 = index2+1; - } - // get last category - category = categories.mid(index1, (categories.length()-index1)); - tmpStrList.append(category); + tmpStrList = QStringList::split( ';', categories ); anEvent->setCategories(tmpStrList); } // attachments - tmpStrList.clear(); initPropIterator(&voi, vevent); while (moreIteration(&voi)) { @@ -1365,16 +1338,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) QString resources = (s = fakeCString(vObjectUStringZValue(vo))); deleteStr(s); - tmpStrList.clear(); - index1 = 0; - index2 = 0; - QString resource; - while ((index2 = resources.find(';', index1)) != -1) { - resource = resources.mid(index1, (index2 - index1)); - tmpStrList.append(resource); - index1 = index2; - } + tmpStrList = QStringList::split( ';', resources ); anEvent->setResources(tmpStrList); } - /* alarm stuff */ if ((vo = isAPropertyOf(vevent, VCDAlarmProp))) { |