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

[Ralf Habacker]

SVN commit 1274509 by habacker:

Use default implementation of constrain - it does the same.

 M  +2 -6      activitywidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/activitywidget.cpp #1274508:1274509
@@ -324,11 +324,7 @@
 void ActivityWidget::constrain(int& width, int& height)
 {
     if (m_activityType == Normal || m_activityType == Invok || m_activityType == Param) {
-        QSize minSize = calculateSize();
-        if (width < minSize.width())
-            width = minSize.width();
-        if (height < minSize.height())
-            height = minSize.height();
+        UMLWidget::constrain(width, height);
         return;
     }
     if (width > height)
@@ -384,7 +380,7 @@
 /**
  * Overrides method from UMLWidget
  */
-QSize ActivityWidget::calculateSize()
+UMLSceneSize ActivityWidget::minimumSize()
 {
     int width, height;
     if ( m_activityType == Normal || m_activityType == Invok || m_activityType == Param ) {