From 1f6285aef9bf0d1323323a1adceca02c0d9cd75c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 6 Jan 2020 20:10:09 +0200 Subject: [PATCH] Fix deprecation warnings. (grafted from 686129d90f37b8d0c428092668673d44f06545d8) --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 10 ++++++++++ src/app/valentina/mainwindowsnogui.cpp | 12 ++++++++++++ src/app/valentina/xml/vpattern.cpp | 10 ++++++++++ src/libs/ifc/xml/vabstractpattern.cpp | 16 +++++++++++++++- src/libs/vlayout/vbank.cpp | 4 ++++ src/libs/vlayout/vlayoutgenerator.cpp | 4 ++++ src/libs/vlayout/vlayoutpiece.cpp | 4 ++++ src/libs/vpatterndb/vcontainer.cpp | 8 ++++++-- src/libs/vpatterndb/vpiece.cpp | 2 +- src/libs/vpatterndb/vpiecepath.cpp | 2 +- src/libs/vtools/undocommands/savetooloptions.cpp | 5 +++++ 11 files changed, 72 insertions(+), 5 deletions(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index d137930c2..eda521b7a 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -2795,8 +2795,13 @@ void TMainWindow::WriteSettings() //--------------------------------------------------------------------------------------------------------------------- QStringList TMainWindow::FilterMeasurements(const QStringList &mNew, const QStringList &mFilter) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const auto import = QSet(mNew.begin(), mNew.end()).subtract(QSet(mFilter.begin(), mFilter.end())); + return QStringList(import.begin(), import.end()); +#else const QSet import = mNew.toSet().subtract(mFilter.toSet()); return QStringList(import.toList()); +#endif } //--------------------------------------------------------------------------------------------------------------------- @@ -3065,7 +3070,12 @@ QString TMainWindow::CheckMName(const QString &name, const QSet &import } else { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const QStringList allGroupNames = AllGroupNames(); + if (not QSet(allGroupNames.begin(), allGroupNames.end()).contains(name)) +#else if (not AllGroupNames().toSet().contains(name)) +#endif { throw VException(tr("Measurement '%1' is not one of known measurements.").arg(name)); } diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index 281de0200..93c16beda 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -2116,10 +2116,22 @@ QSharedPointer MainWindowsNoGUI::OpenMeasurementFile(const QStrin //--------------------------------------------------------------------------------------------------------------------- void MainWindowsNoGUI::CheckRequiredMeasurements(const VMeasurements *m) const { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QStringList patternMeasurments = doc->ListMeasurements(); + QStringList bodyMeasurments = m->ListAll(); + const auto match = QSet(patternMeasurments.begin(), patternMeasurments.end()) + .subtract(QSet(bodyMeasurments.begin(), bodyMeasurments.end())); +#else const QSet match = doc->ListMeasurements().toSet().subtract(m->ListAll().toSet()); +#endif + if (not match.isEmpty()) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QList list = QList(match.begin(), match.end()); +#else QList list = match.toList(); +#endif for (int i = 0; i < list.size(); ++i) { list[i] = qApp->TrVars()->MToUser(list.at(i)); diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 1c1691d76..7c19936fd 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -98,7 +98,12 @@ void GatherCount(int &count, const int nodes) QString DefLabelLanguage() { QString def = qApp->ValentinaSettings()->GetLabelLanguage(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QStringList languages = VApplication::LabelLanguages(); + if (not QSet(languages.begin(), languages.end()).contains(def)); +#else if (not VApplication::LabelLanguages().toSet().contains(def)) +#endif { def = QStringLiteral("en"); } @@ -4376,7 +4381,12 @@ void VPattern::SetLabelPrefix(const QString &prefix) if (not pattern.isNull()) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QStringList languages = VApplication::LabelLanguages(); + if (QSet(languages.begin(), languages.end()).contains(prefix)); +#else if (VApplication::LabelLanguages().toSet().contains(prefix)) +#endif { SetAttribute(pattern, AttrLabelPrefix, prefix); modified = true; diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index 297e9c6d0..34a3c9e2e 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -256,7 +256,11 @@ QList GetTokens(const VFormulaField &formula) //--------------------------------------------------------------------------------------------------------------------- void GatherTokens(QSet &tokens, const QList &tokenList) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + tokens = tokens.unite(QSet(tokenList.begin(), tokenList.end())); +#else tokens = tokens.unite(tokenList.toSet()); +#endif } //--------------------------------------------------------------------------------------------------------------------- @@ -313,11 +317,21 @@ QStringList VAbstractPattern::ListMeasurements() const { const QFuture futureIncrements = QtConcurrent::run(this, &VAbstractPattern::ListIncrements); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QSet results = QtConcurrent::blockingMappedReduced(ListExpressions(), GetTokens, GatherTokens); + const auto tokens = QList(results.begin(), results.end()); +#else const QList tokens = QtConcurrent::blockingMappedReduced(ListExpressions(), GetTokens, GatherTokens).toList(); +#endif QSet measurements; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QStringList result = futureIncrements.result(); + QSet others = QSet(result.begin(), result.end()); +#else QSet others = futureIncrements.result().toSet(); +#endif for (const auto &token : tokens) { @@ -329,7 +343,7 @@ QStringList VAbstractPattern::ListMeasurements() const IsVariable(token) || IsFunction(token) ? others.insert(token) : measurements.insert(token); } - return QStringList(measurements.toList()); + return QStringList(measurements.values()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vlayout/vbank.cpp b/src/libs/vlayout/vbank.cpp index 7a987c259..1affaa69b 100644 --- a/src/libs/vlayout/vbank.cpp +++ b/src/libs/vlayout/vbank.cpp @@ -343,7 +343,11 @@ bool VBank::PrepareUnsorted() Insert(unsorted, group, i, square); } +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + groups = QVector(uniqueGroup.begin(), uniqueGroup.end()); +#else groups = QVector::fromList(uniqueGroup.toList()); +#endif std::sort(groups.begin(), groups.end()); PrepareGroup(); diff --git a/src/libs/vlayout/vlayoutgenerator.cpp b/src/libs/vlayout/vlayoutgenerator.cpp index faf6158dc..c08a9b9a7 100644 --- a/src/libs/vlayout/vlayoutgenerator.cpp +++ b/src/libs/vlayout/vlayoutgenerator.cpp @@ -642,7 +642,11 @@ QList VLayoutGenerator::MoveDetails(qreal length, const QVector= QT_VERSION_CHECK(5, 14, 0) + return QList(details.begin(), details.end()); +#else return details.toList(); +#endif } QList newDetails; diff --git a/src/libs/vlayout/vlayoutpiece.cpp b/src/libs/vlayout/vlayoutpiece.cpp index abbaf193a..8032a2c72 100644 --- a/src/libs/vlayout/vlayoutpiece.cpp +++ b/src/libs/vlayout/vlayoutpiece.cpp @@ -500,7 +500,11 @@ QVector VLayoutPiece::Map(QVector points) const if (d->mirror) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + auto list = QList(p.begin(), p.end()); +#else QList list = points.toList(); +#endif for (int k=0, s=list.size(), max=(s/2); k= QT_VERSION_CHECK(5, 13, 0) diff --git a/src/libs/vpatterndb/vcontainer.cpp b/src/libs/vpatterndb/vcontainer.cpp index 783bfa2ec..f57063c61 100644 --- a/src/libs/vpatterndb/vcontainer.cpp +++ b/src/libs/vpatterndb/vcontainer.cpp @@ -659,7 +659,7 @@ QStringList VContainer::AllUniqueNames(const QString &nspace) if (uniqueNames.contains(nspace)) { QStringList names = builInFunctions; - names.append(uniqueNames.value(nspace).toList()); + names.append(uniqueNames.value(nspace).values()); return names; } else @@ -707,7 +707,7 @@ void VContainer::ClearUniqueNames() const //--------------------------------------------------------------------------------------------------------------------- void VContainer::ClearUniqueIncrementNames() const { - const QList list = uniqueNames.value(d->nspace).toList(); + const QList list = uniqueNames.value(d->nspace).values(); ClearUniqueNames(); for(auto &name : list) @@ -810,7 +810,11 @@ const QHash > *VContainer::DataVariab //--------------------------------------------------------------------------------------------------------------------- VContainerData::~VContainerData() { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + if (ref.loadRelaxed() == 0) +#else if (ref.load() == 0) +#endif { --VContainer::copyCounter[nspace]; } diff --git a/src/libs/vpatterndb/vpiece.cpp b/src/libs/vpatterndb/vpiece.cpp index 9f2326e37..d75fbd496 100644 --- a/src/libs/vpatterndb/vpiece.cpp +++ b/src/libs/vpatterndb/vpiece.cpp @@ -67,7 +67,7 @@ QVector PieceMissingNodes(const QVector &d1Nodes, const QVecto set2.insert(d2Nodes.at(j)); } - const QList set3 = set1.subtract(set2).toList(); + const QList set3 = set1.subtract(set2).values(); QVector r; r.reserve(set3.size()); for (qint32 i = 0; i < set3.size(); ++i) diff --git a/src/libs/vpatterndb/vpiecepath.cpp b/src/libs/vpatterndb/vpiecepath.cpp index 31bd3c4d9..b6b035eed 100644 --- a/src/libs/vpatterndb/vpiecepath.cpp +++ b/src/libs/vpatterndb/vpiecepath.cpp @@ -629,7 +629,7 @@ QVector VPiecePath::MissingNodes(const VPiecePath &path) const set2.insert(path.at(j).GetId()); } - const QList set3 = set1.subtract(set2).toList(); + const QList set3 = set1.subtract(set2).values(); QVector nodes; nodes.reserve(set3.size()); for (qint32 i = 0; i < set3.size(); ++i) diff --git a/src/libs/vtools/undocommands/savetooloptions.cpp b/src/libs/vtools/undocommands/savetooloptions.cpp index 8a32b051a..b472fc59f 100644 --- a/src/libs/vtools/undocommands/savetooloptions.cpp +++ b/src/libs/vtools/undocommands/savetooloptions.cpp @@ -95,7 +95,12 @@ QVector SaveToolOptions::Missing(const QList &list1, const QLi { QSet set1 = QSet::fromList(list1); QSet set2 = QSet::fromList(list2); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QSet substracted = set1.subtract(set2); + return QVector(substracted.begin(), substracted.end()); +#else return set1.subtract(set2).toList().toVector(); +#endif } //---------------------------------------------------------------------------------------------------------------------