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

[Ralf Habacker]

SVN commit 1277947 by habacker:

Renamed UMLSceneRectangle to UMLSceneRectItem.

 M  +1 -1      umlscene.h  
 M  +3 -3      widgets/associationline.cpp  
 M  +1 -1      widgets/associationline.h  
 M  +1 -1      widgets/associationwidget.h  
 M  +4 -4      widgets/umlwidget.cpp  
 M  +3 -3      widgets/umlwidget.h  
 M  +3 -3      widgets/widget_utils.cpp  
 M  +1 -1      widgets/widget_utils.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1277946:1277947
@@ -44,7 +44,7 @@
 //typedef QDragDropEvent UMLSceneDragDropEvent;
 
 typedef Q3CanvasLine UMLSceneLineItem;
-typedef Q3CanvasRectangle UMLSceneRectangle;
+typedef Q3CanvasRectangle UMLSceneRectItem;
 typedef Q3CanvasItem UMLSceneItem;
 typedef Q3CanvasPolygon UMLScenePolygonItem;
 typedef Q3CanvasEllipse UMLSceneEllipseItem;
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.cpp #1277946:1277947
@@ -835,7 +835,7 @@
     }
     if( (int)m_RectList.count() + 1 != lineCount )
         setupSelected();
-    UMLSceneRectangle * rect = 0;
+    UMLSceneRectItem * rect = 0;
     UMLSceneLineItem * line = 0;
     if( pointIndex == lineCount || lineCount == 1) {
         line = m_LineList.last();
@@ -865,13 +865,13 @@
 
     Q_FOREACH( line, m_LineList ) {
         QPoint sp = line -> startPoint();
-        UMLSceneRectangle *rect = Widget_Utils::decoratePoint(sp);
+        UMLSceneRectItem *rect = Widget_Utils::decoratePoint(sp);
         m_RectList.append( rect );
     }
     //special case for last point
     line = m_LineList.last();
     QPoint p = line -> endPoint();
-    UMLSceneRectangle *rect = Widget_Utils::decoratePoint(p);
+    UMLSceneRectItem *rect = Widget_Utils::decoratePoint(p);
     m_RectList.append( rect );
     update();
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationline.h #1277946:1277947
@@ -39,7 +39,7 @@
 public:
     // typedefs
     typedef QList<UMLSceneLineItem*> LineList;
-    typedef QList<UMLSceneRectangle*> RectList;
+    typedef QList<UMLSceneRectItem*> RectList;
 
     AssociationLine();
     ~AssociationLine();
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationwidget.h #1277946:1277947
@@ -416,7 +416,7 @@
     int         m_nLinePathSegmentIndex; ///< anchor for m_pAssocClassLine
     UMLSceneLineItem *m_pAssocClassLine;  ///< used for connecting assoc. class
     /// selection adornment for the endpoints of the assoc. class connecting line
-    UMLSceneRectangle *m_pAssocClassLineSel0, *m_pAssocClassLineSel1;
+    UMLSceneRectItem *m_pAssocClassLineSel0, *m_pAssocClassLineSel1;
 
     ClassifierWidget *m_pAssocClassWidget;  ///< used if we have an assoc. class
 
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1277946:1277947
@@ -54,7 +54,7 @@
  */
 UMLWidget::UMLWidget(UMLScene * scene, WidgetType type, UMLObject * o, UMLWidgetController *widgetController)
   : WidgetBase(scene, type),
-    UMLSceneRectangle(scene->canvas())
+    UMLSceneRectItem(scene->canvas())
 {
     if (widgetController) {
         m_widgetController = widgetController;
@@ -79,7 +79,7 @@
  */
 UMLWidget::UMLWidget(UMLScene *scene, WidgetType type, Uml::IDType id, UMLWidgetController *widgetController)
   : WidgetBase(scene, type),
-    UMLSceneRectangle(scene->canvas())
+    UMLSceneRectItem(scene->canvas())
 {
     if (widgetController) {
         m_widgetController = widgetController;
@@ -127,7 +127,7 @@
     m_showStereotype = other.m_showStereotype;
     setX(other.getX());
     setY(other.getY());
-    UMLSceneRectangle::setSize(other.width(), other.height());
+    UMLSceneRectItem::setSize(other.width(), other.height());
 
     // assign volatile (non-saved) members
     m_selected = other.m_selected;
@@ -1225,7 +1225,7 @@
             height = (numY + 1) * m_scene->getSnapY();
     }
 
-    UMLSceneRectangle::setSize(width, height);
+    UMLSceneRectItem::setSize(width, height);
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.h #1277946:1277947
@@ -39,7 +39,7 @@
  * @author  Paul Hensgen <phensgen at techie.com>
  * Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
  */
-class UMLWidget : public WidgetBase, public UMLSceneRectangle
+class UMLWidget : public WidgetBase, public UMLSceneRectItem
 {
     Q_OBJECT
 public:
@@ -157,14 +157,14 @@
      * Returns the height of widget.
      */
     int getHeight() const {
-        return UMLSceneRectangle::height();
+        return UMLSceneRectItem::height();
     }
 
     /**
      * Returns the width of the widget.
      */
     int getWidth() const {
-        return UMLSceneRectangle::width();
+        return UMLSceneRectItem::width();
     }
 
     void setSize(int width,int height);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/widget_utils.cpp #1277946:1277947
@@ -49,12 +49,12 @@
     return NULL;
 }
 
-UMLSceneRectangle *decoratePoint(const QPoint& p)
+UMLSceneRectItem *decoratePoint(const QPoint& p)
 {
     const int SIZE = 4;
     UMLView *currentView = UMLApp::app()->currentView();
-    UMLSceneRectangle *rect;
-    rect = new UMLSceneRectangle(p.x() - SIZE / 2,
+    UMLSceneRectItem *rect;
+    rect = new UMLSceneRectItem(p.x() - SIZE / 2,
                                  p.y() - SIZE / 2,
                                  SIZE, SIZE, currentView->canvas());
     rect->setBrush( QBrush(Qt::blue) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/widget_utils.h #1277946:1277947
@@ -42,7 +42,7 @@
  * @param p   the base point
  * @return    the decoration point
  */
-UMLSceneRectangle *decoratePoint(const QPoint& p);
+UMLSceneRectItem *decoratePoint(const QPoint& p);
 
 }