From 270bfffd5fa970a2bf5c2ab57ea11900a7bdcf46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Mon, 13 Mar 2017 15:21:34 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@166
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad_blockview/blockitem.cpp | 16 ++++++++--------
 qad_blockview/blockitem.h   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

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<Qt::Alignment, QList<BlockItemPin * > > it(pins_);
+	QMutableMapIterator<Qt::Alignment, QVector<BlockItemPin * > > 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<BlockItemPin * > BlockItem::takePins() {
 
 
 void BlockItem::clearPins() {
-	QList<QList<BlockItemPin * > > mp = pins_.values();
+	QList<QVector<BlockItemPin * > > mp = pins_.values();
 	for (int i = 0; i < mp.size(); ++i)
 		qDeleteAll(mp[i]);
 	pins_.clear();
@@ -233,10 +233,10 @@ void BlockItem::clearDecors() {
 
 
 QVector<BlockItemPin * > BlockItem::pins() const {
-	QList<QList<BlockItemPin * > > mp = pins_.values();
+	QList<QVector<BlockItemPin * > > mp = pins_.values();
 	QVector<BlockItemPin * > 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<BlockItemPin * > pl;
-	pl = pl.fromList(pins().toList());
+	QVector<BlockItemPin * > pl = pins();
+//	pl = pl.fromList(pins().toList());
 	pins_.clear();
 	foreach (BlockItemPin * p, pl)
 		pins_[p->alignment()] << p;
-	QList<BlockItemPin * > cp = pins_.value(Qt::AlignBottom);
+	QVector<BlockItemPin * > 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<Qt::Alignment, QList<BlockItemPin * > > pins_;
+	QMap<Qt::Alignment, QVector<BlockItemPin * > > pins_;
 	QList<QGraphicsItem * > decors_;
 	
 };