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

[Oliver Kellogg]

SVN commit 647912 by okellogg:

UMLView::testOnWidget(): Rename to getWidgetAt.

 M  +1 -1      associationwidget.cpp  
 M  +2 -2      toolbarstate.cpp  
 M  +1 -1      toolbarstatemessages.cpp  
 M  +1 -1      umlview.cpp  
 M  +1 -1      umlview.h  
 M  +1 -1      umlwidget.cpp  
 M  +1 -1      umlwidgetcontroller.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/associationwidget.cpp #647911:647912
@@ -2552,7 +2552,7 @@
 
     // Prevent the moving vertex from disappearing underneath a widget
     // (else there's no way to get it back.)
-    UMLWidget *onW = m_pView->testOnWidget(p);
+    UMLWidget *onW = m_pView->getWidgetAt(p);
     if (onW && onW->getBaseType() != Uml::wt_Box) {  // boxes are transparent
         const int pX = p.x();
         const int pY = p.y();
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/toolbarstate.cpp #647911:647912
@@ -98,7 +98,7 @@
 void ToolBarState::mouseDoubleClick(QMouseEvent* ome) {
     setMouseEvent(ome, QEvent::MouseButtonDblClick);
 
-    UMLWidget* currentWidget = m_pUMLView->testOnWidget(m_pMouseEvent->pos());
+    UMLWidget* currentWidget = m_pUMLView->getWidgetAt(m_pMouseEvent->pos());
     AssociationWidget* currentAssociation = getAssociationAt(m_pMouseEvent->pos());
     if (currentWidget) {
         setCurrentWidget(currentWidget);
@@ -175,7 +175,7 @@
     }
 
     // Check widgets.
-    UMLWidget *widget = m_pUMLView->testOnWidget(m_pMouseEvent->pos());
+    UMLWidget *widget = m_pUMLView->getWidgetAt(m_pMouseEvent->pos());
     if (widget) {
         setCurrentWidget(widget);
         return;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/toolbarstatemessages.cpp #647911:647912
@@ -75,7 +75,7 @@
     //However, the applied patch doesn't seem to be necessary no more, so it was removed
     //The widgets weren't got from UMLView, but from a method in this class similarto the
     //one in UMLView but containing special code to handle the zoom
-    UMLWidget *widget = m_pUMLView->testOnWidget(m_pMouseEvent->pos());
+    UMLWidget *widget = m_pUMLView->getWidgetAt(m_pMouseEvent->pos());
     if (widget) {
         setCurrentWidget(widget);
         return;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlview.cpp #647911:647912
@@ -659,7 +659,7 @@
     return 0;
 }
 
-UMLWidget *UMLView::testOnWidget(QPoint p) {
+UMLWidget *UMLView::getWidgetAt(QPoint p) {
     int relativeSize = 10000;  // start with an arbitrary large number
     UMLWidget *obj, *retObj = NULL;
     UMLWidgetListIt it(m_WidgetList);
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlview.h #647911:647912
@@ -868,7 +868,7 @@
      * Returns NULL if the point is not inside any widget.
      * Does not use or modify the m_pOnWidget member.
      */
-    UMLWidget *testOnWidget(QPoint p);
+    UMLWidget *getWidgetAt(QPoint p);
 
     /**
      * Initialize and announce a newly created widget.
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlwidget.cpp #647911:647912
@@ -706,7 +706,7 @@
     m_bSelected = _select;
 
     const QPoint pos(getX(), getY());
-    UMLWidget *bkgnd = m_pView->testOnWidget(pos);
+    UMLWidget *bkgnd = m_pView->getWidgetAt(pos);
     if (bkgnd && bkgnd != this && _select) {
         kDebug() << "UMLWidget::setSelected: setting Z to "
             << bkgnd->getZ() + 1 << ", SelectState: " << _select << endl;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlwidgetcontroller.cpp #647911:647912
@@ -252,7 +252,7 @@
     }
 
     //TODO Copied from old code. Does it really work as intended?
-    UMLWidget *bkgnd = m_widget->m_pView->testOnWidget(me->pos());
+    UMLWidget *bkgnd = m_widget->m_pView->getWidgetAt(me->pos());
     if (bkgnd) {
         //kDebug() << "UMLWidgetController::mouseReleaseEvent: setting Z to "
         //    << bkgnd->getZ() + 1 << endl;