[Uml-devel] branches/work/soc-umbrello/umbrello

[Gopala Krishna A]

SVN commit 856374 by gopala:

* FloatingDashLineWidget: Removed margin code.
* UMLScene: Removed invalid QObject::disconnect statements.


 M  +3 -5      floatingdashlinewidget.cpp  
 M  +0 -2      floatingdashlinewidget.h  
 M  +0 -3      umlscene.cpp  


--- branches/work/soc-umbrello/umbrello/floatingdashlinewidget.cpp #856373:856374
@@ -26,8 +26,6 @@
 #include <QtGui/QStyleOptionGraphicsItem>
 #include <QtGui/QPainterPathStroker>
 
-const qreal FloatingDashLineWidget::Margin = 5.;
-
 /**
  * Constructs a horizontal FloatingDashLineWidget which is used in
  * CombinedFragmentWidget.
@@ -55,7 +53,7 @@
 void FloatingDashLineWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
                                    QWidget *)
 {
-    QLineF line(0, 0, size().width(), 0);
+    QLineF line(0, 0, width(), 0);
 
     QPen pen = QPen(lineColor(), lineWidth(), Qt::DashLine);
     painter->setPen(pen);
@@ -208,7 +206,7 @@
 {
     if (change == SizeHasChanged) {
         TextItemGroup *grp = textItemGroupAt(0);
-        const QRectF grpRect(QPointF(Margin, Margin), grp->minimumSize());
+        const QRectF grpRect(QPointF(0, 0), grp->minimumSize());
         grp->setGroupGeometry(grpRect);
 
         QRectF boundRect = boundingRect();
@@ -219,7 +217,7 @@
 
         QPainterPath shape;
         shape.moveTo(QPointF(0, 0));
-        shape.lineTo(QPointF(size().width(), 0));
+        shape.lineTo(QPointF(width(), 0));
 
         QPainterPathStroker stroker;
         stroker.setWidth(lineWidth() + 5);
--- branches/work/soc-umbrello/umbrello/floatingdashlinewidget.h #856373:856374
@@ -61,8 +61,6 @@
     virtual QVariant attributeChange(WidgetAttributeChange change, const QVariant& oldValue);
 
 private:
-    static const qreal Margin;
-
     void ensureConstraintRequirement();
 
     /// @ref yMin
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #856373:856374
@@ -905,9 +905,6 @@
         checkMessages(static_cast<ObjectWidget*>(o));
 
     o->cleanup();
-    disconnect(this, SIGNAL(sigRemovePopupMenu()), o, SLOT(slotRemovePopupMenu()));
-    disconnect(this, SIGNAL(sigClearAllSelected()), o, SLOT(slotClearAllSelected()));
-    disconnect(this, SIGNAL(sigColorChanged(Uml::IDType)), o, SLOT(slotColorChanged(Uml::IDType)));
     if (t == wt_Message) {
         m_MessageList.removeAll(static_cast<MessageWidget*>(o));
     } else