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

[Gopala Krishna A]

SVN commit 942450 by gopala:

Merged changes from revision 941971.
Original message: KUrl::path() -> KUrl::toLocalFile() - fixes
some qt3support



 M  +2 -2      controller/umlwidgetcontroller.cpp  
 M  +2 -2      toolbarstate.cpp  


--- branches/work/umbrello-gv/umbrello/controller/umlwidgetcontroller.cpp #942449:942450
@@ -270,11 +270,11 @@
             //Cancel move/edit
             QMouseEvent move(QMouseEvent::MouseMove,
                              QPoint(m_oldX + m_pressOffsetX, m_oldY + m_pressOffsetY),
-                             Qt::LeftButton, Qt::NoButton);
+                             Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
             mouseMoveEvent(&move);
             QMouseEvent release(QMouseEvent::MouseButtonRelease,
                                 QPoint(m_oldX + m_pressOffsetX, m_oldY + m_pressOffsetY),
-                                Qt::LeftButton, Qt::NoButton);
+                                Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
             mouseReleaseEvent(&release);
         }
     }
--- branches/work/umbrello-gv/umbrello/toolbarstate.cpp #942449:942450
@@ -237,7 +237,7 @@
 }
 
 void ToolBarState::changeTool() {
-    if (m_pMouseEvent->state() == Qt::RightButton) {
+    if (m_pMouseEvent->buttons() == Qt::RightButton) {
         UMLApp::app()->getWorkToolBar()->setDefaultTool();
     }
 }
@@ -246,7 +246,7 @@
     if (m_pMouseEvent) delete m_pMouseEvent;
 
     m_pMouseEvent = new QMouseEvent(type, m_pUMLView->inverseWorldMatrix().map(ome->pos()),
-                                    ome->button(),ome->state());
+                                    ome->button(),ome->buttons(),ome->modifiers());
 }
 
 MessageWidget* ToolBarState::getMessageAt(const QPoint& pos) {