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

[Andi Fischer]

SVN commit 1326345 by fischer:

UMLSceneHoverEvent removed.

 M  +0 -1      umlscene.h  
 M  +3 -3      widgets/associationline.cpp  
 M  +3 -3      widgets/associationline.h  
 M  +3 -3      widgets/associationwidget.cpp  
 M  +3 -3      widgets/associationwidget.h  
 M  +2 -2      widgets/classifierwidget.cpp  
 M  +2 -2      widgets/classifierwidget.h  
 M  +1 -1      widgets/widgethandle.cpp  


--- branches/work/soc-umbrello/umbrello/umlscene.h #1326344:1326345
@@ -67,7 +67,6 @@
 typedef qreal UMLSceneValue;
 
 // event types
-typedef QGraphicsSceneHoverEvent UMLSceneHoverEvent;
 typedef QGraphicsSceneDragDropEvent UMLSceneDragDropEvent;
 typedef QGraphicsSceneDragDropEvent UMLSceneDragEnterEvent;
 typedef QGraphicsSceneDragDropEvent UMLSceneDragMoveEvent;
--- branches/work/soc-umbrello/umbrello/widgets/associationline.cpp #1326344:1326345
@@ -816,7 +816,7 @@
  * Calculates the "to be highlighted" point and segment indicies
  * and updates if necessary.
  */
-void AssociationLine::hoverEnterEvent(UMLSceneHoverEvent *event)
+void AssociationLine::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
     DEBUG(DBG_ASS) << "at " << event->pos();
     int oldPointIndex = m_activePointIndex;
@@ -840,7 +840,7 @@
  * Calculates the "to be highlighted" point and segment indicies
  * and updates if necessary.
  */
-void AssociationLine::hoverMoveEvent(UMLSceneHoverEvent *event)
+void AssociationLine::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
 {
     int oldPointIndex = m_activePointIndex;
     int oldSegmentIndex = m_activeSegmentIndex;
@@ -862,7 +862,7 @@
 /**
  * Reset active indicies and updates.
  */
-void AssociationLine::hoverLeaveEvent(UMLSceneHoverEvent *event)
+void AssociationLine::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
     DEBUG(DBG_ASS) << "at " << event->pos();
     //Q_UNUSED(event);
--- branches/work/soc-umbrello/umbrello/widgets/associationline.h #1326344:1326345
@@ -152,9 +152,9 @@
         void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
         void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
 
-        void hoverEnterEvent(UMLSceneHoverEvent *event);
-        void hoverMoveEvent(UMLSceneHoverEvent *event);
-        void hoverLeaveEvent(UMLSceneHoverEvent *event);
+        void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+        void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
+        void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
 
         void calculateBoundingRect();
 
--- branches/work/soc-umbrello/umbrello/widgets/associationwidget.cpp #1326344:1326345
@@ -1415,17 +1415,17 @@
     m_associationLine->mouseDoubleClickEvent(event);
 }
 
-void AssociationWidget::hoverEnterEvent(UMLSceneHoverEvent *event)
+void AssociationWidget::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
     m_associationLine->hoverEnterEvent(event);
 }
 
-void AssociationWidget::hoverMoveEvent(UMLSceneHoverEvent *event)
+void AssociationWidget::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
 {
     m_associationLine->hoverMoveEvent(event);
 }
 
-void AssociationWidget::hoverLeaveEvent(UMLSceneHoverEvent *event)
+void AssociationWidget::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
     m_associationLine->hoverLeaveEvent(event);
 }
--- branches/work/soc-umbrello/umbrello/widgets/associationwidget.h #1326344:1326345
@@ -186,9 +186,9 @@
     virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
 
-    virtual void hoverEnterEvent(UMLSceneHoverEvent *event);
-    virtual void hoverMoveEvent(UMLSceneHoverEvent *event);
-    virtual void hoverLeaveEvent(UMLSceneHoverEvent *event);
+    virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+    virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
+    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
 
     virtual void umlObjectChanged(UMLObject *old);
 
--- branches/work/soc-umbrello/umbrello/widgets/classifierwidget.cpp #1326344:1326345
@@ -950,7 +950,7 @@
 /**
  * Event handler for hover enter events.
  */
-void ClassifierWidget::hoverEnterEvent(UMLSceneHoverEvent * event)
+void ClassifierWidget::hoverEnterEvent(QGraphicsSceneHoverEvent * event)
 {
     Q_UNUSED(event);
     if (!visualProperty(DrawAsCircle)) {
@@ -965,7 +965,7 @@
 /**
  * Event handler for hover leave events.
  */
-void ClassifierWidget::hoverLeaveEvent(UMLSceneHoverEvent * event)
+void ClassifierWidget::hoverLeaveEvent(QGraphicsSceneHoverEvent * event)
 {
     Q_UNUSED(event);
     if (!visualProperty(DrawAsCircle)) {
--- branches/work/soc-umbrello/umbrello/widgets/classifierwidget.h #1326344:1326345
@@ -92,8 +92,8 @@
     virtual void updateTextItemGroups();
     virtual QVariant attributeChange(WidgetAttributeChange change, const QVariant& oldValue);
 
-    virtual void hoverEnterEvent(UMLSceneHoverEvent * event);
-    virtual void hoverLeaveEvent(UMLSceneHoverEvent * event);
+    virtual void hoverEnterEvent(QGraphicsSceneHoverEvent * event);
+    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent * event);
 
 private Q_SLOTS:
     void slotShowAttributes(bool state);
--- branches/work/soc-umbrello/umbrello/widgets/widgethandle.cpp #1326344:1326345
@@ -399,7 +399,7 @@
 
 /**
  * Sets a proper cursor for this WidgetHandle item based on
- * UMLSceneHoverEvent parameter.
+ * QGraphicsSceneHoverEvent parameter.
  *
  * @note The cursor set is Qt::ArrowCursor if either this handle is
  *       not active or the associated widget is not resizable.