diff --git a/qad_blockview/blockitem.cpp b/qad_blockview/blockitem.cpp index aef76d2..4c77bf8 100644 --- a/qad_blockview/blockitem.cpp +++ b/qad_blockview/blockitem.cpp @@ -154,10 +154,10 @@ BlockItemPin * BlockItem::addPin(Qt::Alignment align, int bus_type, const QStrin void BlockItem::removePin(BlockItemPin * pin) { if (!pin) return; - QMutableMapIterator > it(pins_); + QMutableMapIterator > it(pins_); while (it.hasNext()) { it.next(); - it.value().removeAll(pin); + it.value().remove(it.value().indexOf(pin)); } delete pin; arrangePins(); @@ -210,7 +210,7 @@ QVector BlockItem::takePins() { void BlockItem::clearPins() { - QList > mp = pins_.values(); + QList > mp = pins_.values(); for (int i = 0; i < mp.size(); ++i) qDeleteAll(mp[i]); pins_.clear(); @@ -233,10 +233,10 @@ void BlockItem::clearDecors() { QVector BlockItem::pins() const { - QList > mp = pins_.values(); + QList > mp = pins_.values(); QVector ret; for (int i = 0; i < mp.size(); ++i) - ret << mp[i].toVector(); + ret << mp[i]; return ret; } @@ -409,12 +409,12 @@ void BlockItem::mouseMoveEvent(QGraphicsSceneMouseEvent * event) { void BlockItem::arrangePins() { //double w = g_main.rect().width(), h = g_main.rect().height(); - QSet pl; - pl = pl.fromList(pins().toList()); + QVector pl = pins(); +// pl = pl.fromList(pins().toList()); pins_.clear(); foreach (BlockItemPin * p, pl) pins_[p->alignment()] << p; - QList cp = pins_.value(Qt::AlignBottom); + QVector cp = pins_.value(Qt::AlignBottom); for (int i = 0; i < cp.size(); ++i) cp[i]->setPos(_POS(pins_margin), bottom()); cp = pins_.value(Qt::AlignTop); for (int i = 0; i < cp.size(); ++i) cp[i]->setPos(_POS(pins_margin), top()); diff --git a/qad_blockview/blockitem.h b/qad_blockview/blockitem.h index a0b70da..9187f5a 100644 --- a/qad_blockview/blockitem.h +++ b/qad_blockview/blockitem.h @@ -168,7 +168,7 @@ protected: QGraphicsRectItem g_main, g_selection; int pins_margin; QColor col; - QMap > pins_; + QMap > pins_; QList decors_; };