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

[Andi Fischer]

SVN commit 1240451 by fischer:

Some comments fixed.

 M  +4 -4      association.cpp  
 M  +1 -1      umlcanvasobject.cpp  
 M  +1 -1      umlview.cpp  
 M  +1 -1      umlview.h  
 M  +4 -4      widgets/associationwidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/association.cpp #1240450:1240451
@@ -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.
  */
--- trunk/KDE/kdesdk/umbrello/umbrello/umlcanvasobject.cpp #1240450:1240451
@@ -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)
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #1240450:1240451
@@ -2336,7 +2336,7 @@
         UMLClassifier *dt = static_cast<UMLClassifier*>(type);
         // if the Datatype is a reference (pointer) type
         if (dt->isReference()) {
-            //Uml::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
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.h #1240450:1240451
@@ -400,7 +400,7 @@
     /**
      * Finds an association widget with the given type and widgets.
      *
-     * @param at  The Association_Type of the widget to find.
+     * @param at  The AssociationType of the widget to find.
      * @param pWidgetA Pointer to the UMLWidget of role A.
      * @param pWidgetB Pointer to the UMLWidget of role B.
      *
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationwidget.h #1240450:1240451
@@ -76,7 +76,7 @@
      *
      * @param view      The parent view of this widget.
      * @param WidgetA   Pointer to the role A widget for the association.
-     * @param Type      The Association_Type for this association.
+     * @param Type      The AssociationType for this association.
      * @param WidgetB   Pointer to the role B widget for the association.
      * @param umlobject Pointer to the underlying UMLObject (if applicable.)
      */
@@ -188,7 +188,7 @@
      * Sets the associated widgets.
      *
      * @param widgetA   Pointer the role A widget for the association.
-     * @param assocType The Association_Type for this association.
+     * @param assocType The AssociationType for this association.
      * @param widgetB   Pointer the role B widget for the association.
      */
     bool setWidgets(UMLWidget* widgetA, Uml::AssociationType assocType, UMLWidget* widgetB);
@@ -219,14 +219,14 @@
     /**
      * Gets the association's type.
      *
-     * @return  This AssociationWidget's Association_Type.
+     * @return  This AssociationWidget's AssociationType.
      */
     Uml::AssociationType associationType() const;
 
     /**
      * Sets the association's type.
      *
-     * @param type   The Association_Type to set.
+     * @param type   The AssociationType to set.
      */
     void setAssociationType(Uml::AssociationType type);