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

[Ralf Habacker]

SVN commit 1277945 by habacker:

Renamed UMLSceneRectangle to UMLSceneRectangleItem.

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


--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1277944:1277945
@@ -46,7 +46,7 @@
 typedef Q3CanvasLine UMLSceneLineItem;
 typedef Q3CanvasRectangle UMLSceneRectangle;
 typedef Q3CanvasItem UMLSceneItem;
-typedef Q3CanvasPolygon UMLScenePolygon;
+typedef Q3CanvasPolygon UMLScenePolygonItem;
 typedef Q3CanvasEllipse UMLSceneEllipse;
 typedef Q3CanvasItemList UMLSceneItemList;
 
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.cpp #1277944:1277945
@@ -983,7 +983,7 @@
     case Uml::AssociationType::Generalization:
     case Uml::AssociationType::Realization:
         growList(m_HeadList, 3);
-        m_pClearPoly = new UMLScenePolygon( canvas );
+        m_pClearPoly = new UMLScenePolygonItem( canvas );
         m_pClearPoly -> setVisible( true );
         m_pClearPoly -> setBrush( QBrush( Qt::white ) );
         m_pClearPoly -> setZ( -1 );
@@ -992,7 +992,7 @@
     case Uml::AssociationType::Composition:
     case Uml::AssociationType::Aggregation:
         growList(m_HeadList, 4);
-        m_pClearPoly = new UMLScenePolygon( canvas );
+        m_pClearPoly = new UMLScenePolygonItem( canvas );
         m_pClearPoly -> setVisible( true );
         if( getAssocType() == Uml::AssociationType::Aggregation )
             m_pClearPoly->setBrush( QBrush( Qt::white ) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.h #1277944:1277945
@@ -181,7 +181,7 @@
      */
     QPoint m_ArrowPointA, m_ArrowPointB, m_MidPoint, m_EgdePoint;
 
-    UMLScenePolygon* m_pClearPoly;  ///< A polygon object to blank out any lines we don't want to see.
+    UMLScenePolygonItem* m_pClearPoly;  ///< A polygon object to blank out any lines we don't want to see.
     Circle*       m_pCircle;        ///< The transparent circle required by containment associations.
     SubsetSymbol* m_pSubsetSymbol;  ///< The subset notation required by Child to Category associations.
     QPolygon      m_ParallelLines;  ///< Contains the calculated points for the parallel line on a collaboration message to use.