aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deprecation warnings.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2020-01-12 18:16:53 +02:00
parent 05bf604a56
commit 48fbc9262e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/vtools/undocommands/savetooloptions.cpp
View File

@ -93,12 +93,14 @@ void SaveToolOptions::redo()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QVector<quint32> SaveToolOptions::Missing(const QList<quint32> &list1, const QList<quint32> &list2) const QVector<quint32> SaveToolOptions::Missing(const QList<quint32> &list1, const QList<quint32> &list2) const
{ {
QSet<quint32> set1 = QSet<quint32>::fromList(list1);
QSet<quint32> set2 = QSet<quint32>::fromList(list2);
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
auto set1 = QSet<quint32>(list1.begin(), list1.end());
auto set2 = QSet<quint32>(list2.begin(), list2.end());
QSet<quint32> substracted = set1.subtract(set2); QSet<quint32> substracted = set1.subtract(set2);
return QVector<quint32>(substracted.begin(), substracted.end()); return QVector<quint32>(substracted.begin(), substracted.end());
#else #else
auto set1 = QSet<quint32>::fromList(list1);
auto set2 = QSet<quint32>::fromList(list2);
return set1.subtract(set2).toList().toVector(); return set1.subtract(set2).toList().toVector();
#endif #endif
} }
@ -114,11 +116,13 @@ bool SaveToolOptions::mergeWith(const QUndoCommand *command)
} }
else else
{ {
const QSet<quint32> currentSet; #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
currentSet.fromList(newDependencies); auto currentSet = QSet<quint32>(newDependencies.begin(), newDependencies.end());
auto candidateSet = QSet<quint32>(saveCommand->NewDependencies().begin(), saveCommand->NewDependencies().end());
const QSet<quint32> candidateSet; #else
candidateSet.fromList(saveCommand->NewDependencies()); auto currentSet = QSet<quint32>::fromList(newDependencies);
auto candidateSet = QSet<quint32>::fromList(saveCommand->NewDependencies());
#endif
if (currentSet != candidateSet) if (currentSet != candidateSet)
{ {