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

[Ralf Habacker]

SVN commit 1268448 by habacker:

reduced differences between trunk and soc-umbrello branch

A related patch will be applied to soc-umbrello branch.

 MM +2 -9      boxwidget.h  
 MM +1 -0      widgetbase.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/boxwidget.h #1268447:1268448
@@ -11,15 +11,9 @@
 #ifndef BOXWIDGET_H
 #define BOXWIDGET_H
 
-//qt includes
-#include <QtGui/QPainter>
-
 //app includes
 #include "umlwidget.h"
 
-// fwd decl.
-class UMLView;
-
 /**
  * Displays a rectangular box.
  * These widgets are diagram specific.  They will still need a unique id
@@ -33,7 +27,6 @@
 class BoxWidget : public UMLWidget
 {
 public:
-
     /**
      * Constructs a BoxWidget.
      *
@@ -50,13 +43,13 @@
     /**
      * Draws a rectangle.
      */
-    void draw(QPainter & p, int offsetX, int offsetY);
+    virtual void draw(QPainter & p, int offsetX, int offsetY);
 
     /**
      * Saves the widget to the "boxwidget" XMI element.
      * Note: For loading from XMI, the inherited parent method is used.
      */
-    void saveToXMI(QDomDocument& qDoc, QDomElement& qElement);
+    virtual void saveToXMI(QDomDocument& qDoc, QDomElement& qElement);
 };
 
 #endif
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/widgetbase.h #1268447:1268448
@@ -15,6 +15,7 @@
 
 #include <QtCore/QObject>
 #include <QtGui/QColor>
+#include <QtGui/QPainter>
 #include <QtXml/QDomDocument>
 
 // forward declarations