diff --git a/sources/qetgraphicsitem/crossrefitem.cpp b/sources/qetgraphicsitem/crossrefitem.cpp index a06320f77..034ea05da 100644 --- a/sources/qetgraphicsitem/crossrefitem.cpp +++ b/sources/qetgraphicsitem/crossrefitem.cpp @@ -681,7 +681,7 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt) if (m_hovered_contacts_map.contains(elmt)) { - m_hovered_contacts_map.insertMulti(elmt, bounding_rect); + m_hovered_contacts_map.insert(elmt, bounding_rect); } else { @@ -740,7 +740,7 @@ QRectF CrossRefItem::drawContact(QPainter &painter, int flags, Element *elmt) bounding_rect = bounding_rect.united(text_rect); if (m_hovered_contacts_map.contains(elmt)) { - m_hovered_contacts_map.insertMulti(elmt, bounding_rect); + m_hovered_contacts_map.insert(elmt, bounding_rect); } else { m_hovered_contacts_map.insert(elmt, bounding_rect); @@ -778,7 +778,7 @@ void CrossRefItem::fillCrossRef(QPainter &painter) if (m_hovered_contacts_map.contains(elmt)) { - m_hovered_contacts_map.insertMulti(elmt, bounding); + m_hovered_contacts_map.insert(elmt, bounding); } else { @@ -802,7 +802,7 @@ void CrossRefItem::fillCrossRef(QPainter &painter) if (m_hovered_contacts_map.contains(elmt)) { - m_hovered_contacts_map.insertMulti(elmt, bounding); + m_hovered_contacts_map.insert(elmt, bounding); } else { diff --git a/sources/qetgraphicsitem/crossrefitem.h b/sources/qetgraphicsitem/crossrefitem.h index f5e8c57f7..83ead2352 100644 --- a/sources/qetgraphicsitem/crossrefitem.h +++ b/sources/qetgraphicsitem/crossrefitem.h @@ -19,8 +19,10 @@ #define CROSSREFITEM_H #include -#include"properties/xrefproperties.h" #include +#include + +#include"properties/xrefproperties.h" class Element; class DynamicElementTextItem; @@ -104,7 +106,7 @@ class CrossRefItem : public QGraphicsObject QPainterPath m_shape_path; XRefProperties m_properties; int m_drawed_contacts; - QMap m_hovered_contacts_map; + QMultiMap m_hovered_contacts_map; Element *m_hovered_contact = nullptr; DynamicElementTextItem *m_text = nullptr; ElementTextItemGroup *m_group = nullptr; diff --git a/sources/titleblock/templatecellsset.cpp b/sources/titleblock/templatecellsset.cpp index bc6e28715..6e6bca801 100644 --- a/sources/titleblock/templatecellsset.cpp +++ b/sources/titleblock/templatecellsset.cpp @@ -15,6 +15,9 @@ You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ + +#include + #include "templatecellsset.h" #include "templatevisualcell.h" #include "templateview.h" @@ -100,7 +103,7 @@ TitleBlockTemplateVisualCell *TitleBlockTemplateCellsSet::topLeftCell() const { QMultiMap top_cells; foreach (TitleBlockTemplateVisualCell *cell_view, *this) { if (TitleBlockCell *cell = cell_view -> cell()) { - top_cells.insertMulti(cell -> num_row, cell_view); + top_cells.insert(cell -> num_row, cell_view); } } QList candidates = top_cells.values(top_cells.keys().first()); @@ -130,7 +133,7 @@ TitleBlockTemplateVisualCell *TitleBlockTemplateCellsSet::bottomRightCell() cons // look for cells at the bottom QMultiMap bottom_cells; foreach (TitleBlockTemplateVisualCell *cell_view, *this) { - bottom_cells.insertMulti(cell_view -> geometry().bottom(), cell_view); + bottom_cells.insert(cell_view -> geometry().bottom(), cell_view); } QList candidates = bottom_cells.values(bottom_cells.keys().last()); if (candidates.count() == 1) return(candidates.first());