Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kpkpass for openSUSE:Factory checked in at 2024-05-27 11:47:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpkpass (Old) and /work/SRC/openSUSE:Factory/.kpkpass.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpkpass" Mon May 27 11:47:24 2024 rev:69 rq:1176354 version:24.05.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpkpass/kpkpass.changes 2024-04-15 20:18:43.229144867 +0200 +++ /work/SRC/openSUSE:Factory/.kpkpass.new.24587/kpkpass.changes 2024-05-27 11:53:00.247525153 +0200 @@ -1,0 +2,17 @@ +Sun May 19 09:56:50 UTC 2024 - Christophe Marin <[email protected]> + +- Update to 24.05.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/24.05.0/ +- No code change since 24.04.80 + +------------------------------------------------------------------- +Fri May 3 09:16:35 UTC 2024 - Christophe Marin <[email protected]> + +- Update to 24.04.80 + * New feature release +- Changes since 24.02.2: + * Use local include + +------------------------------------------------------------------- Old: ---- kpkpass-24.02.2.tar.xz kpkpass-24.02.2.tar.xz.sig New: ---- kpkpass-24.05.0.tar.xz kpkpass-24.05.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpkpass.spec ++++++ --- /var/tmp/diff_new_pack.VY0dtV/_old 2024-05-27 11:53:01.519571804 +0200 +++ /var/tmp/diff_new_pack.VY0dtV/_new 2024-05-27 11:53:01.523571950 +0200 @@ -21,14 +21,14 @@ %bcond_without released Name: kpkpass -Version: 24.02.2 +Version: 24.05.0 Release: 0 Summary: Library to parse Passbook files License: LGPL-2.1-or-later URL: https://www.kde.org -Source: %{name}-%{version}.tar.xz +Source0: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with released} -Source1: %{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif BuildRequires: doxygen ++++++ kpkpass-24.02.2.tar.xz -> kpkpass-24.05.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-24.02.2/.gitignore new/kpkpass-24.05.0/.gitignore --- old/kpkpass-24.02.2/.gitignore 2024-03-21 20:38:08.000000000 +0100 +++ new/kpkpass-24.05.0/.gitignore 2024-05-11 15:42:32.000000000 +0200 @@ -28,3 +28,4 @@ /cmake-build* .cache Testing/ +/.vscode/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-24.02.2/CMakeLists.txt new/kpkpass-24.05.0/CMakeLists.txt --- old/kpkpass-24.02.2/CMakeLists.txt 2024-03-21 20:38:08.000000000 +0100 +++ new/kpkpass-24.05.0/CMakeLists.txt 2024-05-11 15:42:32.000000000 +0200 @@ -3,10 +3,10 @@ # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "6.0.2") +set(PIM_VERSION "6.1.0") project(KPkPass VERSION ${PIM_VERSION}) -set(KF_MIN_VERSION "5.246.0") +set(KF_MIN_VERSION "6.0.0") set(QT_REQUIRED_VERSION "6.6.0") find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -17,6 +17,7 @@ include(ECMGenerateHeaders) include(ECMQtDeclareLoggingCategory) include(ECMDeprecationSettings) +include(ECMFeatureSummary) include(ECMSetupVersion) include(FeatureSummary) include(KDEGitCommitHooks) @@ -46,7 +47,7 @@ endif() add_definitions(-DQT_NO_CONTEXTLESS_CONNECT) -ecm_set_disabled_deprecation_versions(QT 6.6.0 KF 5.248.0) +ecm_set_disabled_deprecation_versions(QT 6.7.0 KF 6.1.0) @@ -63,7 +64,7 @@ endif() kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) -feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) +ecm_feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6PkPass") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-24.02.2/autotests/fieldtest.cpp new/kpkpass-24.05.0/autotests/fieldtest.cpp --- old/kpkpass-24.02.2/autotests/fieldtest.cpp 2024-03-21 20:38:08.000000000 +0100 +++ new/kpkpass-24.05.0/autotests/fieldtest.cpp 2024-05-11 15:42:32.000000000 +0200 @@ -4,8 +4,8 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#include <field.h> -#include <pass.h> +#include "field.h" +#include "pass.h" #include <QJsonDocument> #include <QJsonObject> @@ -43,20 +43,20 @@ KPkPass::Field f(obj, pass.get()); QCOMPARE(f.value().userType(), QMetaType::QDateTime); QCOMPARE(f.value(), QDateTime({2021, 6, 27}, {14, 30}, QTimeZone::fromSecondsAheadOfUtc(7200))); - QCOMPARE(f.valueDisplayString(), QLatin1String("27/06/2021 14:30")); + QCOMPARE(f.valueDisplayString(), QLatin1StringView("27/06/2021 14:30")); obj = QJsonDocument::fromJson(R"({"key":"valid-date","label":"Datum","dateStyle":"PKDateStyleShort","value":"2021-06-27T00:00:00+02:00"})").object(); f = KPkPass::Field(obj, pass.get()); QCOMPARE(f.value().userType(), QMetaType::QDateTime); QCOMPARE(f.value().toDateTime().date(), QDate({2021, 6, 27})); - QCOMPARE(f.valueDisplayString(), QLatin1String("27/06/2021")); + QCOMPARE(f.valueDisplayString(), QLatin1StringView("27/06/2021")); obj = QJsonDocument::fromJson(R"({"key":"valid-locations","label":"Ort","value":"Freibad Killesberg\n"})").object(); f = KPkPass::Field(obj, pass.get()); QCOMPARE(f.value().userType(), QMetaType::QString); - QCOMPARE(f.value(), QLatin1String("Freibad Killesberg\n")); - QCOMPARE(f.valueDisplayString(), QLatin1String("Freibad Killesberg")); + QCOMPARE(f.value(), QLatin1StringView("Freibad Killesberg\n")); + QCOMPARE(f.valueDisplayString(), QLatin1StringView("Freibad Killesberg")); } }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-24.02.2/autotests/pkpasstest.cpp new/kpkpass-24.05.0/autotests/pkpasstest.cpp --- old/kpkpass-24.02.2/autotests/pkpasstest.cpp 2024-03-21 20:38:08.000000000 +0100 +++ new/kpkpass-24.05.0/autotests/pkpasstest.cpp 2024-05-11 15:42:32.000000000 +0200 @@ -4,9 +4,9 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#include <barcode.h> -#include <boardingpass.h> -#include <location.h> +#include "barcode.h" +#include "boardingpass.h" +#include "location.h" #include <QLocale> #include <QTest> @@ -29,30 +29,30 @@ QVERIFY(pass); QCOMPARE(pass->type(), KPkPass::Pass::BoardingPass); - QCOMPARE(pass->serialNumber(), QLatin1String("1234")); - QCOMPARE(pass->description(), QLatin1String("description")); - QCOMPARE(pass->organizationName(), QLatin1String("KDE")); + QCOMPARE(pass->serialNumber(), QLatin1StringView("1234")); + QCOMPARE(pass->description(), QLatin1StringView("description")); + QCOMPARE(pass->organizationName(), QLatin1StringView("KDE")); - QCOMPARE(pass->logoText(), QLatin1String("Boarding Pass")); + QCOMPARE(pass->logoText(), QLatin1StringView("Boarding Pass")); QCOMPARE(pass->backgroundColor(), QColor(61, 174, 233)); QCOMPARE(pass->relevantDate(), QDateTime(QDate(2017, 9, 17), QTime(0, 4, 0), QTimeZone::UTC)); QCOMPARE(pass->expirationDate(), QDateTime(QDate(2017, 9, 18), QTime(0, 0, 36), QTimeZone::UTC)); QCOMPARE(pass->isVoided(), false); - QCOMPARE(pass->groupingIdentifier(), QLatin1String("")); + QCOMPARE(pass->groupingIdentifier(), QLatin1StringView("")); QCOMPARE(pass->fields().size(), 12); auto headers = pass->headerFields(); QCOMPARE(headers.size(), 2); auto field = headers.at(0); - QCOMPARE(field.label(), QLatin1String("Sitzplatz")); - QCOMPARE(field.value().toString(), QLatin1String("10E")); - QCOMPARE(field.valueDisplayString(), QLatin1String("10E")); - QCOMPARE(field.key(), QLatin1String("seat")); + QCOMPARE(field.label(), QLatin1StringView("Sitzplatz")); + QCOMPARE(field.value().toString(), QLatin1StringView("10E")); + QCOMPARE(field.valueDisplayString(), QLatin1StringView("10E")); + QCOMPARE(field.key(), QLatin1StringView("seat")); QCOMPARE(field.changeMessage(), QStringLiteral("Sitzplatznummer geändert in 10E")); field = pass->field(QStringLiteral("boarding")); - QCOMPARE(field.key(), QLatin1String("boarding")); - QCOMPARE(field.value().toString(), QLatin1String("20:25")); + QCOMPARE(field.key(), QLatin1StringView("boarding")); + QCOMPARE(field.value().toString(), QLatin1StringView("20:25")); QCOMPARE(field.textAlignment(), Qt::AlignLeft); auto boardingPass = dynamic_cast<KPkPass::BoardingPass *>(pass.get()); @@ -65,7 +65,7 @@ QCOMPARE(bc.format(), KPkPass::Barcode::QR); QVERIFY(!bc.message().isEmpty()); QVERIFY(bc.alternativeText().isEmpty()); - QCOMPARE(bc.messageEncoding(), QLatin1String("iso-8859-1")); + QCOMPARE(bc.messageEncoding(), QLatin1StringView("iso-8859-1")); const auto locs = pass->locations(); QCOMPARE(locs.size(), 1); @@ -73,7 +73,7 @@ QVERIFY(std::isnan(loc.altitude())); QCOMPARE((int)loc.latitude(), 47); QCOMPARE((int)loc.longitude(), 8); - QCOMPARE(loc.relevantText(), QLatin1String("LX962 Boarding 20:25")); + QCOMPARE(loc.relevantText(), QLatin1StringView("LX962 Boarding 20:25")); QCOMPARE(pass->maximumDistance(), 500); QCOMPARE(pass->hasIcon(), false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-24.02.2/src/barcode.cpp new/kpkpass-24.05.0/src/barcode.cpp --- old/kpkpass-24.02.2/src/barcode.cpp 2024-03-21 20:38:08.000000000 +0100 +++ new/kpkpass-24.05.0/src/barcode.cpp 2024-05-11 15:42:32.000000000 +0200 @@ -39,21 +39,21 @@ QString Barcode::alternativeText() const { if (d->pass) { - return d->pass->d->message(d->obj.value(QLatin1String("altText")).toString()); + return d->pass->d->message(d->obj.value(QLatin1StringView("altText")).toString()); } return {}; } Barcode::Format KPkPass::Barcode::format() const { - const auto format = d->obj.value(QLatin1String("format")).toString(); - if (format == QLatin1String("PKBarcodeFormatQR")) { + const auto format = d->obj.value(QLatin1StringView("format")).toString(); + if (format == QLatin1StringView("PKBarcodeFormatQR")) { return QR; - } else if (format == QLatin1String("PKBarcodeFormatPDF417")) { + } else if (format == QLatin1StringView("PKBarcodeFormatPDF417")) { return PDF417; - } else if (format == QLatin1String("PKBarcodeFormatAztec")) { + } else if (format == QLatin1StringView("PKBarcodeFormatAztec")) { return Aztec; - } else if (format == QLatin1String("PKBarcodeFormatCode128")) { + } else if (format == QLatin1StringView("PKBarcodeFormatCode128")) { return Code128; } return Invalid; @@ -61,12 +61,12 @@ QString Barcode::message() const { - return d->obj.value(QLatin1String("message")).toString(); + return d->obj.value(QLatin1StringView("message")).toString(); } QString Barcode::messageEncoding() const { - return d->obj.value(QLatin1String("messageEncoding")).toString(); + return d->obj.value(QLatin1StringView("messageEncoding")).toString(); } #include "moc_barcode.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-24.02.2/src/boardingpass.cpp new/kpkpass-24.05.0/src/boardingpass.cpp --- old/kpkpass-24.02.2/src/boardingpass.cpp 2024-03-21 20:38:08.000000000 +0100 +++ new/kpkpass-24.05.0/src/boardingpass.cpp 2024-05-11 15:42:32.000000000 +0200 @@ -18,14 +18,14 @@ BoardingPass::TransitType BoardingPass::transitType() const { - const auto t = d->passData().value(QLatin1String("transitType")).toString(); - if (t == QLatin1String("PKTransitTypeAir")) { + const auto t = d->passData().value(QLatin1StringView("transitType")).toString(); + if (t == QLatin1StringView("PKTransitTypeAir")) { return Air; - } else if (t == QLatin1String("PKTransitTypeBoat")) { + } else if (t == QLatin1StringView("PKTransitTypeBoat")) { return Boat; - } else if (t == QLatin1String("PKTransitTypeBus")) { + } else if (t == QLatin1StringView("PKTransitTypeBus")) { return Bus; - } else if (t == QLatin1String("PKTransitTypeTrain")) { + } else if (t == QLatin1StringView("PKTransitTypeTrain")) { return Train; } return Generic; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-24.02.2/src/field.cpp new/kpkpass-24.05.0/src/field.cpp --- old/kpkpass-24.02.2/src/field.cpp 2024-03-21 20:38:08.000000000 +0100 +++ new/kpkpass-24.05.0/src/field.cpp 2024-05-11 15:42:32.000000000 +0200 @@ -42,13 +42,13 @@ QString Field::key() const { - return d->obj.value(QLatin1String("key")).toString(); + return d->obj.value(QLatin1StringView("key")).toString(); } QString Field::label() const { if (d->pass) { - return d->pass->d->message(d->obj.value(QLatin1String("label")).toString()); + return d->pass->d->message(d->obj.value(QLatin1StringView("label")).toString()); } return {}; } @@ -58,9 +58,9 @@ if (!d->pass) { return {}; } - auto v = d->pass->d->message(d->obj.value(QLatin1String("attributedValue")).toString()); + auto v = d->pass->d->message(d->obj.value(QLatin1StringView("attributedValue")).toString()); if (v.isEmpty()) { - v = d->pass->d->message(d->obj.value(QLatin1String("value")).toString()); + v = d->pass->d->message(d->obj.value(QLatin1StringView("value")).toString()); } const auto dt = QDateTime::fromString(v, Qt::ISODate); @@ -81,12 +81,12 @@ if (v.userType() == QMetaType::QDateTime) { const auto dt = v.toDateTime(); auto fmt = QLocale::ShortFormat; - const auto dtStyle = d->obj.value(QLatin1String("dateStyle")).toString(); - if (dtStyle == QLatin1String("PKDateStyleLong") || dtStyle == QLatin1String("PKDateStyleFull")) { + const auto dtStyle = d->obj.value(QLatin1StringView("dateStyle")).toString(); + if (dtStyle == QLatin1StringView("PKDateStyleLong") || dtStyle == QLatin1StringView("PKDateStyleFull")) { fmt = QLocale::LongFormat; } - const auto timeStyle = d->obj.value(QLatin1String("timeStyle")).toString(); - if (timeStyle == QLatin1String("PKDateStyleNone") || (timeStyle.isEmpty() && !dtStyle.isEmpty() && dt.time() == QTime(0, 0))) { + const auto timeStyle = d->obj.value(QLatin1StringView("timeStyle")).toString(); + if (timeStyle == QLatin1StringView("PKDateStyleNone") || (timeStyle.isEmpty() && !dtStyle.isEmpty() && dt.time() == QTime(0, 0))) { return QLocale().toString(dt.date(), fmt); } @@ -102,19 +102,19 @@ if (!d->pass) { return {}; } - auto msg = d->pass->d->message(d->obj.value(QLatin1String("changeMessage")).toString()); - msg.replace(QLatin1String("%@"), valueDisplayString()); + auto msg = d->pass->d->message(d->obj.value(QLatin1StringView("changeMessage")).toString()); + msg.replace(QLatin1StringView("%@"), valueDisplayString()); return msg; } Qt::Alignment Field::textAlignment() const { - const auto alignStr = d->obj.value(QLatin1String("textAlignment")).toString(); - if (alignStr == QLatin1String("PKTextAlignmentLeft")) { + const auto alignStr = d->obj.value(QLatin1StringView("textAlignment")).toString(); + if (alignStr == QLatin1StringView("PKTextAlignmentLeft")) { return Qt::AlignLeft; - } else if (alignStr == QLatin1String("PKTextAlignmentCenter")) { + } else if (alignStr == QLatin1StringView("PKTextAlignmentCenter")) { return Qt::AlignHCenter; - } else if (alignStr == QLatin1String("PKTextAlignmentRight")) { + } else if (alignStr == QLatin1StringView("PKTextAlignmentRight")) { return Qt::AlignRight; } return QGuiApplication::layoutDirection() == Qt::LeftToRight ? Qt::AlignLeft : Qt::AlignRight; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-24.02.2/src/location.cpp new/kpkpass-24.05.0/src/location.cpp --- old/kpkpass-24.02.2/src/location.cpp 2024-03-21 20:38:08.000000000 +0100 +++ new/kpkpass-24.05.0/src/location.cpp 2024-05-11 15:42:32.000000000 +0200 @@ -36,22 +36,22 @@ double Location::altitude() const { - return d->obj.value(QLatin1String("altitude")).toDouble(NAN); + return d->obj.value(QLatin1StringView("altitude")).toDouble(NAN); } double Location::latitude() const { - return d->obj.value(QLatin1String("latitude")).toDouble(NAN); + return d->obj.value(QLatin1StringView("latitude")).toDouble(NAN); } double Location::longitude() const { - return d->obj.value(QLatin1String("longitude")).toDouble(NAN); + return d->obj.value(QLatin1StringView("longitude")).toDouble(NAN); } QString Location::relevantText() const { - return d->obj.value(QLatin1String("relevantText")).toString(); + return d->obj.value(QLatin1StringView("relevantText")).toString(); } #include "moc_location.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-24.02.2/src/pass.cpp new/kpkpass-24.05.0/src/pass.cpp --- old/kpkpass-24.02.2/src/pass.cpp 2024-03-21 20:38:08.000000000 +0100 +++ new/kpkpass-24.05.0/src/pass.cpp 2024-05-11 15:42:32.000000000 +0200 @@ -33,7 +33,7 @@ QJsonObject PassPrivate::passData() const { - return passObj.value(QLatin1String(passTypes[passType])).toObject(); + return passObj.value(QLatin1StringView(passTypes[passType])).toObject(); } QString PassPrivate::message(const QString &key) const @@ -54,7 +54,7 @@ if (idx > 0) { lang = lang.left(idx); } - lang += QLatin1String(".lproj"); + lang += QLatin1StringView(".lproj"); if (parseMessages(lang)) { return; } @@ -165,7 +165,7 @@ return !messages.isEmpty(); } -QList<Field> PassPrivate::fields(QLatin1String fieldType, const Pass *q) const +QList<Field> PassPrivate::fields(QLatin1StringView fieldType, const Pass *q) const { const auto a = passData().value(fieldType).toArray(); QList<Field> f; @@ -205,7 +205,7 @@ return nullptr; } } - if (passObj.value(QLatin1String("formatVersion")).toInt() > 1) { + if (passObj.value(QLatin1StringView("formatVersion")).toInt() > 1) { qCWarning(Log) << "pass.json has unsupported format version!"; return nullptr; } @@ -213,7 +213,7 @@ // determine pass type int passTypeIdx = -1; for (unsigned int i = 0; i < passTypesCount; ++i) { - if (passObj.contains(QLatin1String(passTypes[i]))) { + if (passObj.contains(QLatin1StringView(passTypes[i]))) { passTypeIdx = static_cast<int>(i); break; } @@ -256,38 +256,38 @@ QString Pass::description() const { - return d->passObj.value(QLatin1String("description")).toString(); + return d->passObj.value(QLatin1StringView("description")).toString(); } QString Pass::organizationName() const { - return d->passObj.value(QLatin1String("organizationName")).toString(); + return d->passObj.value(QLatin1StringView("organizationName")).toString(); } QString Pass::passTypeIdentifier() const { - return d->passObj.value(QLatin1String("passTypeIdentifier")).toString(); + return d->passObj.value(QLatin1StringView("passTypeIdentifier")).toString(); } QString Pass::serialNumber() const { - return d->passObj.value(QLatin1String("serialNumber")).toString(); + return d->passObj.value(QLatin1StringView("serialNumber")).toString(); } QDateTime Pass::expirationDate() const { - return QDateTime::fromString(d->passObj.value(QLatin1String("expirationDate")).toString(), Qt::ISODate); + return QDateTime::fromString(d->passObj.value(QLatin1StringView("expirationDate")).toString(), Qt::ISODate); } bool Pass::isVoided() const { - return d->passObj.value(QLatin1String("voided")).toString() == QLatin1String("true"); + return d->passObj.value(QLatin1StringView("voided")).toString() == QLatin1StringView("true"); } QList<Location> Pass::locations() const { QList<Location> locs; - const auto a = d->passObj.value(QLatin1String("locations")).toArray(); + const auto a = d->passObj.value(QLatin1StringView("locations")).toArray(); locs.reserve(a.size()); for (const auto &loc : a) { locs.push_back(Location(loc.toObject())); @@ -298,17 +298,17 @@ int Pass::maximumDistance() const { - return d->passObj.value(QLatin1String("maxDistance")).toInt(500); + return d->passObj.value(QLatin1StringView("maxDistance")).toInt(500); } QDateTime Pass::relevantDate() const { - return QDateTime::fromString(d->passObj.value(QLatin1String("relevantDate")).toString(), Qt::ISODate); + return QDateTime::fromString(d->passObj.value(QLatin1StringView("relevantDate")).toString(), Qt::ISODate); } static QColor parseColor(const QString &s) { - if (s.startsWith(QLatin1String("rgb("), Qt::CaseInsensitive)) { + if (s.startsWith(QLatin1StringView("rgb("), Qt::CaseInsensitive)) { const auto l = QStringView(s).mid(4, s.length() - 5).split(QLatin1Char(',')); if (l.size() != 3) return {}; @@ -319,22 +319,22 @@ QColor Pass::backgroundColor() const { - return parseColor(d->passObj.value(QLatin1String("backgroundColor")).toString()); + return parseColor(d->passObj.value(QLatin1StringView("backgroundColor")).toString()); } QColor Pass::foregroundColor() const { - return parseColor(d->passObj.value(QLatin1String("foregroundColor")).toString()); + return parseColor(d->passObj.value(QLatin1StringView("foregroundColor")).toString()); } QString Pass::groupingIdentifier() const { - return d->passObj.value(QLatin1String("groupingIdentifier")).toString(); + return d->passObj.value(QLatin1StringView("groupingIdentifier")).toString(); } QColor Pass::labelColor() const { - const auto c = parseColor(d->passObj.value(QLatin1String("labelColor")).toString()); + const auto c = parseColor(d->passObj.value(QLatin1StringView("labelColor")).toString()); if (c.isValid()) { return c; } @@ -343,7 +343,7 @@ QString Pass::logoText() const { - return d->message(d->passObj.value(QLatin1String("logoText")).toString()); + return d->message(d->passObj.value(QLatin1StringView("logoText")).toString()); } bool Pass::hasImage(const QString &baseName) const @@ -352,7 +352,7 @@ for (const auto &entry : entries) { if (entry.startsWith(baseName) && (QStringView(entry).mid(baseName.size()).startsWith(QLatin1Char('@')) || QStringView(entry).mid(baseName.size()).startsWith(QLatin1Char('.'))) - && entry.endsWith(QLatin1String(".png"))) { + && entry.endsWith(QLatin1StringView(".png"))) { return true; } } @@ -402,9 +402,9 @@ break; } if (dpr > 1) { - file = d->zip->directory()->file(baseName + QLatin1Char('@') + QString::number(dpr) + QLatin1String("x.png")); + file = d->zip->directory()->file(baseName + QLatin1Char('@') + QString::number(dpr) + QLatin1StringView("x.png")); } else { - file = d->zip->directory()->file(baseName + QLatin1String(".png")); + file = d->zip->directory()->file(baseName + QLatin1StringView(".png")); } if (file) break; @@ -459,12 +459,12 @@ QString Pass::authenticationToken() const { - return d->passObj.value(QLatin1String("authenticationToken")).toString(); + return d->passObj.value(QLatin1StringView("authenticationToken")).toString(); } QUrl Pass::webServiceUrl() const { - return QUrl(d->passObj.value(QLatin1String("webServiceURL")).toString()); + return QUrl(d->passObj.value(QLatin1StringView("webServiceURL")).toString()); } QUrl Pass::passUpdateUrl() const @@ -473,7 +473,7 @@ if (!url.isValid()) { return {}; } - url.setPath(url.path() + QLatin1String("/v1/passes/") + passTypeIdentifier() + QLatin1Char('/') + serialNumber()); + url.setPath(url.path() + QLatin1StringView("/v1/passes/") + passTypeIdentifier() + QLatin1Char('/') + serialNumber()); return url; } @@ -482,14 +482,14 @@ QList<Barcode> codes; // barcodes array - const auto a = d->passObj.value(QLatin1String("barcodes")).toArray(); + const auto a = d->passObj.value(QLatin1StringView("barcodes")).toArray(); codes.reserve(a.size()); for (const auto &bc : a) codes.push_back(Barcode(bc.toObject(), this)); // just a single barcode if (codes.isEmpty()) { - const auto bc = d->passObj.value(QLatin1String("barcode")).toObject(); + const auto bc = d->passObj.value(QLatin1StringView("barcode")).toObject(); if (!bc.isEmpty()) codes.push_back(Barcode(bc, this)); } @@ -502,33 +502,33 @@ QList<Field> Pass::auxiliaryFields() const { - return d->fields(QLatin1String(fieldNames[0]), this); + return d->fields(QLatin1StringView(fieldNames[0]), this); } QList<Field> Pass::backFields() const { - return d->fields(QLatin1String(fieldNames[1]), this); + return d->fields(QLatin1StringView(fieldNames[1]), this); } QList<Field> Pass::headerFields() const { - return d->fields(QLatin1String(fieldNames[2]), this); + return d->fields(QLatin1StringView(fieldNames[2]), this); } QList<Field> Pass::primaryFields() const { - return d->fields(QLatin1String(fieldNames[3]), this); + return d->fields(QLatin1StringView(fieldNames[3]), this); } QList<Field> Pass::secondaryFields() const { - return d->fields(QLatin1String(fieldNames[4]), this); + return d->fields(QLatin1StringView(fieldNames[4]), this); } Field Pass::field(const QString &key) const { for (unsigned int i = 0; i < fieldNameCount; ++i) { - const auto fs = d->fields(QLatin1String(fieldNames[i]), this); + const auto fs = d->fields(QLatin1StringView(fieldNames[i]), this); for (const auto &f : fs) { if (f.key() == key) { return f; @@ -542,7 +542,7 @@ { QList<Field> fs; for (unsigned int i = 0; i < fieldNameCount; ++i) { - fs += d->fields(QLatin1String(fieldNames[i]), this); + fs += d->fields(QLatin1StringView(fieldNames[i]), this); } return fs; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpkpass-24.02.2/src/pass_p.h new/kpkpass-24.05.0/src/pass_p.h --- old/kpkpass-24.02.2/src/pass_p.h 2024-03-21 20:38:08.000000000 +0100 +++ new/kpkpass-24.05.0/src/pass_p.h 2024-05-11 15:42:32.000000000 +0200 @@ -47,7 +47,7 @@ void parse(); bool parseMessages(const QString &lang); - QList<Field> fields(QLatin1String fieldType, const Pass *q) const; + QList<Field> fields(QLatin1StringView fieldType, const Pass *q) const; static Pass *fromData(std::unique_ptr<QIODevice> device, QObject *parent);
