diff -Nru sonnet-5.85.0/CMakeLists.txt sonnet-5.86.0/CMakeLists.txt --- sonnet-5.85.0/CMakeLists.txt 2021-08-06 09:13:20.000000000 +0000 +++ sonnet-5.86.0/CMakeLists.txt 2021-09-04 17:09:28.000000000 +0000 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.85.0") # handled by release scripts +set(KF_VERSION "5.86.0") # handled by release scripts project(Sonnet VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.85.0 NO_MODULE) +find_package(ECM 5.86.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -25,7 +25,7 @@ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") -set(REQUIRED_QT_VERSION 5.15.0) +set(REQUIRED_QT_VERSION 5.15.2) option(SONNET_USE_WIDGETS "Build components using Qt5Widgets" ON) if(SONNET_USE_WIDGETS) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) @@ -46,7 +46,7 @@ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer") endif() -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) ecm_install_po_files_as_qm(po) add_subdirectory(data) add_subdirectory(src) diff -Nru sonnet-5.85.0/debian/changelog sonnet-5.86.0/debian/changelog --- sonnet-5.85.0/debian/changelog 2021-08-13 10:30:56.000000000 +0000 +++ sonnet-5.86.0/debian/changelog 2021-09-13 11:51:20.000000000 +0000 @@ -1,3 +1,9 @@ +sonnet (5.86.0-0ubuntu1) impish; urgency=medium + + * New upstream release (5.86.0) + + -- José Manuel Santamaría Lema Mon, 13 Sep 2021 12:51:20 +0100 + sonnet (5.85.0-0ubuntu1) impish; urgency=medium * New upstream release (5.85.0) diff -Nru sonnet-5.85.0/debian/control sonnet-5.86.0/debian/control --- sonnet-5.85.0/debian/control 2021-08-13 10:30:56.000000000 +0000 +++ sonnet-5.86.0/debian/control 2021-09-13 11:51:20.000000000 +0000 @@ -8,7 +8,7 @@ cmake (>= 3.5~), debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.85.0~), + extra-cmake-modules (>= 5.86.0~), graphviz, hspell, libaspell-dev, diff -Nru sonnet-5.85.0/.git-blame-ignore-revs sonnet-5.86.0/.git-blame-ignore-revs --- sonnet-5.85.0/.git-blame-ignore-revs 2021-08-06 09:13:20.000000000 +0000 +++ sonnet-5.86.0/.git-blame-ignore-revs 2021-09-04 17:09:28.000000000 +0000 @@ -1,3 +1,5 @@ #clang-format c96d7b78cf7b82b6a9f16ccd923e427e47fa9e22 75599244a47b62d0782a68e2b37e1a99191c40e2 +#clang-tidy +ae0a07bce2562b28e77398d52cf86654e0d60d48 diff -Nru sonnet-5.85.0/metainfo.yaml sonnet-5.86.0/metainfo.yaml --- sonnet-5.85.0/metainfo.yaml 2021-08-06 09:13:20.000000000 +0000 +++ sonnet-5.86.0/metainfo.yaml 2021-09-04 17:09:28.000000000 +0000 @@ -6,7 +6,7 @@ - name: Linux - name: FreeBSD - name: Windows - - name: MacOSX + - name: macOS portingAid: false deprecated: false release: true diff -Nru sonnet-5.85.0/po/ia/sonnet5_qt.po sonnet-5.86.0/po/ia/sonnet5_qt.po --- sonnet-5.85.0/po/ia/sonnet5_qt.po 2021-08-06 09:13:20.000000000 +0000 +++ sonnet-5.86.0/po/ia/sonnet5_qt.po 2021-09-04 17:09:28.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2021-08-04 22:19+0200\n" +"PO-Revision-Date: 2021-08-06 22:55+0200\n" "Last-Translator: giovanni \n" "Language-Team: Interlingua \n" "Language: ia\n" @@ -357,7 +357,7 @@ #: ui/sonnetui.ui:112 msgctxt "SonnetUi|" msgid "<< Add to Dictionary" -msgstr "<languages(); s_knownDictionaries = QSet(languages.begin(), languages.end()); QSet dictionaryLanguages; - for (const QString &dictName : qAsConst(s_knownDictionaries)) { + for (const QString &dictName : std::as_const(s_knownDictionaries)) { QString languageName = QLocale(dictName).name(); if (languageName.isEmpty()) { qCWarning(SONNET_LOG_CORE) << "Unable to parse name for dictionary" << dictName; @@ -504,7 +504,7 @@ { // Remove unknown languages QStringList pruned; - for (const QString &name : qAsConst(names)) { + for (const QString &name : std::as_const(names)) { if (!dictionaryLanguages.contains(name)) { continue; } @@ -517,7 +517,7 @@ continue; } - for (const QString &name : qAsConst(names)) { + for (const QString &name : std::as_const(names)) { s_scriptLanguages.insert(script, name); } } @@ -526,7 +526,7 @@ if (!allLanguages.contains(s_knownDictionaries)) { QSet dicts(s_knownDictionaries); dicts.subtract(allLanguages); - for (const QString &dictName : qAsConst(dicts)) { + for (const QString &dictName : std::as_const(dicts)) { QString languageName = QLocale(dictName).name(); if (languageName.isEmpty()) { qCWarning(SONNET_LOG_CORE) << "Unable to parse language name" << dictName; @@ -577,8 +577,9 @@ for (const QChar::Script script : scriptsList) { const auto languagesList = d->s_scriptLanguages.values(script); for (const QString &lang : languagesList) { - if (!d->s_knownModels.contains(lang)) + if (!d->s_knownModels.contains(lang)) { candidateLanguages.append(lang); + } } } @@ -790,7 +791,7 @@ QVector orderedTrigrams; orderedTrigrams.reserve(trigramFrequencyList.size()); - for (const auto &tri : qAsConst(trigramFrequencyList)) { + for (const auto &tri : std::as_const(trigramFrequencyList)) { orderedTrigrams.append(tri.second); } diff -Nru sonnet-5.85.0/src/core/loader.cpp sonnet-5.86.0/src/core/loader.cpp --- sonnet-5.85.0/src/core/loader.cpp 2021-08-06 09:13:20.000000000 +0000 +++ sonnet-5.86.0/src/core/loader.cpp 2021-09-04 17:09:28.000000000 +0000 @@ -154,16 +154,16 @@ QString Loader::languageNameForCode(const QString &langCode) const { - QString currentDictionary = langCode, // e.g. en_GB-ize-wo_accents - isoCode, // locale ISO name - variantName, // dictionary variant name e.g. w_accents - localizedLang, // localized language - localizedCountry, // localized country - localizedVariant; + QString currentDictionary = langCode; // e.g. en_GB-ize-wo_accents + QString isoCode; // locale ISO name + QString variantName; // dictionary variant name e.g. w_accents + QString localizedLang; // localized language + QString localizedCountry; // localized country + QString localizedVariant; QByteArray variantEnglish; // dictionary variant in English - int minusPos, // position of "-" char - variantCount = 0; // used to iterate over variantList + int minusPos; // position of "-" char + int variantCount = 0; // used to iterate over variantList struct variantListType { const char *variantShortName;