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

[Andi Fischer]

SVN commit 1324839 by fischer:

Differences to gsoc-branch reduced.

 M  +2 -2      toolbarstate.cpp  
 M  +1 -1      toolbarstateassociation.cpp  
 M  +6 -3      toolbarstatemessages.cpp  
 M  +1 -1      umlscene.cpp  
 M  +0 -1      widgets/floatingdashlinewidget.h  
 M  +2 -2      widgets/floatingtextwidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstate.cpp #1324838:1324839
@@ -329,7 +329,7 @@
  */
 void ToolBarState::mousePressEmpty()
 {
-    m_pUMLScene->clearSelected();
+    m_pUMLScene->clearSelection();
 }
 
 /**
@@ -378,7 +378,7 @@
  */
 void ToolBarState::mouseDoubleClickEmpty()
 {
-    m_pUMLScene->clearSelected();
+    m_pUMLScene->clearSelection();
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstateassociation.cpp #1324838:1324839
@@ -186,7 +186,7 @@
 
     m_firstWidget = widget;
 
-    m_associationLine = new QGraphicsLineItem;
+    m_associationLine = new QGraphicsLineItem();
     m_pUMLScene->addItem(m_associationLine);
     m_associationLine->setLine(pos.x(), pos.y(), pos.x(), pos.y());
     m_associationLine->setPen(QPen(m_pUMLScene->lineColor(), m_pUMLScene->lineWidth(), Qt::DashLine));
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstatemessages.cpp #1324838:1324839
@@ -192,9 +192,10 @@
 
         m_messageLine = new QGraphicsLineItem();
         m_pUMLScene->addItem(m_messageLine);
-        m_messageLine->setLine(m_pMouseEvent->scenePos().x(), m_pMouseEvent->scenePos().y(), m_pMouseEvent->scenePos().x(), m_pMouseEvent->scenePos().y());
+        qreal x = m_pMouseEvent->scenePos().x();
+        qreal y = m_pMouseEvent->scenePos().y();
+        m_messageLine->setLine(x, y, x, y);
         m_messageLine->setPen(QPen(m_pUMLScene->lineColor(), m_pUMLScene->lineWidth(), Qt::DashLine));
-
         m_messageLine->setVisible(true);
 
         m_pUMLScene->activeView()->viewport()->setMouseTracking(true);
@@ -226,7 +227,9 @@
     else {
         m_messageLine = new QGraphicsLineItem();
         m_pUMLScene->addItem(m_messageLine);
-        m_messageLine->setLine(m_pMouseEvent->scenePos().x(), m_pMouseEvent->scenePos().y(), m_pMouseEvent->scenePos().x(), m_pMouseEvent->scenePos().y());
+        qreal x = m_pMouseEvent->scenePos().x();
+        qreal y = m_pMouseEvent->scenePos().y();
+        m_messageLine->setLine(x, y, x, y);
         m_messageLine->setPen(QPen(m_pUMLScene->lineColor(), m_pUMLScene->lineWidth(), Qt::DashLine));
         m_messageLine->setVisible(true);
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1324838:1324839
@@ -381,7 +381,7 @@
 }
 
 /**
- * Sets the diagram width and height in pixels
+ * Sets the diagram width and height in pixels.
  */
 void UMLScene::setSize(UMLSceneValue width, UMLSceneValue height)
 {
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/floatingdashlinewidget.h #1324838:1324839
@@ -29,7 +29,6 @@
  * @author Thomas GALLINARI <tg8187 at yahoo.fr>
  * Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
  */
-
 class FloatingDashLineWidget : public UMLWidget
 {
     Q_OBJECT
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/floatingtextwidget.h #1324838:1324839
@@ -86,10 +86,10 @@
 
     void draw(QPainter & p, int offsetX, int offsetY);
 
+    virtual void saveToXMI(QDomDocument& qDoc, QDomElement& qElement);
     virtual bool loadFromXMI(QDomElement & qElement);
-    virtual void saveToXMI(QDomDocument & qDoc, QDomElement & qElement);
 
-public slots:
+public Q_SLOTS:
     virtual void slotMenuSelection(QAction* action);
     void setMessageText();