diff --git a/resources/kolab/kolabhelpers.cpp b/resources/kolab/kolabhelpers.cpp --- a/resources/kolab/kolabhelpers.cpp +++ b/resources/kolab/kolabhelpers.cpp @@ -458,7 +458,7 @@ void KolabHelpers::setFolderColor(QMap &annotations, const QColor &color) { // kolab saves the color without a "#", so we need to delete the prefix "#" if we save it to the annotations - annotations["/shared" KOLAB_COLOR_ANNOTATION] = color.name().toAscii().remove(0, 1); + annotations["/shared" KOLAB_COLOR_ANNOTATION] = color.name().toLatin1().remove(0, 1); } QString KolabHelpers::getIcon(Kolab::FolderType type) diff --git a/resources/kolab/pimkolab/autotests/benchmark.h b/resources/kolab/pimkolab/autotests/benchmark.h --- a/resources/kolab/pimkolab/autotests/benchmark.h +++ b/resources/kolab/pimkolab/autotests/benchmark.h @@ -24,7 +24,7 @@ class BenchmarkTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void parsingBenchmarkComparison_data(); void parsingBenchmarkComparison(); diff --git a/resources/kolab/pimkolab/autotests/calendaringtest.h b/resources/kolab/pimkolab/autotests/calendaringtest.h --- a/resources/kolab/pimkolab/autotests/calendaringtest.h +++ b/resources/kolab/pimkolab/autotests/calendaringtest.h @@ -22,7 +22,7 @@ class CalendaringTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testCalendaringEvent(); diff --git a/resources/kolab/pimkolab/autotests/debugstreamtest.h b/resources/kolab/pimkolab/autotests/debugstreamtest.h --- a/resources/kolab/pimkolab/autotests/debugstreamtest.h +++ b/resources/kolab/pimkolab/autotests/debugstreamtest.h @@ -23,7 +23,7 @@ class DebugStreamTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void testDebugstream(); void testDebugNotLogged(); void testHasError(); diff --git a/resources/kolab/pimkolab/autotests/debugstreamtest.cpp b/resources/kolab/pimkolab/autotests/debugstreamtest.cpp --- a/resources/kolab/pimkolab/autotests/debugstreamtest.cpp +++ b/resources/kolab/pimkolab/autotests/debugstreamtest.cpp @@ -26,9 +26,9 @@ Error() << "test1"; Error() << "test2" << "bla" << 3 << QMap(); QCOMPARE(Kolab::ErrorHandler::instance().getErrors().size(), 2); - QVERIFY(Kolab::ErrorHandler::instance().getErrors().first().message.contains("test1")); + QVERIFY(Kolab::ErrorHandler::instance().getErrors().first().message.contains(QLatin1String("test1"))); QCOMPARE(Kolab::ErrorHandler::instance().getErrors().first().severity, Kolab::ErrorHandler::Error); - QVERIFY(Kolab::ErrorHandler::instance().getErrors().last().message.contains("bla")); + QVERIFY(Kolab::ErrorHandler::instance().getErrors().last().message.contains(QLatin1String("bla"))); } void DebugStreamTest::testDebugNotLogged() diff --git a/resources/kolab/pimkolab/autotests/formattest.h b/resources/kolab/pimkolab/autotests/formattest.h --- a/resources/kolab/pimkolab/autotests/formattest.h +++ b/resources/kolab/pimkolab/autotests/formattest.h @@ -47,7 +47,7 @@ class FormatTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); diff --git a/resources/kolab/pimkolab/autotests/formattest.cpp b/resources/kolab/pimkolab/autotests/formattest.cpp --- a/resources/kolab/pimkolab/autotests/formattest.cpp +++ b/resources/kolab/pimkolab/autotests/formattest.cpp @@ -62,9 +62,9 @@ KCOMPARE(part->decodedContent().isEmpty(), false); - QString content(part->decodedContent()); + QString content(QString::fromUtf8(part->decodedContent())); normalizeMimemessage(content); - QString expected(expectedPart->decodedContent()); + QString expected(QString::fromUtf8(expectedPart->decodedContent())); normalizeMimemessage(expected); // showDiff(expected, content); @@ -157,7 +157,7 @@ KMime::Message::Ptr convertedMime = Kolab::KolabObjectWriter::writeIncidence(realIncidence, version); if (!compareMimeMessage(convertedMime, msg)) { - showDiff(msg->encodedContent(), convertedMime->encodedContent()); + showDiff(QString::fromUtf8(msg->encodedContent()), QString::fromUtf8(convertedMime->encodedContent())); QVERIFY(false); } QCOMPARE(Kolab::ErrorHandler::instance().error(), Kolab::ErrorHandler::Debug); @@ -251,7 +251,7 @@ // fix up the converted addressee for comparisson convertedAddressee.setName(realAddressee.name()); // name() apparently is something strange if (version == Kolab::KolabV2) { //No creation date in xcal - QVERIFY(!convertedAddressee.custom("KOLAB", "CreationDate").isEmpty()); + QVERIFY(!convertedAddressee.custom(QStringLiteral("KOLAB"), QStringLiteral("CreationDate")).isEmpty()); convertedAddressee.removeCustom(QStringLiteral("KOLAB"), QStringLiteral("CreationDate")); // that's conversion time !? } else { normalizeContact(convertedAddressee); @@ -261,7 +261,7 @@ QVERIFY(normalizeAddresses(convertedAddressee, realAddressee)); // same here QCOMPARE(realAddressee.photo().type(), convertedAddressee.photo().type()); if (realAddressee != convertedAddressee) { - showDiff(normalizeVCardMessage(converter.createVCard(realAddressee)), normalizeVCardMessage(converter.createVCard(convertedAddressee))); + showDiff(normalizeVCardMessage(QString::fromUtf8(converter.createVCard(realAddressee))), normalizeVCardMessage(QString::fromUtf8(converter.createVCard(convertedAddressee)))); } QEXPECT_FAIL("v2contactBug238996", "Currently fails due to missing type=pref attribute of preffered email address. Requires fix in KContacts.", Continue); QEXPECT_FAIL("v2contactEmails", "Currently fails due to missing type=pref attribute of preffered email address. Requires fix in KContacts.", Continue); @@ -274,9 +274,9 @@ const KMime::Message::Ptr &convertedMime = Kolab::KolabObjectWriter::writeContact(realAddressee, version); if (!compareMimeMessage(convertedMime, msg)) { - QString expected = msg->encodedContent(); + QString expected = QString::fromUtf8(msg->encodedContent()); normalizeMimemessage(expected); - QString converted = convertedMime->encodedContent(); + QString converted = QString::fromUtf8(convertedMime->encodedContent()); normalizeMimemessage(converted); showDiff(expected, converted); QEXPECT_FAIL("v2contactSimple", "The kolab v3 containers don't support postbox, and we therefore loose it in the transformations.", Continue); @@ -337,17 +337,17 @@ converted.open(QIODevice::WriteOnly); KContacts::ContactGroupTool::convertToXml(convertedAddressee, &converted); - showDiff(expected.buffer(), converted.buffer()); + showDiff(QString::fromUtf8(expected.buffer()), QString::fromUtf8(converted.buffer())); } QCOMPARE(realAddressee, convertedAddressee); //Write const KMime::Message::Ptr &convertedMime = Kolab::KolabObjectWriter::writeDistlist(realAddressee, version); if (!compareMimeMessage(convertedMime, msg)) { - QString expected = msg->encodedContent(); + QString expected = QString::fromUtf8(msg->encodedContent()); normalizeMimemessage(expected); - QString converted = convertedMime->encodedContent(); + QString converted = QString::fromUtf8(convertedMime->encodedContent()); normalizeMimemessage(converted); showDiff(expected, converted); QVERIFY(false); @@ -390,9 +390,9 @@ QVERIFY(ok); QVERIFY(realNote.data()); - QString expected = realNote->encodedContent(); + QString expected = QString::fromUtf8(realNote->encodedContent()); normalizeMimemessage(expected); - QString converted = convertedNote->encodedContent(); + QString converted = QString::fromUtf8(convertedNote->encodedContent()); normalizeMimemessage(converted); QEXPECT_FAIL("", "Header sorting is off", Continue); QCOMPARE(expected, converted); @@ -403,9 +403,9 @@ QVERIFY(convertedMime.data()); QVERIFY(msg.data()); - QString expected2 = msg->encodedContent(); + QString expected2 = QString::fromUtf8(msg->encodedContent()); normalizeMimemessage(expected2); - QString converted2 = convertedMime->encodedContent(); + QString converted2 = QString::fromUtf8(convertedMime->encodedContent()); normalizeMimemessage(converted2); QEXPECT_FAIL("", "Header sorting is off", Continue); QCOMPARE(expected2, converted2); diff --git a/resources/kolab/pimkolab/autotests/freebusytest.h b/resources/kolab/pimkolab/autotests/freebusytest.h --- a/resources/kolab/pimkolab/autotests/freebusytest.h +++ b/resources/kolab/pimkolab/autotests/freebusytest.h @@ -22,7 +22,7 @@ class FreebusyTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void testFB_data(); void testFB(); diff --git a/resources/kolab/pimkolab/autotests/icalendartest.h b/resources/kolab/pimkolab/autotests/icalendartest.h --- a/resources/kolab/pimkolab/autotests/icalendartest.h +++ b/resources/kolab/pimkolab/autotests/icalendartest.h @@ -22,7 +22,7 @@ class ICalendarTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // void testEventConflict_data(); void testToICal(); diff --git a/resources/kolab/pimkolab/autotests/kcalconversiontest.h b/resources/kolab/pimkolab/autotests/kcalconversiontest.h --- a/resources/kolab/pimkolab/autotests/kcalconversiontest.h +++ b/resources/kolab/pimkolab/autotests/kcalconversiontest.h @@ -24,7 +24,7 @@ class KCalConversionTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testDate_data(); diff --git a/resources/kolab/pimkolab/autotests/kcalconversiontest.cpp b/resources/kolab/pimkolab/autotests/kcalconversiontest.cpp --- a/resources/kolab/pimkolab/autotests/kcalconversiontest.cpp +++ b/resources/kolab/pimkolab/autotests/kcalconversiontest.cpp @@ -199,7 +199,7 @@ kcal.setNonKDECustomProperty("X-KOLAB-key1", QStringLiteral("value1")); kcal.setNonKDECustomProperty("X-KOLAB-key2", QStringLiteral("value2")); kcal.setCustomProperty("SOMEOTHERAPP", "key2", QStringLiteral("value2")); - Q_ASSERT(kcal.nonKDECustomProperty("X-KOLAB-key1") == "value1"); + Q_ASSERT(kcal.nonKDECustomProperty("X-KOLAB-key1") == QLatin1String("value1")); Kolab::Event kolab; kolab.setUid("uid"); diff --git a/resources/kolab/pimkolab/autotests/kolabobjecttest.h b/resources/kolab/pimkolab/autotests/kolabobjecttest.h --- a/resources/kolab/pimkolab/autotests/kolabobjecttest.h +++ b/resources/kolab/pimkolab/autotests/kolabobjecttest.h @@ -22,7 +22,7 @@ class KolabObjectTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void preserveLatin1(); void preserveUnicode(); void dontCrashWithEmptyOrganizer(); diff --git a/resources/kolab/pimkolab/autotests/legacyformattest.h b/resources/kolab/pimkolab/autotests/legacyformattest.h --- a/resources/kolab/pimkolab/autotests/legacyformattest.h +++ b/resources/kolab/pimkolab/autotests/legacyformattest.h @@ -23,7 +23,7 @@ class V2Test : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void testReadDistlistUID(); void testWriteDistlistUID(); }; diff --git a/resources/kolab/pimkolab/autotests/legacyformattest.cpp b/resources/kolab/pimkolab/autotests/legacyformattest.cpp --- a/resources/kolab/pimkolab/autotests/legacyformattest.cpp +++ b/resources/kolab/pimkolab/autotests/legacyformattest.cpp @@ -49,7 +49,7 @@ Kolab::XMLObject xo; const std::string xml = xo.writeDistlist(distlist, Kolab::KolabV2); - QVERIFY(QString::fromStdString(xml).contains("memberuid")); + QVERIFY(QString::fromStdString(xml).contains(QLatin1String("memberuid"))); QVERIFY(!Kolab::ErrorHandler::errorOccured()); } diff --git a/resources/kolab/pimkolab/autotests/mimeobjecttest.h b/resources/kolab/pimkolab/autotests/mimeobjecttest.h --- a/resources/kolab/pimkolab/autotests/mimeobjecttest.h +++ b/resources/kolab/pimkolab/autotests/mimeobjecttest.h @@ -29,7 +29,7 @@ { Q_OBJECT -private slots: +private Q_SLOTS: void testEvent_data(); void testEvent(); void testTodo_data(); diff --git a/resources/kolab/pimkolab/autotests/testhelpers.h b/resources/kolab/pimkolab/autotests/testhelpers.h --- a/resources/kolab/pimkolab/autotests/testhelpers.h +++ b/resources/kolab/pimkolab/autotests/testhelpers.h @@ -73,14 +73,14 @@ char *toString(const KCalCore::Attendee &at) { QByteArray ba = "Attendee("; - ba += at.name().toAscii() + ", "; - ba += at.email().toAscii() + ", "; + ba += at.name().toLatin1() + ", "; + ba += at.email().toLatin1() + ", "; ba += QByteArray::number(at.role()) + ", "; ba += QByteArray::number(at.status()) + ", "; ba += QByteArray::number(at.RSVP()) + ", "; - ba += at.delegate().toAscii() + ", "; - ba += at.delegator().toAscii() + ", "; - ba += at.uid().toAscii() + ", "; + ba += at.delegate().toLatin1() + ", "; + ba += at.delegator().toLatin1() + ", "; + ba += at.uid().toLatin1() + ", "; ba += ")"; return qstrdup(ba.data()); } diff --git a/resources/kolab/pimkolab/autotests/timezonetest.h b/resources/kolab/pimkolab/autotests/timezonetest.h --- a/resources/kolab/pimkolab/autotests/timezonetest.h +++ b/resources/kolab/pimkolab/autotests/timezonetest.h @@ -22,7 +22,7 @@ class TimezoneTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: /** * If this unittest fails, many others will follow. */ diff --git a/resources/kolab/pimkolab/autotests/upgradetest.h b/resources/kolab/pimkolab/autotests/upgradetest.h --- a/resources/kolab/pimkolab/autotests/upgradetest.h +++ b/resources/kolab/pimkolab/autotests/upgradetest.h @@ -35,7 +35,7 @@ class UpgradeTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void testIncidence_data(); void testIncidence(); diff --git a/resources/kolab/pimkolab/autotests/upgradetest.cpp b/resources/kolab/pimkolab/autotests/upgradetest.cpp --- a/resources/kolab/pimkolab/autotests/upgradetest.cpp +++ b/resources/kolab/pimkolab/autotests/upgradetest.cpp @@ -170,7 +170,7 @@ KContacts::VCardConverter converter; if (v2Addressee != v3result) { - showDiff(converter.createVCard(v2Addressee), converter.createVCard(v3result)); + showDiff(QString::fromUtf8(converter.createVCard(v2Addressee)), QString::fromUtf8(converter.createVCard(v3result))); QVERIFY(false); } QCOMPARE(Kolab::ErrorHandler::instance().error(), Kolab::ErrorHandler::Debug); diff --git a/resources/kolab/pimkolab/autotests/xmlobjecttest.h b/resources/kolab/pimkolab/autotests/xmlobjecttest.h --- a/resources/kolab/pimkolab/autotests/xmlobjecttest.h +++ b/resources/kolab/pimkolab/autotests/xmlobjecttest.h @@ -23,7 +23,7 @@ class XMLObjectTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void testEvent(); void testDontCrash(); }; diff --git a/resources/kolab/pimkolab/calendaring/datetimeutils.cpp b/resources/kolab/pimkolab/calendaring/datetimeutils.cpp --- a/resources/kolab/pimkolab/calendaring/datetimeutils.cpp +++ b/resources/kolab/pimkolab/calendaring/datetimeutils.cpp @@ -24,7 +24,7 @@ namespace DateTimeUtils { KOLAB_EXPORT std::string getLocalTimezone() { - const QString tz = QTimeZone::systemTimeZoneId(); + const auto tz = QTimeZone::systemTimeZoneId(); return tz.toStdString(); } } //Namespace diff --git a/resources/kolab/pimkolab/calendaring/event.cpp b/resources/kolab/pimkolab/calendaring/event.cpp --- a/resources/kolab/pimkolab/calendaring/event.cpp +++ b/resources/kolab/pimkolab/calendaring/event.cpp @@ -75,7 +75,7 @@ std::string Event::toMime() const { - return std::string(QString(KolabObjectWriter::writeEvent(Kolab::Conversion::toKCalCore(*this))->encodedContent()).toUtf8().constData()); + return std::string(KolabObjectWriter::writeEvent(Kolab::Conversion::toKCalCore(*this))->encodedContent().constData()); } bool Event::fromICal(const std::string &input) diff --git a/resources/kolab/pimkolab/conversion/kcalconversion.cpp b/resources/kolab/pimkolab/conversion/kcalconversion.cpp --- a/resources/kolab/pimkolab/conversion/kcalconversion.cpp +++ b/resources/kolab/pimkolab/conversion/kcalconversion.cpp @@ -391,7 +391,7 @@ std::vector customProperties; const QMap &props = e.customProperties(); for (QMap::const_iterator it = props.begin(), end(props.end()); it != end; ++it) { - QString key(it.key()); + QString key(QString::fromUtf8(it.key())); if (key == QLatin1String(CUSTOM_KOLAB_URL)) { continue; } diff --git a/resources/kolab/pimkolab/conversion/kolabconversion.cpp b/resources/kolab/pimkolab/conversion/kolabconversion.cpp --- a/resources/kolab/pimkolab/conversion/kolabconversion.cpp +++ b/resources/kolab/pimkolab/conversion/kolabconversion.cpp @@ -61,7 +61,7 @@ if (a.url().isValid()) { attachment.setUri(toStdString(a.url().toString()), toStdString(a.mimetype())); } else { - attachment.setData(toStdString(QString(a.data())), toStdString(a.mimetype())); + attachment.setData(toStdString(QString::fromUtf8(a.data())), toStdString(a.mimetype())); } attachment.setLabel(toStdString(a.label())); attachments.push_back(attachment); diff --git a/resources/kolab/pimkolab/conversion/timezoneconverter.cpp b/resources/kolab/pimkolab/conversion/timezoneconverter.cpp --- a/resources/kolab/pimkolab/conversion/timezoneconverter.cpp +++ b/resources/kolab/pimkolab/conversion/timezoneconverter.cpp @@ -28,7 +28,7 @@ } auto normalizedId = QTimeZone::windowsIdToDefaultIanaId(tz.toLatin1()); if (!normalizedId.isEmpty()) { - return normalizedId; + return QString::fromUtf8(normalizedId); } //We're dealing with an invalid or unknown timezone, try to parse it QString guessedTimezone = fromCityName(tz); @@ -53,9 +53,9 @@ const auto zones = QTimeZone::availableTimeZoneIds(); QHash countryMap; for (const auto &zone : zones) { - const QString cityName = zone.split('/').last(); + const QString cityName = QString::fromUtf8(zone.split('/').last()); Q_ASSERT(!countryMap.contains(cityName)); - countryMap.insert(cityName, zone); + countryMap.insert(cityName, QString::fromUtf8(zone)); } QRegExp locationFinder(QLatin1String("\\b([a-zA-Z])+\\b"), Qt::CaseSensitive, QRegExp::RegExp2); @@ -206,8 +206,8 @@ const WindowsTimezone &windowsTimezone = windowsTimezones[i]; const QByteArray specifier(windowsTimezone.timezoneSpecifier); const QByteArray windowsName(windowsTimezone.name); - if ((!specifier.isEmpty() && tz.contains(specifier)) - || (!windowsName.isEmpty() && tz.contains(windowsName))) { + if ((!specifier.isEmpty() && tz.contains(QString::fromUtf8(specifier))) + || (!windowsName.isEmpty() && tz.contains(QString::fromUtf8(windowsName)))) { //TODO find the olson timezone matching the local timezone if we have multiple to map to return QString::fromLatin1(windowsTimezone.olson[0]); } diff --git a/resources/kolab/pimkolab/icalendar/icalendar.cpp b/resources/kolab/pimkolab/icalendar/icalendar.cpp --- a/resources/kolab/pimkolab/icalendar/icalendar.cpp +++ b/resources/kolab/pimkolab/icalendar/icalendar.cpp @@ -133,13 +133,13 @@ || method == KCalCore::iTIPCancel || method == KCalCore::iTIPAdd || method == KCalCore::iTIPDeclineCounter) { - return Conversion::toStdString(QString(mailAttendees(e, bccMe, messageText))); + return Conversion::toStdString(QString::fromUtf8(mailAttendees(e, bccMe, messageText))); } else { QString subject; if (e && method == KCalCore::iTIPCounter) { subject = i18n("Counter proposal: %1", e->summary()); } - return Conversion::toStdString(QString(mailOrganizer(e, Conversion::fromStdString(from), bccMe, messageText, subject))); + return Conversion::toStdString(QString::fromUtf8(mailOrganizer(e, Conversion::fromStdString(from), bccMe, messageText, subject))); } } @@ -155,6 +155,6 @@ qCWarning(PIMKOLAB_LOG) << "could not find text/calendar part"; return std::vector< Event >(); } - return fromITip(Conversion::toStdString(QString(c->decodedContent()))); + return fromITip(Conversion::toStdString(QString::fromUtf8(c->decodedContent()))); } } diff --git a/resources/kolab/pimkolab/kolabformat/kolabobject.cpp b/resources/kolab/pimkolab/kolabformat/kolabobject.cpp --- a/resources/kolab/pimkolab/kolabformat/kolabobject.cpp +++ b/resources/kolab/pimkolab/kolabformat/kolabobject.cpp @@ -37,6 +37,8 @@ #include #include +#include + namespace Kolab { static inline QString eventKolabType() { @@ -151,13 +153,14 @@ } RelationMember member; if (!isShared) { - member.user = path.takeFirst(); + member.user = QString::fromUtf8(path.takeFirst()); } member.uid = path.takeLast().toLong(); member.mailbox = path; - member.messageId = ownUrlDecode(url.encodedQueryItemValue("message-id")); - member.subject = ownUrlDecode(url.encodedQueryItemValue("subject")); - member.date = ownUrlDecode(url.encodedQueryItemValue("date")); + QUrlQuery query(url); + member.messageId = ownUrlDecode(query.queryItemValue(QStringLiteral("message-id"), QUrl::FullyEncoded).toUtf8()); + member.subject = ownUrlDecode(query.queryItemValue(QStringLiteral("subject"), QUrl::FullyEncoded).toUtf8()); + member.date = ownUrlDecode(query.queryItemValue(QStringLiteral("date"), QUrl::FullyEncoded).toUtf8()); // qCDebug(PIMKOLAB_LOG) << member.uid << member.mailbox; return member; } @@ -188,16 +191,16 @@ path << "shared"; } Q_FOREACH (const QByteArray &mb, member.mailbox) { - path << QUrl::toPercentEncoding(mb); + path << QUrl::toPercentEncoding(QString::fromUtf8(mb)); } path << QByteArray::number(member.uid); - url.setEncodedPath('/' + join(path, "/")); + url.setPath(QString::fromUtf8('/' + join(path, "/")), QUrl::TolerantMode); - QList > queryItems; - queryItems.append(qMakePair(QStringLiteral("message-id").toLatin1(), QUrl::toPercentEncoding(member.messageId))); - queryItems.append(qMakePair(QStringLiteral("subject").toLatin1(), QUrl::toPercentEncoding(member.subject))); - queryItems.append(qMakePair(QStringLiteral("date").toLatin1(), QUrl::toPercentEncoding(member.date))); - url.setEncodedQueryItems(queryItems); + QUrlQuery query; + query.addQueryItem(QStringLiteral("message-id"), member.messageId); + query.addQueryItem(QStringLiteral("subject"), member.subject); + query.addQueryItem(QStringLiteral("date"), member.date); + url.setQuery(query); return QString::fromLatin1(url.toEncoded()); } diff --git a/resources/kolab/pimkolab/kolabformatV2/incidence.cpp b/resources/kolab/pimkolab/kolabformatV2/incidence.cpp --- a/resources/kolab/pimkolab/kolabformatV2/incidence.cpp +++ b/resources/kolab/pimkolab/kolabformatV2/incidence.cpp @@ -38,7 +38,6 @@ #include #include -#include #include @@ -605,7 +604,7 @@ void Incidence::saveCustomAttributes(QDomElement &element) const { foreach (const Custom &custom, mCustomList) { - QString key(custom.key); + QString key(QString::fromUtf8(custom.key)); Q_ASSERT(!key.isEmpty()); if (key.startsWith(QLatin1String("X-KDE-KolabUnhandled-"))) { key = key.mid(strlen("X-KDE-KolabUnhandled-")); @@ -728,7 +727,7 @@ QBitArray arr = recur->days(); for (int idx = 0; idx < 7; ++idx) { if (arr.testBit(idx)) { - mRecurrence.days.append(s_weekDayName[idx]); + mRecurrence.days.append(QString::fromUtf8(s_weekDayName[idx])); } } } @@ -742,7 +741,7 @@ KCalCore::RecurrenceRule::WDayPos monthPos = monthPositions.first(); // TODO: Handle multiple days in the same week mRecurrence.dayNumber = QString::number(monthPos.pos()); - mRecurrence.days.append(s_weekDayName[ monthPos.day()-1 ]); + mRecurrence.days.append(QString::fromUtf8(s_weekDayName[ monthPos.day()-1 ])); // Not (properly) handled(?): monthPos.negative (nth days before end of month) } break; @@ -767,7 +766,7 @@ mRecurrence.dayNumber = QString::number(day); QList months = recur->yearMonths(); if (!months.isEmpty()) { - mRecurrence.month = s_monthName[ months.first() - 1 ]; // #### Kolab XML limitation: only one month specified + mRecurrence.month = QString::fromUtf8(s_monthName[ months.first() - 1 ]); // #### Kolab XML limitation: only one month specified } break; } @@ -781,14 +780,14 @@ mRecurrence.type = QStringLiteral("weekday"); QList months = recur->yearMonths(); if (!months.isEmpty()) { - mRecurrence.month = s_monthName[ months.first() - 1 ]; // #### Kolab XML limitation: only one month specified + mRecurrence.month = QString::fromUtf8(s_monthName[ months.first() - 1 ]); // #### Kolab XML limitation: only one month specified } QList monthPositions = recur->yearPositions(); if (!monthPositions.isEmpty()) { KCalCore::RecurrenceRule::WDayPos monthPos = monthPositions.first(); // TODO: Handle multiple days in the same week mRecurrence.dayNumber = QString::number(monthPos.pos()); - mRecurrence.days.append(s_weekDayName[ monthPos.day()-1 ]); + mRecurrence.days.append(QString::fromUtf8(s_weekDayName[ monthPos.day()-1 ])); //mRecurrence.dayNumber = QString::number( *recur->yearNums().getFirst() ); // Not handled: monthPos.negative (nth days before end of month) @@ -914,7 +913,7 @@ arr.fill(false); foreach (const QString &day, days) { for (int i = 0; i < 7; ++i) { - if (day == s_weekDayName[i]) { + if (day == QLatin1String(s_weekDayName[i])) { arr.setBit(i, true); } } @@ -1003,15 +1002,15 @@ if (mRecurrence.type == QLatin1String("monthday")) { recur->addYearlyDate(mRecurrence.dayNumber.toInt()); for (int i = 0; i < 12; ++i) { - if (s_monthName[ i ] == mRecurrence.month) { + if (QLatin1String(s_monthName[ i ]) == mRecurrence.month) { recur->addYearlyMonth(i+1); } } } else if (mRecurrence.type == QLatin1String("yearday")) { recur->addYearlyDay(mRecurrence.dayNumber.toInt()); } else if (mRecurrence.type == QLatin1String("weekday")) { for (int i = 0; i < 12; ++i) { - if (s_monthName[ i ] == mRecurrence.month) { + if (QLatin1String(s_monthName[ i ]) == mRecurrence.month) { recur->addYearlyMonth(i+1); } } @@ -1047,7 +1046,7 @@ QString Incidence::productID() const { - return QStringLiteral("%1, Kolab resource").arg(LIBKOLAB_LIB_VERSION_STRING); + return QStringLiteral("%1, Kolab resource").arg(QString::fromUtf8(LIBKOLAB_LIB_VERSION_STRING)); } // Unhandled KCalCore::Incidence fields: diff --git a/resources/kolab/pimkolab/mime/mimeutils.cpp b/resources/kolab/pimkolab/mime/mimeutils.cpp --- a/resources/kolab/pimkolab/mime/mimeutils.cpp +++ b/resources/kolab/pimkolab/mime/mimeutils.cpp @@ -146,7 +146,7 @@ KMime::Message::Ptr message(new KMime::Message); message->date()->setDateTime(QDateTime::currentDateTimeUtc()); KMime::Headers::Generic *h = new KMime::Headers::Generic(X_KOLAB_TYPE_HEADER); - h->fromUnicodeString(xKolabType, "utf-8"); + h->fromUnicodeString(QString::fromUtf8(xKolabType), "utf-8"); message->appendHeader(h); if (v3) { KMime::Headers::Generic *hv3 = new KMime::Headers::Generic(X_KOLAB_MIME_VERSION_HEADER);