bug fixes, refactoring started

git-svn-id: svn://db.shs.com.ru/libs@590 a8b55f48-bf90-11e4-a774-851b48703e85

qad/blockview/blockbase.h

@@ -18,16 +18,37 @@
 /// 1004 - BlockItemPin ("pin")
 /// 1005 - BlockBusItem ("connection")
 /// 1006 - BlockItem ("item")
-/// 1007 - BlockItem selection ("item_selection")
+/// 1007 - BlockItem selection (true)
 /// 1008 - item is NOT decor, ignore for function decors() (true)
 /// 1009 - item is scene decor ("decor")
 /// 1010 - BlockItem decor (src text for QGraphicsSimpleTextItem)
-/// 1011 - item is BlockItem decor ("decor")
+/// 1011 - item is BlockItem decor (true)
 /// 1100 - flag for correct move (true)
 
 static const int _blockitem_current_version_ = 1;
 
 
+enum BlockviewItemData {
+	bvidSelected = 1000, // bool
+	bvidItemPos = 1001, // QpointF
+	bvidMoveParent = 1002, // bool
+	bvidVisualizeSelection = 1003, // bool
+	bvidType = 1005, // BlockviewItemType
+	bvidInvalidItem = 1008, // bool
+	bvidDecorText = 1010, // QString
+	bvidBlockDecor = 1011, // bool
+	bvidCorrectMove = 1100, // bool
+};
+
+enum BlockviewItemType {
+	bvitPin,
+	bvitBus,
+	bvitBlock,
+	bvitSelection,
+	bvitDecor,
+	bvitItemText,
+};
+
 QDataStream & operator <<(QDataStream & s, const QGraphicsItem * item);
 QDataStream & operator >>(QDataStream & s, QGraphicsItem *& item);