diff --git a/sources/conductorautonumerotation.cpp b/sources/conductorautonumerotation.cpp index 6cd04a417..2c425a6e6 100644 --- a/sources/conductorautonumerotation.cpp +++ b/sources/conductorautonumerotation.cpp @@ -38,7 +38,7 @@ ConductorAutoNumerotation::ConductorAutoNumerotation(Conductor *conductor, Diagram *diagram, QUndoCommand *parent_undo) : m_diagram (diagram), m_conductor (conductor), - conductor_list (conductor -> relatedPotentialConductors().toList()), + conductor_list (conductor -> relatedPotentialConductors().values()), m_parent_undo (parent_undo) {} diff --git a/sources/diagramcontent.cpp b/sources/diagramcontent.cpp index 62fb3efad..d34ec2234 100644 --- a/sources/diagramcontent.cpp +++ b/sources/diagramcontent.cpp @@ -68,7 +68,7 @@ DiagramContent::DiagramContent(Diagram *diagram, bool selected) : if (m_potential_conductors.isEmpty()) { m_potential_conductors << c; } else { - if (!potentialIsManaged(c->relatedPotentialConductors(true).toList())) { + if (!potentialIsManaged(c->relatedPotentialConductors(true).values())) { m_potential_conductors << c; } } @@ -338,7 +338,7 @@ DiagramContent &DiagramContent::operator+=(const DiagramContent &other) for (Conductor *c : other.m_potential_conductors) { - QList c_list = c->relatedPotentialConductors(true).toList(); + QList c_list = c->relatedPotentialConductors(true).values(); c_list << c; if (!potentialIsManaged(c_list)) { m_potential_conductors << c; diff --git a/sources/elementsmover.cpp b/sources/elementsmover.cpp index 0868b82c5..c86fb275c 100644 --- a/sources/elementsmover.cpp +++ b/sources/elementsmover.cpp @@ -81,14 +81,14 @@ int ElementsMover::beginMovement(Diagram *diagram, QGraphicsItem *driver_item) m_moved_content.removeNonMovableItems(); //Remove element text, if the parent element is selected. - QList deti_list = m_moved_content.m_element_texts.toList(); + QList deti_list = m_moved_content.m_element_texts.values(); for(DynamicElementTextItem *deti : deti_list) { if(m_moved_content.m_elements.contains(deti->parentElement())) { m_moved_content.m_element_texts.remove(deti); } } - QList etig_list = m_moved_content.m_texts_groups.toList(); + QList etig_list = m_moved_content.m_texts_groups.values(); for(ElementTextItemGroup *etig : etig_list) { if (m_moved_content.m_elements.contains(etig->parentElement())) { m_moved_content.m_texts_groups.remove(etig); diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index a6a7a0da7..b2d1019f9 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -1393,7 +1393,7 @@ void QETDiagramEditor::selectionGroupTriggered(QAction *action) dv->editSelection(); else if (value == "group_selected_texts") { - QList deti_list = dc.m_element_texts.toList(); + QList deti_list = dc.m_element_texts.values(); if(deti_list.size() <= 1) return; @@ -1537,8 +1537,8 @@ void QETDiagramEditor::slot_updateComplexActions() int selected_dynamic_elmt_text = 0; for(DiagramTextItem *dti : texts) {if(dti->type() == DynamicElementTextItem::Type) selected_dynamic_elmt_text++;} m_rotate_texts->setEnabled(!ro && (selected_texts || groups.size())); - //Action that need only element text selected - QList deti_list = dc.m_element_texts.toList(); + //Action that need only element text selected + QList deti_list = dc.m_element_texts.values(); if(deti_list.size() > 1 && dc.count() == deti_list.count()) { Element *elmt = deti_list.first()->parentElement(); diff --git a/sources/qetgraphicsitem/terminal.cpp b/sources/qetgraphicsitem/terminal.cpp index a0fbf47fe..090c7f03b 100644 --- a/sources/qetgraphicsitem/terminal.cpp +++ b/sources/qetgraphicsitem/terminal.cpp @@ -612,7 +612,7 @@ void Terminal::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) if (use_properties) { - Conductor *other = conductors_list.toList().first(); + Conductor *other = conductors_list.values().first(); new_conductor->rSequenceNum() = other->sequenceNum(); new_conductor->setProperties(others_properties); } @@ -626,7 +626,7 @@ void Terminal::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) diagram() -> undoStack().push(undo); if (use_properties) { - Conductor *other = conductors_list.toList().first(); + Conductor *other = conductors_list.values().first(); new_conductor->setProperties(other->properties()); } } diff --git a/sources/titleblock/templatecommands.cpp b/sources/titleblock/templatecommands.cpp index b5659821a..421b968b3 100644 --- a/sources/titleblock/templatecommands.cpp +++ b/sources/titleblock/templatecommands.cpp @@ -718,7 +718,7 @@ TitleBlockCell *MergeCellsCommand::getBottomRightCell(const TitleBlockTemplateCe // next, we get its logical cells: the painted one and the spanned ones (if any) QSet logical_cells = bottom_right_cell -> cells(); if (logical_cells.isEmpty()) return(nullptr); - if (logical_cells.count() == 1) return(logical_cells.toList().first()); + if (logical_cells.count() == 1) return(logical_cells.values().first()); // we then look for the bottom right logical cell int max_num_row = -1, max_num_col = -1; diff --git a/sources/titleblock/templateview.cpp b/sources/titleblock/templateview.cpp index 665d1a754..a6e18a54d 100644 --- a/sources/titleblock/templateview.cpp +++ b/sources/titleblock/templateview.cpp @@ -422,7 +422,7 @@ void TitleBlockTemplateView::drawBackground(QPainter *painter, const QRectF &rec @return the selected logical cells, not including the spanned ones. */ QList TitleBlockTemplateView::selectedCells() const { - return(selectedCellsSet().cells(false).toList()); + return(selectedCellsSet().cells(false).values()); } /** diff --git a/sources/ui/potentialselectordialog.cpp b/sources/ui/potentialselectordialog.cpp index 3bacffaec..a11387dff 100644 --- a/sources/ui/potentialselectordialog.cpp +++ b/sources/ui/potentialselectordialog.cpp @@ -104,7 +104,7 @@ class NewConductorPotentialSelector : public AbstractPotentialSelector seq_num = conductor_in_potential->sequenceNum(); number = conductor_in_potential->relatedPotentialConductors().size()+1; //We add +1 because conductor_in_potential isn't count by relatedPotentialConductors - c_list = conductor_in_potential->relatedPotentialConductors().toList(); + c_list = conductor_in_potential->relatedPotentialConductors().values(); c_list.append(conductor_in_potential); foreach(Conductor *c, c_list) properties_list.append(c->properties()); @@ -137,14 +137,14 @@ class LinkReportPotentialSelector : public AbstractPotentialSelector m_conductor_number_1 = report->conductors().first()->relatedPotentialConductors().size() + 1; m_seq_num_1 = report->conductors().first()->sequenceNum(); - m_conductors_list_1.append(report->conductors().first()->relatedPotentialConductors().toList()); + m_conductors_list_1.append(report->conductors().first()->relatedPotentialConductors().values()); m_conductors_list_1.append(report->conductors().first()); foreach(Conductor *c, m_conductors_list_1) m_properties_list_1 << c->properties(); m_conductor_number_2 = other_report->conductors().first()->relatedPotentialConductors().size() + 1; m_seq_num_2 = other_report->conductors().first()->sequenceNum(); - m_conductors_list_2.append(other_report->conductors().first()->relatedPotentialConductors().toList()); + m_conductors_list_2.append(other_report->conductors().first()->relatedPotentialConductors().values()); m_conductors_list_2.append(other_report->conductors().first()); foreach(Conductor *c, m_conductors_list_2) m_properties_list_2 << c->properties(); diff --git a/sources/undocommand/deleteqgraphicsitemcommand.cpp b/sources/undocommand/deleteqgraphicsitemcommand.cpp index ab48ffe88..c69737c24 100644 --- a/sources/undocommand/deleteqgraphicsitemcommand.cpp +++ b/sources/undocommand/deleteqgraphicsitemcommand.cpp @@ -281,7 +281,7 @@ void DeleteQGraphicsItemCommand::redo() if (m_diagram -> defaultConductorProperties.m_one_text_per_folio && c -> textItem() -> isVisible()) { QList conductor_list; - conductor_list << c -> relatedPotentialConductors(false).toList(); + conductor_list << c -> relatedPotentialConductors(false).values(); if (conductor_list.count()) conductor_list.first() -> calculateTextItemPosition(); }