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

[Ralf Habacker]

SVN commit 1268564 by habacker:

merged in non QGraphicsScene related changes from soc-umbrello branch for ActorWidget

 M  +8 -8      actorwidget.cpp  
 M  +3 -3      actorwidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/actorwidget.cpp #1268563:1268564
@@ -1,4 +1,5 @@
 /***************************************************************************
+ *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -11,9 +12,6 @@
 // own header file
 #include "actorwidget.h"
 
-// system includes
-#include <QtGui/QPainter>
-
 // local includes
 #include "actor.h"
 #include "umlview.h"
@@ -77,6 +75,12 @@
 }
 
 /**
+ * Saves the widget to the "actorwidget" XMI element.
+ * Note: For loading from XMI, the inherited parent method is used.
+ */
+void ActorWidget::saveToXMI( QDomDocument & qDoc, QDomElement & qElement )
+
+/**
  * Overrides method from UMLWidget.
  */
 QSize ActorWidget::calculateSize() 
@@ -90,11 +94,7 @@
     return QSize(width, height);
 }
 
-/**
- * Saves the widget to the "actorwidget" XMI element.
- * Note: For loading from XMI, the inherited parent method is used.
- */
-void ActorWidget::saveToXMI( QDomDocument & qDoc, QDomElement & qElement )
+
 {
     QDomElement actorElement = qDoc.createElement( "actorwidget" );
     UMLWidget::saveToXMI( qDoc, actorElement );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/actorwidget.h #1268563:1268564
@@ -1,4 +1,5 @@
 /***************************************************************************
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -38,16 +39,15 @@
  * @see UMLView
  * Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
  */
-
 class ActorWidget : public UMLWidget
 {
 public:
     ActorWidget(UMLView * view, UMLActor *o);
     virtual ~ActorWidget();
 
-    void draw(QPainter & p, int offsetX, int offsetY);
+    virtual void draw(QPainter & p, int offsetX, int offsetY);
 
-    void saveToXMI( QDomDocument & qDoc, QDomElement & qElement );
+    virtual void saveToXMI( QDomDocument & qDoc, QDomElement & qElement );
 
 protected:
     QSize calculateSize();