kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-01-27 05:19:59 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix deprecated warning QMap

Browse Source 
This function is obsolete.

Use QMultiMap instead.
This function was introduced in Qt 4.3 - 5.14
This commit is contained in:
Simon De Backer
2020-06-10 20:46:35 +02:00
committed by Laurent Trinques
parent 573a36b93f
commit b9ed45c8a3
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sources/qetgraphicsitem/crossrefitem.cpp
View File

@@ -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
{

6
sources/qetgraphicsitem/crossrefitem.h
View File

@@ -19,8 +19,10 @@
#define CROSSREFITEM_H
#include <QGraphicsObject>
#include"properties/xrefproperties.h"
#include <QPicture>
#include <QMultiMap>
#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 <Element *, QRectF> m_hovered_contacts_map;
QMultiMap <Element *, QRectF> m_hovered_contacts_map;
Element *m_hovered_contact = nullptr;
DynamicElementTextItem *m_text = nullptr;
ElementTextItemGroup *m_group = nullptr;