[Uml-devel] KDE_3_3_BRANCH: kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Backport of following fix on HEAD:

> CVS commit by okellogg: 
> 
> The previous fix for 86734 was hacky, here's the Real Thing.


  M +1 -3      class.cpp   1.37.2.1
  M +0 -6      umllistviewitem.cpp   1.48.2.2


--- kdesdk/umbrello/umbrello/class.cpp  #1.37:1.37.2.1
@@ -308,6 +308,4 @@ bool UMLClass::loadSpecialized(QDomEleme
                         return false;
                 addAttribute(pAtt);
-                // connect( pAtt,SIGNAL(modified()),this,SIGNAL(modified()));
-                // m_AttsList.append( pAtt );
                 return true;
         } else if (tag == "template") {
@@ -317,5 +315,5 @@ bool UMLClass::loadSpecialized(QDomEleme
                         return false;
                 }
-                m_TemplateList.append(newTemplate);
+                addTemplate(newTemplate);
                 return true;
         } else if (tag == "stereotype") {

--- kdesdk/umbrello/umbrello/umllistviewitem.cpp  #1.48.2.1:1.48.2.2
@@ -473,10 +473,4 @@ void UMLListViewItem::saveToXMI( QDomDoc
                 // not have a model counterpart thus their label is saved here.
                 itemElement.setAttribute( "label", m_Label );
-        } else if (m_pObject->getBaseType() == ot_Stereotype
-                || m_pObject->getBaseType() == ot_Template) {
-                kdDebug() << "FIXME: UMLListViewItem::saveToXMI(): saving local label "
-                          << m_Label << " because stereotype/template loading "
-                          << "does not yet generate the appropriate signals" << endl;
-                itemElement.setAttribute( "label", m_Label );
         } else if (m_pObject->getID() == -1) {
                 if (m_Label.isEmpty()) {