Hello community, here is the log from the commit of package tellico for openSUSE:Factory checked in at 2018-03-29 11:57:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tellico (Old) and /work/SRC/openSUSE:Factory/.tellico.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tellico" Thu Mar 29 11:57:46 2018 rev:74 rq:592112 version:3.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/tellico/tellico.changes 2018-01-17 21:58:49.625763135 +0100 +++ /work/SRC/openSUSE:Factory/.tellico.new/tellico.changes 2018-03-29 11:57:49.537576731 +0200 @@ -1,0 +2,18 @@ +Wed Mar 28 11:48:43 UTC 2018 - wbauer@tmo.at + +- Update to 3.1.2: + Improvements: + * Updated KINO.de data source. + * Updated Internet Movie Database (IMDB.com) data source. + * Updated ISBNdb.com data source. + * Updated MusicBrainz data source. + Bug fixes: + * Added workaround for crash when reading EXIV data (kde#390744). + * Fixed bug with inconsistent selection (kde#391614). + * Fixed bug with "Filter by Group" (kde#389931). +- Add fix-build-with-Qt5.6.patch to make it compile on Leap 42.3 + (kde#392457) +- Use cmake() syntax for KF5 and Qt5 BuildRequires +- Mark license files as %license + +------------------------------------------------------------------- Old: ---- tellico-3.1.1.tar.xz New: ---- fix-build-with-Qt5.6.patch tellico-3.1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tellico.spec ++++++ --- /var/tmp/diff_new_pack.PBk5im/_old 2018-03-29 11:57:50.213552331 +0200 +++ /var/tmp/diff_new_pack.PBk5im/_new 2018-03-29 11:57:50.217552188 +0200 @@ -17,52 +17,54 @@ Name: tellico -Version: 3.1.1 +Version: 3.1.2 Release: 0 Summary: A Collection Manager for KDE License: GPL-2.0+ Group: Productivity/Office/Other Url: http://tellico-project.org/ Source0: http://tellico-project.org/files/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch: fix-build-with-Qt5.6.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes -BuildRequires: karchive-devel -BuildRequires: kcodecs-devel -BuildRequires: kconfig-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kcrash-devel -BuildRequires: kdoctools-devel -BuildRequires: kfilemetadata5-devel -BuildRequires: kguiaddons-devel -BuildRequires: khtml-devel -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kio-devel -BuildRequires: kitemmodels-devel -BuildRequires: kjobwidgets-devel -BuildRequires: knewstuff-devel -BuildRequires: kwallet-devel -BuildRequires: kwidgetsaddons-devel -BuildRequires: kwindowsystem-devel -BuildRequires: kxmlgui-devel BuildRequires: libcdio-devel BuildRequires: libexempi-devel -BuildRequires: libksane-devel BuildRequires: libpoppler-qt5-devel BuildRequires: libv4l-devel BuildRequires: libxslt-devel BuildRequires: libyaz-devel BuildRequires: pkgconfig -BuildRequires: solid-devel BuildRequires: taglib-devel -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: cmake(KF5Archive) +BuildRequires: cmake(KF5Codecs) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5Crash) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5FileMetaData) +BuildRequires: cmake(KF5GuiAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5ItemModels) +BuildRequires: cmake(KF5JobWidgets) +BuildRequires: cmake(KF5KHtml) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5NewStuff) +BuildRequires: cmake(KF5Sane) +BuildRequires: cmake(KF5Solid) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(libxml-2.0) Requires(post): shared-mime-info Requires(postun): shared-mime-info @@ -85,6 +87,7 @@ %prep %setup -q +%patch -p1 %build %cmake_kf5 "-DENABLE_WEBCAM=true" -d build @@ -111,7 +114,8 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README +%license COPYING +%doc AUTHORS ChangeLog README %{_kf5_applicationsdir}/org.kde.tellico.desktop %dir %{_kf5_appsdir}/kconf_update %{_kf5_appsdir}/kconf_update/tellico* ++++++ fix-build-with-Qt5.6.patch ++++++

