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

[Andi Fischer]

SVN commit 1318428 by fischer:

Diff to trunk reduced.

 M  +3 -3      clipboard/umldragdata.cpp  
 M  +1 -1      toolbarstateassociation.cpp  
 M  +2 -2      toolbarstateother.cpp  
 M  +1 -1      umlscene.cpp  
 M  +1 -1      umlview.cpp  
 M  +0 -1      widgets/associationwidget.cpp  
 M  +1 -0      widgets/umlwidget.h  
 M  +2 -2      widgets/widget_factory.cpp  
 M  +1 -1      widgets/widgetbase.h  


--- branches/work/soc-umbrello/umbrello/clipboard/umldragdata.cpp #1318427:1318428
@@ -29,9 +29,9 @@
 #include "model_utils.h"
 
 // qt includes
-#include <QtCore/QTextStream>
-#include <QtXml/QDomDocument>
-#include <QtGui/QPixmap>
+#include <QDomDocument>
+#include <QPixmap>
+#include <QTextStream>
 
 /**
  *  Constructor.
--- branches/work/soc-umbrello/umbrello/toolbarstateassociation.cpp #1318427:1318428
@@ -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>                  *
  ***************************************************************************/
 
--- branches/work/soc-umbrello/umbrello/toolbarstateother.cpp #1318427:1318428
@@ -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>                  *
  ***************************************************************************/
 
@@ -141,7 +141,7 @@
             break;
 
         case WorkToolBar::tbb_Text:
-            umlWidget = new FloatingTextWidget(TextRole::Floating);
+            umlWidget = new FloatingTextWidget(Uml::TextRole::Floating);
             break;
 
         // Activity buttons
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1318427:1318428
@@ -4124,7 +4124,7 @@
             addItem(assoc);
             if (!assoc->loadFromXMI(assocElement)) {
                 uError() << "could not loadFromXMI association widget:"
-                         << assoc << ", bad XMI file? Deleting from umlview.";
+                         << assoc << ", bad XMI file? Deleting from UMLScene.";
                 delete assoc;
                 /* return false;
                    Returning false here is a little harsh when the
--- branches/work/soc-umbrello/umbrello/umlview.cpp #1318427:1318428
@@ -13,9 +13,9 @@
 
 #include "debug_utils.h"
 #include "docwindow.h"
-#include "umlscene.h"
 #include "uml.h"
 #include "umldoc.h"
+#include "umlscene.h"
 #include "worktoolbar.h"
 
 #include <QMouseEvent>
--- branches/work/soc-umbrello/umbrello/widgets/associationwidget.cpp #1318427:1318428
@@ -1163,7 +1163,6 @@
     m_associationLine->paint(painter, option, widget);
 }
 
-
 /**
  * Handles the selection from the popup menu.
  */
--- branches/work/soc-umbrello/umbrello/widgets/umlwidget.h #1318427:1318428
@@ -110,6 +110,7 @@
     bool isResizable() const {
         return m_resizable;
     }
+
     /**
      * Shorthand for QRectF(QPointF(0, 0), size()); The rect() area is
      * where all the widget painting should go.
--- branches/work/soc-umbrello/umbrello/widgets/widget_factory.cpp #1318427:1318428
@@ -64,7 +64,7 @@
  */
 UMLWidget *createWidget(UMLScene *scene, UMLObject *o)
 {
-    QPointF pos = scene->pos();
+    UMLScenePoint pos = scene->pos();
     qreal y = pos.y();
     Uml::DiagramType diagramType = scene->type();
     UMLObject::ObjectType type = o->baseType();
@@ -207,7 +207,7 @@
     } else if (tag == "messagewidget") {
         widget = new MessageWidget(Uml::sequence_message_asynchronous, Uml::id_Reserved);
     } else if (tag == "forkjoin") {
-        widget = new ForkJoinWidget(Qt::Horizontal, Uml::id_Reserved);
+        widget = new ForkJoinWidget(Qt::Vertical, Uml::id_Reserved);
     } else if (tag == "preconditionwidget") {
         widget = new PreconditionWidget(NULL, Uml::id_Reserved);
     } else if (tag == "combinedFragmentwidget") {
--- branches/work/soc-umbrello/umbrello/widgets/widgetbase.h #1318427:1318428
@@ -32,7 +32,7 @@
 #include <QPainter>
 #include <QPen>
 
-// Forward delcarations
+// forward delcarations
 class IDChangeLog;
 class ListPopupMenu;
 class UMLDoc;