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

[Ralf Habacker]

SVN commit 1277946 by habacker:

Renamed UMLSceneEllipse to UMLSceneEllipseItem.

 M  +1 -1      umlscene.h  
 M  +4 -4      widgets/associationline.cpp  
 M  +2 -2      widgets/associationline.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1277945:1277946
@@ -47,7 +47,7 @@
 typedef Q3CanvasRectangle UMLSceneRectangle;
 typedef Q3CanvasItem UMLSceneItem;
 typedef Q3CanvasPolygon UMLScenePolygonItem;
-typedef Q3CanvasEllipse UMLSceneEllipse;
+typedef Q3CanvasEllipse UMLSceneEllipseItem;
 typedef Q3CanvasItemList UMLSceneItemList;
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.cpp #1277945:1277946
@@ -29,7 +29,7 @@
 #include "uml.h"
 
 AssociationLine::Circle::Circle(UMLViewCanvas * canvas, int radius /* = 0 */)
-        : UMLSceneEllipse(radius * 2, radius * 2, canvas)
+        : UMLSceneEllipseItem(radius * 2, radius * 2, canvas)
 {
 }
 
@@ -45,12 +45,12 @@
 
 void AssociationLine::Circle::setRadius(int radius)
 {
-    UMLSceneEllipse::setSize(radius * 2, radius * 2);
+    UMLSceneEllipseItem::setSize(radius * 2, radius * 2);
 }
 
 int AssociationLine::Circle::getRadius() const
 {
-    return (UMLSceneEllipse::height() / 2);
+    return (UMLSceneEllipseItem::height() / 2);
 }
 
 void AssociationLine::Circle::drawShape(QPainter& p)
@@ -61,7 +61,7 @@
 }
 
 AssociationLine::SubsetSymbol::SubsetSymbol(UMLViewCanvas* canvas)
-    : UMLSceneEllipse(canvas) {
+    : UMLSceneEllipseItem(canvas) {
     inclination = 0;
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.h #1277945:1277946
@@ -112,7 +112,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 UMLSceneEllipse
+    class Circle : public UMLSceneEllipseItem
     {
     public:
         explicit Circle(UMLViewCanvas * canvas, int radius = 0);
@@ -127,7 +127,7 @@
     /**
      * Draw the subset Symbol
      */
-    class SubsetSymbol : public UMLSceneEllipse
+    class SubsetSymbol : public UMLSceneEllipseItem
     {
     public:
         explicit SubsetSymbol(UMLViewCanvas* canvas);