From 8e6c74d6f23ff06d615d1eb5e3fda2a786a1b3fc Mon Sep 17 00:00:00 2001 From: Robby Stephenson <robby@periapsis.org> Date: Wed, 28 Mar 2018 12:51:46 -0400 Subject: Fix compilation with Qt 5.6

QStringLiteral doesn't work everywhere apparently for Qt 5.6. Revert some changes made by clazy. Thanks to the patch from Wolfgang Bauer. BUG: 392457 FIXED-IN: 3.1.3 --- ChangeLog | 4 ++++ src/fetch/allocinefetcher.cpp | 6 +++--- src/fetch/discogsfetcher.cpp | 14 +++++++------- src/fetch/doubanfetcher.cpp | 12 ++++++------ src/fetch/filmasterfetcher.cpp | 2 +- src/fetch/googlebookfetcher.cpp | 2 +- src/fetch/igdbfetcher.cpp | 4 ++-- src/fetch/imdbfetcher.cpp | 2 +- src/fetch/isbndbfetcher.cpp | 4 ++-- src/fetch/kinofetcher.cpp | 2 +- src/fetch/moviemeterfetcher.cpp | 2 +- src/fetch/openlibraryfetcher.cpp | 4 ++-- src/fetch/themoviedbfetcher.cpp | 10 +++++----- 13 files changed, 36 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8528d9..d0e8fd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2018-03-28 Robby Stephenson <robby@periapsis.org> + * Fixed compilation for Qt 5.6 (Bug 392457). + +2018-03-28 Robby Stephenson <robby@periapsis.org> + * Released Tellico 3.1.2. * Updated Kino.de data source. diff --git a/src/fetch/allocinefetcher.cpp b/src/fetch/allocinefetcher.cpp index 522c558..0a91fb2 100644 --- a/src/fetch/allocinefetcher.cpp +++ b/src/fetch/allocinefetcher.cpp @@ -376,19 +376,19 @@ void AbstractAllocineFetcher::populateEntry(Data::EntryPtr entry, const QVariant entry->setField(QStringLiteral("studio"), mapValue(releaseMap, "distributor", "name")); QStringList genres; - foreach(const QVariant& variant, resultMap.value(QStringLiteral("genre")).toList()) { + foreach(const QVariant& variant, resultMap.value(QLatin1String("genre")).toList()) { genres << i18n(mapValue(variant.toMap(), "$").toUtf8().constData()); } entry->setField(QStringLiteral("genre"), genres.join(FieldFormat::delimiterString())); QStringList nats; - foreach(const QVariant& variant, resultMap.value(QStringLiteral("nationality")).toList()) { + foreach(const QVariant& variant, resultMap.value(QLatin1String("nationality")).toList()) { nats << mapValue(variant.toMap(), "$"); } entry->setField(QStringLiteral("nationality"), nats.join(FieldFormat::delimiterString())); QStringList langs; - foreach(const QVariant& variant, resultMap.value(QStringLiteral("language")).toList()) { + foreach(const QVariant& variant, resultMap.value(QLatin1String("language")).toList()) { langs << mapValue(variant.toMap(), "$"); } entry->setField(QStringLiteral("language"), langs.join(FieldFormat::delimiterString())); diff --git a/src/fetch/discogsfetcher.cpp b/src/fetch/discogsfetcher.cpp index 2f7f441..7f6360f 100644 --- a/src/fetch/discogsfetcher.cpp +++ b/src/fetch/discogsfetcher.cpp @@ -280,7 +280,7 @@ void DiscogsFetcher::slotComplete(KJob*) { } int count = 0; - foreach(const QVariant& result, resultMap.value(QStringLiteral("results")).toList()) { + foreach(const QVariant& result, resultMap.value(QLatin1String("results")).toList()) { if(count >= DISCOGS_MAX_RETURNS_TOTAL) { break; } @@ -306,13 +306,13 @@ void DiscogsFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& res entry_->setField(QStringLiteral("genre"), mapValue(resultMap_, "genres")); QStringList artists; - foreach(const QVariant& artist, resultMap_.value(QStringLiteral("artists")).toList()) { + foreach(const QVariant& artist, resultMap_.value(QLatin1String("artists")).toList()) { artists << mapValue(artist.toMap(), "name"); } entry_->setField(QStringLiteral("artist"), artists.join(FieldFormat::delimiterString())); QStringList labels; - foreach(const QVariant& label, resultMap_.value(QStringLiteral("labels")).toList()) { + foreach(const QVariant& label, resultMap_.value(QLatin1String("labels")).toList()) { labels << mapValue(label.toMap(), "name"); } entry_->setField(QStringLiteral("label"), labels.join(FieldFormat::delimiterString())); @@ -331,7 +331,7 @@ void DiscogsFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& res // check the formats, it could have multiple // if there is a CD, prefer that in the track list bool hasCD = false; - foreach(const QVariant& format, resultMap_.value(QStringLiteral("formats")).toList()) { + foreach(const QVariant& format, resultMap_.value(QLatin1String("formats")).toList()) { if(mapValue(format.toMap(), "name") == QLatin1String("CD")) { entry_->setField(QStringLiteral("medium"), i18n("Compact Disc")); hasCD = true; @@ -346,7 +346,7 @@ void DiscogsFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& res } QStringList tracks; - foreach(const QVariant& track, resultMap_.value(QStringLiteral("tracklist")).toList()) { + foreach(const QVariant& track, resultMap_.value(QLatin1String("tracklist")).toList()) { const QVariantMap trackMap = track.toMap(); if(mapValue(trackMap, "type_") != QLatin1String("track")) { continue; @@ -363,7 +363,7 @@ void DiscogsFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& res trackInfo << mapValue(trackMap, "title"); if(trackMap.contains(QStringLiteral("artists"))) { QStringList artists; - foreach(const QVariant& artist, trackMap.value(QStringLiteral("artists")).toList()) { + foreach(const QVariant& artist, trackMap.value(QLatin1String("artists")).toList()) { artists << mapValue(artist.toMap(), "name"); } trackInfo << artists.join(FieldFormat::delimiterString()); @@ -385,7 +385,7 @@ void DiscogsFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& res if(entry_->collection()->hasField(QStringLiteral("producer"))) { QStringList producers; - foreach(const QVariant& extraartist, resultMap_.value(QStringLiteral("extraartists")).toList()) { + foreach(const QVariant& extraartist, resultMap_.value(QLatin1String("extraartists")).toList()) { if(mapValue(extraartist.toMap(), "role").contains(QLatin1String("Producer"))) { producers << mapValue(extraartist.toMap(), "name"); } diff --git a/src/fetch/doubanfetcher.cpp b/src/fetch/doubanfetcher.cpp index 146833b..9e0e33e 100644 --- a/src/fetch/doubanfetcher.cpp +++ b/src/fetch/doubanfetcher.cpp @@ -227,7 +227,7 @@ void DoubanFetcher::slotComplete(KJob* job_) { switch(request().collectionType) { case Data::Collection::Book: case Data::Collection::Bibtex: - foreach(const QVariant& v, resultsMap.value(QStringLiteral("books")).toList()) { + foreach(const QVariant& v, resultsMap.value(QLatin1String("books")).toList()) { const QVariantMap resultMap = v.toMap(); FetchResult* r = new FetchResult(Fetcher::Ptr(this), mapValue(resultMap, "title"), mapValue(resultMap, "author") + QLatin1Char('/') + @@ -239,7 +239,7 @@ void DoubanFetcher::slotComplete(KJob* job_) { break; case Data::Collection::Video: - foreach(const QVariant& v, resultsMap.value(QStringLiteral("subjects")).toList()) { + foreach(const QVariant& v, resultsMap.value(QLatin1String("subjects")).toList()) { const QVariantMap resultMap = v.toMap(); FetchResult* r = new FetchResult(Fetcher::Ptr(this), mapValue(resultMap, "title"), mapValue(resultMap, "directors", "name") + QLatin1Char('/') + @@ -253,7 +253,7 @@ void DoubanFetcher::slotComplete(KJob* job_) { break; case Data::Collection::Album: - foreach(const QVariant& v, resultsMap.value(QStringLiteral("musics")).toList()) { + foreach(const QVariant& v, resultsMap.value(QLatin1String("musics")).toList()) { const QVariantMap resultMap = v.toMap(); FetchResult* r = new FetchResult(Fetcher::Ptr(this), mapValue(resultMap, "title"), mapValue(resultMap, "attrs", "singer") + QLatin1Char('/') + @@ -411,7 +411,7 @@ void DoubanFetcher::populateVideoEntry(Data::EntryPtr entry, const QVariantMap& entry->setField(QStringLiteral("plot"), mapValue(resultMap_, "summary")); QStringList actors; - foreach(const QVariant& v, resultMap_.value(QStringLiteral("casts")).toList()) { + foreach(const QVariant& v, resultMap_.value(QLatin1String("casts")).toList()) { actors << v.toMap().value(QStringLiteral("name")).toString(); } entry->setField(QStringLiteral("cast"), actors.join(FieldFormat::rowDelimiterString())); @@ -438,8 +438,8 @@ void DoubanFetcher::populateMusicEntry(Data::EntryPtr entry, const QVariantMap& } QStringList values, tracks; - foreach(const QVariant& v, resultMap_.value(QStringLiteral("attrs")) - .toMap().value(QStringLiteral("tracks")).toList()) { + foreach(const QVariant& v, resultMap_.value(QLatin1String("attrs")) + .toMap().value(QLatin1String("tracks")).toList()) { // some cases have all the tracks in one item, separated by "\n" and using 01. track numbers if(v.toString().contains(QLatin1Char('\n'))) { values << v.toString().split(QStringLiteral("\n")); diff --git a/src/fetch/filmasterfetcher.cpp b/src/fetch/filmasterfetcher.cpp index 6cb4bd9..df0be0f 100644 --- a/src/fetch/filmasterfetcher.cpp +++ b/src/fetch/filmasterfetcher.cpp @@ -260,7 +260,7 @@ void FilmasterFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& r entry_->setField(QStringLiteral("plot"), mapValue(result_, "description")); QStringList directors; - foreach(const QVariant& director, result_.value(QStringLiteral("directors")).toList()) { + foreach(const QVariant& director, result_.value(QLatin1String("directors")).toList()) { const QVariantMap directorMap = director.toMap(); directors << mapValue(directorMap, "name") + QLatin1Char(' ') + mapValue(directorMap, "surname"); } diff --git a/src/fetch/googlebookfetcher.cpp b/src/fetch/googlebookfetcher.cpp index d7e85a0..749cf20 100644 --- a/src/fetch/googlebookfetcher.cpp +++ b/src/fetch/googlebookfetcher.cpp @@ -320,7 +320,7 @@ void GoogleBookFetcher::populateEntry(Data::EntryPtr entry, const QVariantMap& r entry->setField(QStringLiteral("keyword"), catList.join(FieldFormat::delimiterString())); QString isbn; - foreach(const QVariant& idVariant, volumeMap.value(QStringLiteral("industryIdentifiers")).toList()) { + foreach(const QVariant& idVariant, volumeMap.value(QLatin1String("industryIdentifiers")).toList()) { const QVariantMap idMap = idVariant.toMap(); if(mapValue(idMap, "type") == QLatin1String("ISBN_10")) { isbn = mapValue(idMap, "identifier"); diff --git a/src/fetch/igdbfetcher.cpp b/src/fetch/igdbfetcher.cpp index eaac822..a6a62e9 100644 --- a/src/fetch/igdbfetcher.cpp +++ b/src/fetch/igdbfetcher.cpp @@ -151,7 +151,7 @@ Tellico::Data::EntryPtr IGDBFetcher::fetchEntryHook(uint uid_) { QStringList publishers; // grab the publisher data if(entry->field(QStringLiteral("publisher")).isEmpty()) { - foreach(const QString& pid, FieldFormat::splitValue(entry->field(QStringLiteral("pub-id")))) { + foreach(const QString& pid, FieldFormat::splitValue(entry->field(QLatin1String("pub-id")))) { const QString publisher = companyName(pid); if(!publisher.isEmpty()) { publishers << publisher; @@ -163,7 +163,7 @@ Tellico::Data::EntryPtr IGDBFetcher::fetchEntryHook(uint uid_) { QStringList developers; // grab the developer data if(entry->field(QStringLiteral("developer")).isEmpty()) { - foreach(const QString& did, FieldFormat::splitValue(entry->field(QStringLiteral("dev-id")))) { + foreach(const QString& did, FieldFormat::splitValue(entry->field(QLatin1String("dev-id")))) { const QString developer = companyName(did); if(!developer.isEmpty()) { developers << developer; diff --git a/src/fetch/imdbfetcher.cpp b/src/fetch/imdbfetcher.cpp index 31662e1..c033e41 100644 --- a/src/fetch/imdbfetcher.cpp +++ b/src/fetch/imdbfetcher.cpp @@ -1203,7 +1203,7 @@ void IMDBFetcher::doLists2(const QString& str_, Tellico::Data::EntryPtr entry_) genres << token.trimmed(); } } else if(tag == data.language) { - foreach(const QString& token, value.split(QRegExp(QStringLiteral("[,|]")))) { + foreach(const QString& token, value.split(QRegExp(QLatin1String("[,|]")))) { langs << token.trimmed(); } } else if(tag == data.sound) { diff --git a/src/fetch/isbndbfetcher.cpp b/src/fetch/isbndbfetcher.cpp index aeaf123..9afd408 100644 --- a/src/fetch/isbndbfetcher.cpp +++ b/src/fetch/isbndbfetcher.cpp @@ -259,7 +259,7 @@ void ISBNdbFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& resu QString pubYear = mapValue(resultMap_, "date_published").remove(QRegExp(QStringLiteral("[^\\d]"))).left(4); entry_->setField(QStringLiteral("pub_year"), pubYear); QStringList authors; - foreach(const QVariant& author, resultMap_.value(QStringLiteral("authors")).toList()) { + foreach(const QVariant& author, resultMap_.value(QLatin1String("authors")).toList()) { authors += author.toString(); } entry_->setField(QStringLiteral("author"), authors.join(FieldFormat::delimiterString())); @@ -278,7 +278,7 @@ void ISBNdbFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& resu entry_->setField(QStringLiteral("binding"), i18n(binding.toUtf8().constData())); } QStringList subjects; - foreach(const QVariant& subject, resultMap_.value(QStringLiteral("subjects")).toList()) { + foreach(const QVariant& subject, resultMap_.value(QLatin1String("subjects")).toList()) { subjects += subject.toString(); } entry_->setField(QStringLiteral("genre"), subjects.join(FieldFormat::delimiterString())); diff --git a/src/fetch/kinofetcher.cpp b/src/fetch/kinofetcher.cpp index 801ae7e..a82e516 100644 --- a/src/fetch/kinofetcher.cpp +++ b/src/fetch/kinofetcher.cpp @@ -230,7 +230,7 @@ void KinoFetcher::parseEntry(Data::EntryPtr entry, const QString& str_) { entry->setField(QStringLiteral("director"), mapValue(objectMap, "director", "name")); QStringList actors; - foreach(QVariant v, objectMap.value(QStringLiteral("actor")).toList()) { + foreach(QVariant v, objectMap.value(QLatin1String("actor")).toList()) { const QString actor = mapValue(v.toMap(), "name"); if(!actor.isEmpty()) actors += actor; } diff --git a/src/fetch/moviemeterfetcher.cpp b/src/fetch/moviemeterfetcher.cpp index a678040..d132091 100644 --- a/src/fetch/moviemeterfetcher.cpp +++ b/src/fetch/moviemeterfetcher.cpp @@ -260,7 +260,7 @@ void MovieMeterFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& entry_->setField(QStringLiteral("nationality"), mapValue(resultMap_, "countries")); QStringList castList; - foreach(const QVariant& actor, resultMap_.value(QStringLiteral("actors")).toList()) { + foreach(const QVariant& actor, resultMap_.value(QLatin1String("actors")).toList()) { castList << mapValue(actor.toMap(), "name"); } entry_->setField(QStringLiteral("cast"), castList.join(FieldFormat::rowDelimiterString())); diff --git a/src/fetch/openlibraryfetcher.cpp b/src/fetch/openlibraryfetcher.cpp index dd94cc0..6a8a290 100644 --- a/src/fetch/openlibraryfetcher.cpp +++ b/src/fetch/openlibraryfetcher.cpp @@ -298,7 +298,7 @@ void OpenLibraryFetcher::slotComplete(KJob* job_) { } QStringList authors; - foreach(const QVariant& authorMap, resultMap.value(QStringLiteral("authors")).toList()) { + foreach(const QVariant& authorMap, resultMap.value(QLatin1String("authors")).toList()) { const QString key = mapValue(authorMap.toMap(), "key"); if(!key.isEmpty()) { QUrl authorUrl(QString::fromLatin1(OPENLIBRARY_QUERY_URL)); @@ -323,7 +323,7 @@ void OpenLibraryFetcher::slotComplete(KJob* job_) { } QStringList langs; - foreach(const QVariant& langMap, resultMap.value(QStringLiteral("languages")).toList()) { + foreach(const QVariant& langMap, resultMap.value(QLatin1String("languages")).toList()) { const QString key = mapValue(langMap.toMap(), "key"); if(!key.isEmpty()) { QUrl langUrl(QString::fromLatin1(OPENLIBRARY_QUERY_URL)); diff --git a/src/fetch/themoviedbfetcher.cpp b/src/fetch/themoviedbfetcher.cpp index c8a676b..236b385 100644 --- a/src/fetch/themoviedbfetcher.cpp +++ b/src/fetch/themoviedbfetcher.cpp @@ -355,8 +355,8 @@ void TheMovieDBFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& } if(entry_->collection()->hasField(QStringLiteral("alttitle"))) { QStringList atitles; - foreach(const QVariant& atitle, resultMap_.value(QStringLiteral("alternative_titles")).toMap() - .value(QStringLiteral("titles")).toList()) { + foreach(const QVariant& atitle, resultMap_.value(QLatin1String("alternative_titles")).toMap() + .value(QLatin1String("titles")).toList()) { atitles << mapValue(atitle.toMap(), "title"); } entry_->setField(QStringLiteral("alttitle"), atitles.join(FieldFormat::rowDelimiterString())); @@ -372,13 +372,13 @@ void TheMovieDBFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& entry_->setField(QStringLiteral("cast"), actors.join(FieldFormat::rowDelimiterString())); QStringList studios; - foreach(const QVariant& studio, resultMap_.value(QStringLiteral("production_companies")).toList()) { + foreach(const QVariant& studio, resultMap_.value(QLatin1String("production_companies")).toList()) { studios << mapValue(studio.toMap(), "name"); } entry_->setField(QStringLiteral("studio"), studios.join(FieldFormat::delimiterString())); QStringList countries; - foreach(const QVariant& country, resultMap_.value(QStringLiteral("production_countries")).toList()) { + foreach(const QVariant& country, resultMap_.value(QLatin1String("production_countries")).toList()) { QString name = mapValue(country.toMap(), "name"); if(name == QLatin1String("United States of America")) { name = QStringLiteral("USA"); @@ -388,7 +388,7 @@ void TheMovieDBFetcher::populateEntry(Data::EntryPtr entry_, const QVariantMap& entry_->setField(QStringLiteral("nationality"), countries.join(FieldFormat::delimiterString())); QStringList genres; - foreach(const QVariant& genre, resultMap_.value(QStringLiteral("genres")).toList()) { + foreach(const QVariant& genre, resultMap_.value(QLatin1String("genres")).toList()) { genres << mapValue(genre.toMap(), "name"); } entry_->setField(QStringLiteral("genre"), genres.join(FieldFormat::delimiterString())); -- cgit v0.11.2 ++++++ tellico-3.1.1.tar.xz -> tellico-3.1.2.tar.xz ++++++ ++++ 95844 lines of diff (skipped)