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

[Andi Fischer]

SVN commit 1288512 by fischer:

Differences to soc-branch reduced.

 M  +5 -5      toolbarstate.cpp  
 M  +4 -4      toolbarstate.h  
 M  +1 -1      widgets/statewidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstate.cpp #1288511:1288512
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2004-2011                                               *
+ *   copyright (C) 2004-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -476,14 +476,14 @@
  * @return The MessageWidget at the specified position, or null if there is none.
  * @todo Better handling for messages at the same point
  */
-MessageWidget* ToolBarState::getMessageAt(const QPoint& pos)
+MessageWidget* ToolBarState::getMessageAt(const UMLScenePoint& pos)
 {
     foreach (  MessageWidget* message, m_pUMLScene->messageList() ) {
         if (message->isVisible() && message->onWidget(pos)) {
             return message;
         }
+
     }
-
     return 0;
 }
 
@@ -495,7 +495,7 @@
  * @return The AssociationWidget at the specified position, or null if there is none.
  * @todo Better handling for associations at the same point
  */
-AssociationWidget* ToolBarState::getAssociationAt(const QPoint& pos)
+AssociationWidget* ToolBarState::getAssociationAt(const UMLScenePoint& pos)
 {
     foreach ( AssociationWidget* association, m_pUMLScene->associationList() ) {
         if (association->onAssociation(pos)) {
@@ -513,7 +513,7 @@
  * @param pos The position to get the floatingLine.
  * @return The MessageWidget at the specified position, or null if there is none.
  */
-FloatingDashLineWidget* ToolBarState::getFloatingLineAt(const QPoint& pos)
+FloatingDashLineWidget* ToolBarState::getFloatingLineAt(const UMLScenePoint& pos)
 {
     FloatingDashLineWidget* floatingline = 0;
 
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstate.h #1288511:1288512
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2004-2009                                               *
+ *   copyright (C) 2004-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -117,9 +117,9 @@
 
     void setMouseEvent(UMLSceneMouseEvent* ome, const QEvent::Type &type);
 
-    AssociationWidget* getAssociationAt(const QPoint& pos);
-    MessageWidget* getMessageAt(const QPoint& pos);
-    FloatingDashLineWidget* getFloatingLineAt(const QPoint& pos);
+    AssociationWidget* getAssociationAt(const UMLScenePoint& pos);
+    MessageWidget* getMessageAt(const UMLScenePoint& pos);
+    FloatingDashLineWidget* getFloatingLineAt(const UMLScenePoint& pos);
 
     UMLScene* m_pUMLScene;  ///< The UMLScene.
 
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/statewidget.cpp #1288511:1288512
@@ -175,7 +175,7 @@
         }
         break;
     default:
-        uWarning() << "Unknown state type:" << QLatin1String(ENUM_NAME(StateWidget, StateType, m_stateType));
+        uWarning() << "Unknown state type: " << stateTypeStr();
         break;
     }
     if (m_selected) {