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

[Ralf Habacker]

SVN commit 1268461 by habacker:

merged in non QGraphicsScene related changes from soc-umbrello branch

 M  +3 -14     entitywidget.cpp  
 M  +8 -7      entitywidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/entitywidget.cpp #1268460:1268461
@@ -40,7 +40,7 @@
 }
 
 /**
- * Standard deconstructor.
+ * Destructor.
  */
 EntityWidget::~EntityWidget()
 {
@@ -142,17 +142,6 @@
 }
 
 /**
- * Loads from an "entitywidget" XMI element.
- */
-bool EntityWidget::loadFromXMI( QDomElement & qElement )
-{
-    if ( !UMLWidget::loadFromXMI(qElement) ) {
-        return false;
-    }
-    return true;
-}
-
-/**
  * Saves to the "entitywidget" XMI element.
  */
 void EntityWidget::saveToXMI( QDomDocument& qDoc, QDomElement& qElement )
@@ -163,8 +152,8 @@
 }
 
 /**
- * Will be called when a menu selection has been made from the
- * popup menu.
+ * Will be called when a menu selection has been made from the popup
+ * menu.
  *
  * @param action       The action that has been selected.
  */
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/entitywidget.h #1268460:1268461
@@ -29,19 +29,20 @@
  */
 class EntityWidget : public UMLWidget
 {
+    Q_OBJECT
 public:
-    EntityWidget(UMLView* view, UMLObject* o);
-    ~EntityWidget();
+    explicit EntityWidget(UMLView* view, UMLObject* o);
+    virtual ~EntityWidget();
 
     void init();
 
-    void draw(QPainter& p, int offsetX, int offsetY);
+    virtual void draw(QPainter& p, int offsetX, int offsetY);
 
-    bool loadFromXMI(QDomElement& qElement);
-    void saveToXMI(QDomDocument& qDoc, QDomElement& qElement);
+    // UMLWidget::loadFromXMI is used to load this widget.
+    virtual void saveToXMI(QDomDocument& qDoc, QDomElement& qElement);
 
-public slots:
-    void slotMenuSelection(QAction* action);
+public Q_SLOTS:
+    virtual void slotMenuSelection(QAction* action);
 
 protected:
     QSize calculateSize();