Projects
Kolab:16:Enterprise
libkolab
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 26
View file
libkolab.spec
Changed
@@ -31,18 +31,15 @@ Name: libkolab %endif -Version: 3.0.0 -Release: 0.1.dev20150112.gitf0f953aa%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: Kolab Object Handling Library License: LGPLv3+ URL: http://git.kolab.org/libkolab # From 2881447555eb7965f557158c88ae2aa18e936971 -Source0: http://git.kolab.org/%{name}/snapshot/libkolab-%{version}.tar.gz - -Patch1: 0001-Fix-dangling-pointers.patch -Patch2: 0002-Fixed-memory-leaks-in-tests.patch +Source0: libkolab-%{version}.tar.gz BuildRequires: cmake %if 0%{?rhel} > 7 || 0%{?fedora} @@ -214,8 +211,7 @@ %setup -q -c -n libkolab-%{version} pushd %{name}-%{version} -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 popd %if 0%{?plesk} @@ -489,6 +485,9 @@ %{python3_sitearch}/kolab/shared.py* %changelog +* Tue Jan 04 2022 Christian Mollekopf <mollekopf@kolabsys.com> - 3.0.1-1 +- New upstream release + * Mon Feb 09 2015 Timotheus Pokorra <tp@tbits.net> - master is going towards 0.7
View file
0001-Fix-dangling-pointers.patch
Deleted
@@ -1,64 +0,0 @@ -From 4bda8a1cb3befa5dc4b03c6590640053afb74ef5 Mon Sep 17 00:00:00 2001 -From: Christoph Erhardt <kolab@sicherha.de> -Date: Tue, 25 May 2021 08:57:22 +0200 -Subject: PATCH 1/2 Fix dangling pointers - -std::vector gives zero guarantees that pointers to its elements remain -valid when the vector's size changes. In particular, pushing new -elements into the vector may trigger reallocation of the underlying heap -area. - -Consequently, Event::delegate() needs to ensure that any modifications -to the d->attendees vector are performed before pointers to its elements -are taken and collected. - -Found with Valgrind. - - -Reviewers: mollekopf - -Reviewed By: mollekopf - -Subscribers: mollekopf - -Differential Revision: https://git.kolab.org/D2548 ---- - calendaring/event.cpp | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/calendaring/event.cpp b/calendaring/event.cpp -index bcdf833..ea9ead1 100644 ---- a/calendaring/event.cpp -+++ b/calendaring/event.cpp -@@ -76,17 +76,22 @@ bool contains(const Kolab::ContactReference &delegatorRef, const std::vector <Ko - void Event::delegate(const std::vector< Attendee >& delegators, const std::vector< Attendee >& delegatees) - { - -- //First build a list of attendee references, and insert any missing attendees -- std::vector<Kolab::Attendee*> delegateesRef; -+ //First insert any missing attendees - foreach(const Attendee &a, delegatees) { -- if (Attendee *attendee = getAttendee(a.contact())) { -- delegateesRef.push_back(attendee); -- } else { -+ if (!getAttendee(a.contact())) { - d->attendees.push_back(a); -- delegateesRef.push_back(&d->attendees.back()); - } - } - -+ //Build a list of attendee references -+ //These are pointers into d->attendees, so we MUST NOT modify that vector after this point! -+ std::vector<Kolab::Attendee*> delegateesRef; -+ foreach(const Attendee &a, delegatees) { -+ Attendee *attendee = getAttendee(a.contact()); -+ Q_ASSERT(attendee); -+ delegateesRef.push_back(attendee); -+ } -+ - std::vector<Kolab::Attendee*> delegatorsRef; - foreach(const Attendee& a, delegators) { - if (Attendee *attendee = getAttendee(a.contact())) { --- -2.31.1 -
View file
0002-Fixed-memory-leaks-in-tests.patch
Deleted
@@ -1,196 +0,0 @@ -From 483b1019396296dfffa634abc80ddd19b61b9aa9 Mon Sep 17 00:00:00 2001 -From: Christoph Erhardt <kolab@sicherha.de> -Date: Tue, 25 May 2021 09:01:44 +0200 -Subject: PATCH 2/2 Fixed memory leaks in tests - -toString requires the returned memory to be freed. - -Reviewers: mollekopf - -Reviewed By: mollekopf - -Subscribers: mollekopf - -Differential Revision: https://git.kolab.org/D2548 ---- - tests/calendaringtest.cpp | 4 +- - tests/testhelpers.h | 77 +++++++++++++++++++++++---------------- - 2 files changed, 48 insertions(+), 33 deletions(-) - -diff --git a/tests/calendaringtest.cpp b/tests/calendaringtest.cpp -index 44440dc..cc65605 100644 ---- a/tests/calendaringtest.cpp -+++ b/tests/calendaringtest.cpp -@@ -110,7 +110,9 @@ void CalendaringTest::testRecurrence() - Kolab::cDateTime previousDate = event.start(); - for (int i = 0; i < 9; i++) { - const Kolab::cDateTime nextDate = event.getNextOccurence(previousDate); -- qDebug() << QTest::toString(nextDate); -+ const char *nextDateString = QTest::toString(nextDate); -+ qDebug() << nextDateString; -+ delete nextDateString; - QCOMPARE(nextDate, Kolab::cDateTime("Europe/Zurich", previousDate.year(), previousDate.month(), previousDate.day()+1, previousDate.hour(), previousDate.minute(), previousDate.second())); - const Kolab::cDateTime endDate = event.getOccurenceEndDate(nextDate); - // qDebug() << QTest::toString(endDate); -diff --git a/tests/testhelpers.h b/tests/testhelpers.h -index e09dd3a..8a443de 100644 ---- a/tests/testhelpers.h -+++ b/tests/testhelpers.h -@@ -44,6 +44,19 @@ Q_DECLARE_METATYPE(KCalCore::Event); - Q_DECLARE_METATYPE(KCalCore::Todo); - Q_DECLARE_METATYPE(KCalCore::Journal); - -+namespace { -+ -+ // Appends a C string to a QByteArray and deletes the string argument. -+ // Returns a reference to the QByteArray. -+ QByteArray &append(QByteArray &ba, const char *string) -+ { -+ ba += QByteArray(string); -+ delete string; -+ return ba; -+ } -+ -+} -+ - namespace QTest { - - template<> -@@ -123,7 +136,7 @@ namespace QTest { - { - QByteArray ba = "KCalCore::DateTimeList("; - foreach(const QDateTime &i, l) { -- ba += toString(i); -+ append(ba, toString(i)); - } - ba += ")"; - return qstrdup(ba.data()); -@@ -145,20 +158,20 @@ namespace QTest { - ba += QByteArray::number(r->recurrenceType()) + "\n"; - ba += QByteArray::number(r->frequency()) + "\n"; - ba += QByteArray::number(r->duration()) + "\n"; -- ba += QByteArray(toString(r->startDt())) + "\n"; -- ba += QByteArray(toString(r->endDt())) + "\n"; -- ba += QByteArray(toString(r->bySeconds())) + "\n"; -- ba += QByteArray(toString(r->byMinutes())) + "\n"; -- ba += QByteArray(toString(r->byHours())) + "\n"; -- ba += QByteArray(toString(r->byDays())) + "\n"; -- ba += QByteArray(toString(r->byMonthDays())) + "\n"; -- ba += QByteArray(toString(r->byYearDays())) + "\n"; -- ba += QByteArray(toString(r->byMonths())) + "\n"; -+ append(ba, toString(r->startDt())) += "\n"; -+ append(ba, toString(r->endDt())) += "\n"; -+ append(ba, toString(r->bySeconds())) += "\n"; -+ append(ba, toString(r->byMinutes())) += "\n"; -+ append(ba, toString(r->byHours())) += "\n"; -+ append(ba, toString(r->byDays())) += "\n"; -+ append(ba, toString(r->byMonthDays())) += "\n"; -+ append(ba, toString(r->byYearDays())) += "\n"; -+ append(ba, toString(r->byMonths())) += "\n"; - ba += ")\n"; -- ba += QByteArray(toString(at.exDates())) + "\n"; -- ba += QByteArray(toString(at.exDateTimes())) + "\n"; -- ba += QByteArray(toString(at.rDates())) + "\n"; -- ba += QByteArray(toString(at.rDateTimes())) + "\n"; -+ append(ba, toString(at.exDates())) += "\n"; -+ append(ba, toString(at.exDateTimes())) += "\n"; -+ append(ba, toString(at.rDates())) += "\n"; -+ append(ba, toString(at.rDateTimes())) += "\n"; - - } - return qstrdup(ba.data()); -@@ -173,15 +186,15 @@ namespace QTest { - ba += QByteArray::number(at.frequency()) + "\n"; - ba += QByteArray::number(at.interval()) + "\n"; - ba += QByteArray::number(at.count()) + "\n"; -- ba += QByteArray(toString(at.end())) + "\n"; -- ba += QByteArray(toString(at.bysecond())) + "\n"; -- ba += QByteArray(toString(at.byminute())) + "\n"; -- ba += QByteArray(toString(at.byhour())) + "\n"; -- ba += QByteArray(toString(at.byday())) + "\n"; -- ba += QByteArray(toString(at.bymonthday())) + "\n"; -- ba += QByteArray(toString(at.byyearday())) + "\n"; -- ba += QByteArray(toString(at.byweekno())) + "\n"; -- ba += QByteArray(toString(at.bymonth())) + "\n"; -+ append(ba, toString(at.end())) += "\n"; -+ append(ba, toString(at.bysecond())) += "\n"; -+ append(ba, toString(at.byminute())) += "\n"; -+ append(ba, toString(at.byhour())) += "\n"; -+ append(ba, toString(at.byday())) += "\n"; -+ append(ba, toString(at.bymonthday())) += "\n"; -+ append(ba, toString(at.byyearday())) += "\n"; -+ append(ba, toString(at.byweekno())) += "\n"; -+ append(ba, toString(at.bymonth())) += "\n"; - ba += ")"; - return qstrdup(ba.data()); - } -@@ -213,7 +226,7 @@ namespace QTest { - { - QByteArray ba = "vector<Kolab::ContactReference>("; - for (std::size_t i = 0; i < v.size(); i++) { -- ba += QByteArray(toString(v.at(i)))+ "\n"; -+ append(ba, toString(v.at(i))) += "\n"; - } - ba += ")"; - return qstrdup(ba.data()); -@@ -229,8 +242,8 @@ namespace QTest { - ba += QByteArray::number(a.role()) + "\n"; - ba += QByteArray::number(a.rsvp()) + "\n"; - ba += QByteArray::fromStdString(a.contact().uid())+"\n"; -- ba += QByteArray(toString(a.delegatedTo()))+"\n"; -- ba += QByteArray(toString(a.delegatedFrom()))+ "\n"; -+ append(ba, toString(a.delegatedTo())) += "\n"; -+ append(ba, toString(a.delegatedFrom())) += "\n"; - ba += QByteArray::number(a.cutype())+ "\n"; - ba += ")"; - return qstrdup(ba.data()); -@@ -241,7 +254,7 @@ namespace QTest { - { - QByteArray ba = "vector<Kolab::Attendee>("; - for (std::size_t i = 0; i < v.size(); i++) { -- ba += QByteArray(toString(v.at(i)))+ "\n"; -+ append(ba, toString(v.at(i))) += "\n"; - ba += QByteArray("#######################")+ "\n"; - } - ba += ")"; -@@ -263,7 +276,7 @@ namespace QTest { - { - QByteArray ba = "vector<Kolab::CustomProperty>("; - for (std::size_t i = 0; i < v.size(); i++) { -- ba += QByteArray(toString(v.at(i)))+ "\n"; -+ append(ba, toString(v.at(i))) += "\n"; - } - ba += ")"; - return qstrdup(ba.data()); -@@ -273,8 +286,8 @@ namespace QTest { - char *toString(const Kolab::Period &p) - { - QByteArray ba = "Kolab::Period("; -- ba += QByteArray(toString(p.start))+ "\n"; -- ba += QByteArray(toString(p.end))+ "\n"; -+ append(ba, toString(p.start)) += "\n"; -+ append(ba, toString(p.end)) += "\n"; - ba += ")"; - return qstrdup(ba.data()); - } -@@ -284,7 +297,7 @@ namespace QTest { - { - QByteArray ba = "vector<Kolab::Period>("; - for (std::size_t i = 0; i < v.size(); i++) { -- ba += QByteArray(toString(v.at(i)))+ "\n"; -+ append(ba, toString(v.at(i))) += "\n"; - } - ba += ")"; - return qstrdup(ba.data()); -@@ -298,7 +311,7 @@ namespace QTest { - ba += QByteArray::fromStdString(p.eventUid())+ "\n"; - ba += QByteArray::fromStdString(p.eventLocation())+ "\n"; - ba += QByteArray::fromStdString(p.eventSummary())+ "\n"; -- ba += QByteArray(toString(p.periods()))+ "\n"; -+ append(ba, toString(p.periods())) += "\n"; - ba += ")"; - return qstrdup(ba.data()); - } --- -2.31.1 -
View file
libkolab-0.4.2-cmake-2.8.11.patch
Deleted
@@ -1,29 +0,0 @@ -From 2ca92aa7dd8589f1d0afc1adda14001bb19744b7 Mon Sep 17 00:00:00 2001 -From: Christian Mollekopf <mollekopf@kolabsys.com> -Date: Tue, 14 May 2013 22:20:57 +0000 -Subject: Build with cmake 2.8.11 - -find_package_handle_standard_args already sets SWIG_FOUND, and building -breaks with cmake 2.8.11 otherwise. - -BUG: 1723 -FIXED-IN: 0.4.3 ---- -diff --git a/cmake/modules/FindSWIG.cmake b/cmake/modules/FindSWIG.cmake -index f2476a6..010ebb7 100644 ---- a/cmake/modules/FindSWIG.cmake -+++ b/cmake/modules/FindSWIG.cmake -@@ -1,9 +1,4 @@ - find_program(SWIG swig /usr/bin/) --if(SWIG) -- set(SWIG_FOUND ON) -- message("SWIG found") --endif() - - #abort if any of the requireds are missing --find_package_handle_standard_args(SWIG DEFAULT_MSG -- SWIG_FOUND SWIG) -\ No newline at end of file -+find_package_handle_standard_args(SWIG DEFAULT_MSG SWIG) --- -cgit v0.8.2.1
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +libkolab (3.0.1-0~kolab1) unstable; urgency=low + + * Fixed the kolabcalendaring module + + -- Christian Mollekopf <mollekopf@kolabsys.com> Tue, 04 Jan 2022 11:09:09 +0100 + libkolab (3.0~dev20151230-0~kolab20) unstable; urgency=low * Removed kolabicalendar reference from kolab.ini
View file
debian.control
Changed
@@ -46,8 +46,6 @@ Handles v2/v3 transparently. - conversion: Conversions from KDE to Kolab containers and vice verca. - mime: Mime message handling used by kolabformat - - icalendar: Exposes iCalendar functionality: - iCal reading/writing, iTip, iMip - calendaring: Some general calendaring functions . The libkolab library belongs to the Kolab 3 server components. @@ -63,11 +61,9 @@ Provides: php-bindings-libkolab Conflicts: php-kolab-kde Description: PHP bindings for Kolab Library - This package provides the Kolab PHP modules icalendar and calendaring. + This package provides the Kolab PHP module calendaring. . - The calendaring module provides some general calendaring functions - - The icalendar module exposes iCalendar functionality: - iCal reading/writing, iTip, iMip Package: python-kolab Architecture: any @@ -78,11 +74,9 @@ ${shlibs:Depends} Conflicts: python-kolab-kde Description: Python bindings for Kolab Library - This package provides the Kolab Python modules icalendar and calendaring. + This package provides the Kolab Python module calendaring. . - The calendaring module provides some general calendaring functions - - The icalendar module exposes iCalendar functionality: - iCal reading/writing, iTip, iMip Package: libkolab-dev Section: libdevel
View file
debian.series
Changed
@@ -1,3 +1,1 @@ libkolab-0.5-swigutils.cmake.patch -p1 -0001-Fix-dangling-pointers.patch -p1 -0002-Fixed-memory-leaks-in-tests.patch -p1
View file
libkolab-3.0.0.tar.gz/CMakeLists.txt -> libkolab-3.0.1.tar.gz/CMakeLists.txt
Changed
@@ -32,7 +32,7 @@ set(Libkolab_VERSION_MAJOR 3) set(Libkolab_VERSION_MINOR 0) # Enable the full x.y.z version only for release versions -set(Libkolab_VERSION_PATCH 0) +set(Libkolab_VERSION_PATCH 1) #set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH}) set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}) set(Libkolab_VERSION_STRING ${CMAKE_PROJECT_NAME}-${Libkolab_VERSION})
View file
libkolab-3.0.0.tar.gz/calendaring/calendaring.cpp -> libkolab-3.0.1.tar.gz/calendaring/calendaring.cpp
Changed
@@ -31,6 +31,10 @@ namespace Calendaring { +void dummy() +{ +} + // bool conflicts(const Kolab::Event &e1, const Kolab::Event &e2) // { // KCalCore::Event::Ptr k1 = Kolab::Conversion::toKCalCore(e1);
View file
libkolab-3.0.0.tar.gz/calendaring/calendaring.h -> libkolab-3.0.1.tar.gz/calendaring/calendaring.h
Changed
@@ -34,6 +34,11 @@ namespace Calendaring { /** + * Dummy function to ensure the kolabcalendaring class is created in the php module. + */ +KOLAB_EXPORT void dummy(); + +/** * In-Memory Calendar Cache */ class KOLAB_EXPORT Calendar {
View file
libkolab-3.0.0.tar.gz/calendaring/calendaring.i -> libkolab-3.0.1.tar.gz/calendaring/calendaring.i
Changed
@@ -13,7 +13,7 @@ %import "../shared.i" %rename(EventCal) Kolab::Calendaring::Event; -/* %rename(KolabCalendar) Kolab::Calendaring::Calendar; */ +%rename(KolabCalendar) Kolab::Calendaring::Calendar; -/* %include "../calendaring/calendaring.h" */ +%include "../calendaring/calendaring.h" %include "../calendaring/event.h"
View file
libkolab-3.0.0.tar.gz/calendaring/event.cpp -> libkolab-3.0.1.tar.gz/calendaring/event.cpp
Changed
@@ -76,17 +76,22 @@ void Event::delegate(const std::vector< Attendee >& delegators, const std::vector< Attendee >& delegatees) { - //First build a list of attendee references, and insert any missing attendees - std::vector<Kolab::Attendee*> delegateesRef; + //First insert any missing attendees foreach(const Attendee &a, delegatees) { - if (Attendee *attendee = getAttendee(a.contact())) { - delegateesRef.push_back(attendee); - } else { + if (!getAttendee(a.contact())) { d->attendees.push_back(a); - delegateesRef.push_back(&d->attendees.back()); } } + //Build a list of attendee references + //These are pointers into d->attendees, so we MUST NOT modify that vector after this point! + std::vector<Kolab::Attendee*> delegateesRef; + foreach(const Attendee &a, delegatees) { + Attendee *attendee = getAttendee(a.contact()); + Q_ASSERT(attendee); + delegateesRef.push_back(attendee); + } + std::vector<Kolab::Attendee*> delegatorsRef; foreach(const Attendee& a, delegators) { if (Attendee *attendee = getAttendee(a.contact())) {
View file
libkolab-3.0.0.tar.gz/tests/calendaringtest.cpp -> libkolab-3.0.1.tar.gz/tests/calendaringtest.cpp
Changed
@@ -110,7 +110,9 @@ Kolab::cDateTime previousDate = event.start(); for (int i = 0; i < 9; i++) { const Kolab::cDateTime nextDate = event.getNextOccurence(previousDate); - qDebug() << QTest::toString(nextDate); + const char *nextDateString = QTest::toString(nextDate); + qDebug() << nextDateString; + delete nextDateString; QCOMPARE(nextDate, Kolab::cDateTime("Europe/Zurich", previousDate.year(), previousDate.month(), previousDate.day()+1, previousDate.hour(), previousDate.minute(), previousDate.second())); const Kolab::cDateTime endDate = event.getOccurenceEndDate(nextDate); // qDebug() << QTest::toString(endDate);
View file
libkolab-3.0.0.tar.gz/tests/testhelpers.h -> libkolab-3.0.1.tar.gz/tests/testhelpers.h
Changed
@@ -44,6 +44,19 @@ Q_DECLARE_METATYPE(KCalCore::Todo); Q_DECLARE_METATYPE(KCalCore::Journal); +namespace { + + // Appends a C string to a QByteArray and deletes the string argument. + // Returns a reference to the QByteArray. + QByteArray &append(QByteArray &ba, const char *string) + { + ba += QByteArray(string); + delete string; + return ba; + } + +} + namespace QTest { template<> @@ -123,7 +136,7 @@ { QByteArray ba = "KCalCore::DateTimeList("; foreach(const QDateTime &i, l) { - ba += toString(i); + append(ba, toString(i)); } ba += ")"; return qstrdup(ba.data()); @@ -145,20 +158,20 @@ ba += QByteArray::number(r->recurrenceType()) + "\n"; ba += QByteArray::number(r->frequency()) + "\n"; ba += QByteArray::number(r->duration()) + "\n"; - ba += QByteArray(toString(r->startDt())) + "\n"; - ba += QByteArray(toString(r->endDt())) + "\n"; - ba += QByteArray(toString(r->bySeconds())) + "\n"; - ba += QByteArray(toString(r->byMinutes())) + "\n"; - ba += QByteArray(toString(r->byHours())) + "\n"; - ba += QByteArray(toString(r->byDays())) + "\n"; - ba += QByteArray(toString(r->byMonthDays())) + "\n"; - ba += QByteArray(toString(r->byYearDays())) + "\n"; - ba += QByteArray(toString(r->byMonths())) + "\n"; + append(ba, toString(r->startDt())) += "\n"; + append(ba, toString(r->endDt())) += "\n"; + append(ba, toString(r->bySeconds())) += "\n"; + append(ba, toString(r->byMinutes())) += "\n"; + append(ba, toString(r->byHours())) += "\n"; + append(ba, toString(r->byDays())) += "\n"; + append(ba, toString(r->byMonthDays())) += "\n"; + append(ba, toString(r->byYearDays())) += "\n"; + append(ba, toString(r->byMonths())) += "\n"; ba += ")\n"; - ba += QByteArray(toString(at.exDates())) + "\n"; - ba += QByteArray(toString(at.exDateTimes())) + "\n"; - ba += QByteArray(toString(at.rDates())) + "\n"; - ba += QByteArray(toString(at.rDateTimes())) + "\n"; + append(ba, toString(at.exDates())) += "\n"; + append(ba, toString(at.exDateTimes())) += "\n"; + append(ba, toString(at.rDates())) += "\n"; + append(ba, toString(at.rDateTimes())) += "\n"; } return qstrdup(ba.data()); @@ -173,15 +186,15 @@ ba += QByteArray::number(at.frequency()) + "\n"; ba += QByteArray::number(at.interval()) + "\n"; ba += QByteArray::number(at.count()) + "\n"; - ba += QByteArray(toString(at.end())) + "\n"; - ba += QByteArray(toString(at.bysecond())) + "\n"; - ba += QByteArray(toString(at.byminute())) + "\n"; - ba += QByteArray(toString(at.byhour())) + "\n"; - ba += QByteArray(toString(at.byday())) + "\n"; - ba += QByteArray(toString(at.bymonthday())) + "\n"; - ba += QByteArray(toString(at.byyearday())) + "\n"; - ba += QByteArray(toString(at.byweekno())) + "\n"; - ba += QByteArray(toString(at.bymonth())) + "\n"; + append(ba, toString(at.end())) += "\n"; + append(ba, toString(at.bysecond())) += "\n"; + append(ba, toString(at.byminute())) += "\n"; + append(ba, toString(at.byhour())) += "\n"; + append(ba, toString(at.byday())) += "\n"; + append(ba, toString(at.bymonthday())) += "\n"; + append(ba, toString(at.byyearday())) += "\n"; + append(ba, toString(at.byweekno())) += "\n"; + append(ba, toString(at.bymonth())) += "\n"; ba += ")"; return qstrdup(ba.data()); } @@ -213,7 +226,7 @@ { QByteArray ba = "vector<Kolab::ContactReference>("; for (std::size_t i = 0; i < v.size(); i++) { - ba += QByteArray(toString(v.at(i)))+ "\n"; + append(ba, toString(v.at(i))) += "\n"; } ba += ")"; return qstrdup(ba.data()); @@ -229,8 +242,8 @@ ba += QByteArray::number(a.role()) + "\n"; ba += QByteArray::number(a.rsvp()) + "\n"; ba += QByteArray::fromStdString(a.contact().uid())+"\n"; - ba += QByteArray(toString(a.delegatedTo()))+"\n"; - ba += QByteArray(toString(a.delegatedFrom()))+ "\n"; + append(ba, toString(a.delegatedTo())) += "\n"; + append(ba, toString(a.delegatedFrom())) += "\n"; ba += QByteArray::number(a.cutype())+ "\n"; ba += ")"; return qstrdup(ba.data()); @@ -241,7 +254,7 @@ { QByteArray ba = "vector<Kolab::Attendee>("; for (std::size_t i = 0; i < v.size(); i++) { - ba += QByteArray(toString(v.at(i)))+ "\n"; + append(ba, toString(v.at(i))) += "\n"; ba += QByteArray("#######################")+ "\n"; } ba += ")"; @@ -263,7 +276,7 @@ { QByteArray ba = "vector<Kolab::CustomProperty>("; for (std::size_t i = 0; i < v.size(); i++) { - ba += QByteArray(toString(v.at(i)))+ "\n"; + append(ba, toString(v.at(i))) += "\n"; } ba += ")"; return qstrdup(ba.data()); @@ -273,8 +286,8 @@ char *toString(const Kolab::Period &p) { QByteArray ba = "Kolab::Period("; - ba += QByteArray(toString(p.start))+ "\n"; - ba += QByteArray(toString(p.end))+ "\n"; + append(ba, toString(p.start)) += "\n"; + append(ba, toString(p.end)) += "\n"; ba += ")"; return qstrdup(ba.data()); } @@ -284,7 +297,7 @@ { QByteArray ba = "vector<Kolab::Period>("; for (std::size_t i = 0; i < v.size(); i++) { - ba += QByteArray(toString(v.at(i)))+ "\n"; + append(ba, toString(v.at(i))) += "\n"; } ba += ")"; return qstrdup(ba.data()); @@ -298,7 +311,7 @@ ba += QByteArray::fromStdString(p.eventUid())+ "\n"; ba += QByteArray::fromStdString(p.eventLocation())+ "\n"; ba += QByteArray::fromStdString(p.eventSummary())+ "\n"; - ba += QByteArray(toString(p.periods()))+ "\n"; + append(ba, toString(p.periods())) += "\n"; ba += ")"; return qstrdup(ba.data()); }
View file
libkolab.dsc
Changed
@@ -2,7 +2,7 @@ Source: libkolab Binary: libkolab3, php-kolab, python-kolab, libkolab-dev Architecture: any -Version: 3.0~dev20151230-0~kolab20 +Version: 3.0.1-0~kolab1 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Homepage: http://git.kolab.org/libkolab @@ -37,5 +37,5 @@ php-kolab deb libs optional python-kolab deb python optional Files: - 00000000000000000000000000000000 0 libkolab-3.0.0.tar.gz + 00000000000000000000000000000000 0 libkolab-3.0.1.tar.gz 00000000000000000000000000000000 0 debian.tar.gz
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.