[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Andi Fischer]

SVN commit 1324706 by fischer:

UMLSceneEllipseItem removed and using QGraphicsEllipseItem directly.

 M  +0 -20     umlscene.h  
 M  +5 -5      widgets/associationline.cpp  
 M  +2 -2      widgets/associationline.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1324705:1324706
@@ -80,26 +80,6 @@
 typedef QGraphicsItem UMLSceneItem;
 typedef QList<QGraphicsItem*> UMLSceneItemList;
 
-class UMLSceneEllipseItem : public QGraphicsEllipseItem
-{
-public:
-    UMLSceneEllipseItem()
-    : QGraphicsEllipseItem(0)
-    {
-    }
-
-    UMLSceneEllipseItem(int width, int height)
-    : QGraphicsEllipseItem(0, 0, width, height, 0)
-    {
-    }
-
-    void setCanvas(QGraphicsScene *scene)
-    {
-        scene->addItem(this);
-    }
-
-};
-
 /**
  * UMLScene instances represent diagrams.
  * The UMLScene class inherits from QGraphicsScene and it owns the
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.cpp #1324705:1324706
@@ -30,7 +30,7 @@
 DEBUG_REGISTER_DISABLED(AssociationLine)
 
 AssociationLine::Circle::Circle(int radius /* = 0 */)
-  : UMLSceneEllipseItem(radius * 2, radius * 2)
+  : QGraphicsEllipseItem(0, 0, radius * 2, radius * 2)
 {
 }
 
@@ -46,7 +46,7 @@
 
 void AssociationLine::Circle::setRadius(int radius)
 {
-    UMLSceneEllipseItem::setRect(x(), y(), radius * 2, radius * 2);
+    QGraphicsEllipseItem::setRect(x(), y(), radius * 2, radius * 2);
 }
 
 int AssociationLine::Circle::getRadius() const
@@ -62,7 +62,7 @@
 }
 
 AssociationLine::SubsetSymbol::SubsetSymbol()
-  : UMLSceneEllipseItem()
+  : QGraphicsEllipseItem()
 {
     inclination = 0;
 }
@@ -1015,7 +1015,7 @@
         growList(m_HeadList, 1);
         if (!m_pCircle) {
             m_pCircle = new Circle( 6 );
-            m_pCircle->setCanvas( canvas() );
+            canvas()->addItem(m_pCircle);
             m_pCircle->show();
             m_pCircle->setPen( QPen( lineColor(), lineWidth() ) );
         }
@@ -1213,7 +1213,7 @@
     switch( getAssocType() ) {
        case Uml::AssociationType::Child2Category:
            m_pSubsetSymbol = new SubsetSymbol;
-           m_pSubsetSymbol->setCanvas(canvas());
+           canvas()->addItem(m_pSubsetSymbol);
            m_pSubsetSymbol->setPen( QPen( lineColor(), lineWidth() ) );
            updateSubsetSymbol();
            m_pSubsetSymbol->show();
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.h #1324705:1324706
@@ -111,7 +111,7 @@
      * We can't use QCanvasEllipse directly for this because it doesn't
      * use the pen, i.e. QCanvasEllipse only draws filled ellipses.
      */
-    class Circle : public UMLSceneEllipseItem
+    class Circle : public QGraphicsEllipseItem
     {
     public:
         explicit Circle(int radius = 0);
@@ -126,7 +126,7 @@
     /**
      * Draw the subset Symbol
      */
-    class SubsetSymbol : public UMLSceneEllipseItem
+    class SubsetSymbol : public QGraphicsEllipseItem
     {
     public:
         explicit SubsetSymbol();