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

[Ralf Habacker]

SVN commit 1273967 by habacker:

Removed updateComponentSize() in constructor.

Most widgets do not use it and it give problems during loadFromXMI(),
which is stated in related commment.

 M  +0 -1      activitywidget.cpp  
 M  +0 -1      artifactwidget.cpp  
 M  +0 -2      categorywidget.cpp  
 M  +0 -1      combinedfragmentwidget.cpp  
 M  +0 -5      componentwidget.cpp  
 M  +0 -2      entitywidget.cpp  
 M  +0 -2      enumwidget.cpp  
 M  +0 -1      floatingdashlinewidget.cpp  
 M  +0 -4      floatingtextwidget.cpp  
 M  +0 -1      forkjoinwidget.cpp  
 M  +0 -2      nodewidget.cpp  
 M  +0 -1      objectnodewidget.cpp  
 M  +0 -3      objectwidget.cpp  
 M  +0 -3      packagewidget.cpp  
 M  +0 -1      preconditionwidget.cpp  
 M  +0 -1      regionwidget.cpp  
 M  +0 -1      signalwidget.cpp  
 M  +0 -1      statewidget.cpp  
 M  +0 -2      usecasewidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/activitywidget.cpp #1273966:1273967
@@ -37,7 +37,6 @@
   : UMLWidget(scene, WidgetBase::wt_Activity, id),
     m_activityType(activityType)
 {
-    updateComponentSize();
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/artifactwidget.cpp #1273966:1273967
@@ -26,7 +26,6 @@
   : UMLWidget(scene, WidgetBase::wt_Artifact, a)
 {
     setSize(100, 30);
-    updateComponentSize();
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/categorywidget.cpp #1273966:1273967
@@ -23,8 +23,6 @@
 CategoryWidget::CategoryWidget(UMLScene * scene, UMLCategory *o)
   : UMLWidget(scene, WidgetBase::wt_Category, o)
 {
-    //updateComponentSize();  Doing this during loadFromXMI() gives futile updates.
-    //                  Instead, it is done afterwards by UMLWidget::activate()
 }
 
 CategoryWidget::~CategoryWidget()
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/combinedfragmentwidget.cpp #1273966:1273967
@@ -32,7 +32,6 @@
   : UMLWidget(scene, WidgetBase::wt_CombinedFragment, id)
 {
     setCombinedFragmentType( combinedfragmentType );
-    updateComponentSize();
 }
 
 CombinedFragmentWidget::~CombinedFragmentWidget()
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/componentwidget.cpp #1273966:1273967
@@ -32,12 +32,7 @@
         const Settings::OptionState& ops = m_scene->optionState();
         m_showStereotype = ops.classState.showStereoType;
     }
-    //maybe loading and this may not be set.
-    if (m_pObject) {
-        updateComponentSize();
-        update();
     }
-}
 
 /**
  * Destructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/entitywidget.cpp #1273966:1273967
@@ -43,8 +43,6 @@
         //check to see if correct
         //const Settings::OptionState& ops = m_scene->getOptionState();
     }
-    if (! UMLApp::app()->document()->loading())
-        updateComponentSize();
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/enumwidget.cpp #1273966:1273967
@@ -45,8 +45,6 @@
         // For completeness only. Not supposed to happen.
         m_showPackage = false;
     }
-    if (! UMLApp::app()->document()->loading())
-        updateComponentSize();
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/floatingdashlinewidget.cpp #1273966:1273967
@@ -28,7 +28,6 @@
 {
     m_resizable = false;
     m_Text = "";
-    updateComponentSize();
 }
 
 FloatingDashLineWidget::~FloatingDashLineWidget()
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/floatingtextwidget.cpp #1273966:1273967
@@ -56,12 +56,8 @@
 {
     m_Text = text;
     UMLWidget::m_resizable = false;
-    if ( ! UMLApp::app()->document()->loading() ) {
-        updateComponentSize();
         setZ(10); //make sure always on top.
-        update();
     }
-}
 
 /**
  * Destructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/forkjoinwidget.cpp #1273966:1273967
@@ -27,7 +27,6 @@
   : BoxWidget(scene, id, WidgetBase::wt_ForkJoin),
     m_drawVertical(drawVertical)
 {
-    UMLWidget::updateComponentSize();
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/nodewidget.cpp #1273966:1273967
@@ -27,8 +27,6 @@
 {
     setSize(100, 30);
     setZ(m_origZ = 1);  // above box but below UMLWidget because may embed widgets
-    if (n && !UMLApp::app()->document()->loading())
-        updateComponentSize();
 }
 
 NodeWidget::~NodeWidget()
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectnodewidget.cpp #1273966:1273967
@@ -38,7 +38,6 @@
 {
     setObjectNodeType( objectNodeType );
     setState("");
-    updateComponentSize();
 }
 
 ObjectNodeWidget::~ObjectNodeWidget()
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.cpp #1273966:1273967
@@ -42,9 +42,6 @@
     init();
     if( lid != Uml::id_None )
         m_nLocalID = lid;
-    //updateComponentSize();
-    //                  Doing this during loadFromXMI() gives futile updates.
-    //                  Instead, it is done afterwards by UMLWidget::activate()
 }
 
 void ObjectWidget::init()
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/packagewidget.cpp #1273966:1273967
@@ -33,9 +33,6 @@
         const Settings::OptionState& ops = m_scene->optionState();
         m_showStereotype = ops.classState.showStereoType;
     }
-    //maybe loading and this may not be set.
-    if (m_pObject && !UMLApp::app()->document()->loading())
-        updateComponentSize();
 }
 
 PackageWidget::~PackageWidget()
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/preconditionwidget.cpp #1273966:1273967
@@ -37,7 +37,6 @@
     int y = getY();
     m_nY = y;
     //updateResizability();
-    updateComponentSize();
    // calculateWidget();
     y = y < getMinY() ? getMinY() : y;
     y = y > getMaxY() ? getMaxY() : y;
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/regionwidget.cpp #1273966:1273967
@@ -31,7 +31,6 @@
 RegionWidget::RegionWidget(UMLScene * scene, Uml::IDType id)
   : UMLWidget(scene, WidgetBase::wt_Region, id)
 {
-    updateComponentSize();
 }
 
 RegionWidget::~RegionWidget() {}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/signalwidget.cpp #1273966:1273967
@@ -44,7 +44,6 @@
   : UMLWidget(scene, WidgetBase::wt_Signal, id)
 {
     m_signalType = signalType;
-    updateComponentSize();
     m_pName = NULL;
     if (signalType == SignalWidget::Time) {
         m_pName = new FloatingTextWidget(scene, Uml::TextRole::Floating,"");
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/statewidget.cpp #1273966:1273967
@@ -41,7 +41,6 @@
 {
     m_stateType = stateType;
     m_Text = "State";
-    updateComponentSize();
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/usecasewidget.cpp #1273966:1273967
@@ -23,8 +23,6 @@
 UseCaseWidget::UseCaseWidget(UMLScene * scene, UMLUseCase *o)
   : UMLWidget(scene, WidgetBase::wt_UseCase, o)
 {
-    //updateComponentSize();  Doing this during loadFromXMI() gives futile updates.
-    //                  Instead, it is done afterwards by UMLWidget::activate()
 }
 
 /**