realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

fix deprecated warning QSet<T> QList<T>::toSet()

Browse Source 
Use
QSet<T>(list.begin(), list.end())
instead.

This function was introduced in Qt 5.14
This commit is contained in:
Simon De Backer 2020-06-07 09:03:42 +02:00 committed by Laurent Trinques
parent 37658efd0d
commit fe64923ffe
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sources/diagram.cpp
View File

@ -1093,9 +1093,21 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
if (content_ptr) {
content_ptr -> m_elements = added_elements;
content_ptr -> m_conductors_to_move = added_conductors;
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove
content_ptr -> m_text_fields = added_texts.toSet();
content_ptr -> m_images = added_images.toSet();
content_ptr -> m_shapes = added_shapes.toSet();
#else
content_ptr -> m_text_fields = QSet<IndependentTextItem *>(
added_texts.begin(),
added_texts.end());
content_ptr -> m_images = QSet<DiagramImageItem *>(
added_images.begin(),
added_images.end());
content_ptr -> m_shapes = QSet<QetShapeItem *>(
added_shapes.begin(),
added_shapes.end());
#endif
content_ptr -> m_tables = added_tables;
}

4
sources/qetgraphicsitem/conductor.cpp
View File

@ -1639,7 +1639,11 @@ QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram,
for (Conductor *c : other_conductors_list_t) {
other_conductors += c->relatedPotentialConductors(all_diagram, t_list);
}
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove
other_conductors += other_conductors_list_t.toSet();
#else
other_conductors += QSet<Conductor*>(other_conductors_list_t.begin(),other_conductors_list_t.end());
#endif
}
}