[Uml-devel] branches/work/soc-umbrello/umbrello

[Andi Fischer]

SVN commit 1240452 by fischer:

Some comments fixed.

 M  +4 -4      association.cpp  
 M  +1 -1      umlcanvasobject.cpp  
 M  +1 -1      umlscene.cpp  


--- branches/work/soc-umbrello/umbrello/association.cpp #1240451:1240452
@@ -95,8 +95,8 @@
 }
 
 /**
- * Returns the Association_Type of the UMLAssociation.
- * @return  The Association_Type of the UMLAssociation.
+ * Returns the AssociationType of the UMLAssociation.
+ * @return  The AssociationType of the UMLAssociation.
  */
 Uml::AssociationType UMLAssociation::getAssocType() const
 {
@@ -582,7 +582,7 @@
 
 /**
  * Sets the assocType of the UMLAssociation.
- * @param assocType The Association_Type of the UMLAssociation.
+ * @param assocType The AssociationType of the UMLAssociation.
  */
 void UMLAssociation::setAssociationType(Uml::AssociationType assocType)
 {
@@ -682,7 +682,7 @@
 
 /**
  * Common initializations at construction time.
- * @param type      The Association_Type to represent.
+ * @param type      The AssociationType to represent.
  * @param roleAObj  Pointer to the role A UMLObject.
  * @param roleBObj  Pointer to the role B UMLObject.
  */
--- branches/work/soc-umbrello/umbrello/umlcanvasobject.cpp #1240451:1240452
@@ -53,7 +53,7 @@
 /**
  * Return the subset of m_List that matches the given type.
  *
- * @param assocType   The Association_Type to match.
+ * @param assocType   The AssociationType to match.
  * @return   The list of associations that match assocType.
  */
 UMLAssociationList UMLCanvasObject::getSpecificAssocs(Uml::AssociationType assocType)
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1240451:1240452
@@ -2690,7 +2690,7 @@
         UMLClassifier *dt = static_cast<UMLClassifier*>(type);
         // if the Datatype is a reference (pointer) type
         if (dt->isReference()) {
-            //UMLObject::Association_Type assocType = Uml::AssociationType::Composition;
+            //Uml::AssociationType assocType = Uml::AssociationType::Composition;
             UMLClassifier *c = dt->originType();
             UMLWidget *w = c ? findWidget(c->id()) : 0;
             // if the referenced type has a widget representation on this view