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

[Sharan Rao]

SVN commit 684191 by sharan:

some more APIDox fixes #7 


 M  +4 -4      associationwidget.cpp  
 M  +2 -2      assocrules.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/associationwidget.cpp #684190:684191
@@ -659,7 +659,7 @@
 }
 
 /** This function calculates which role should be set for the m_pName FloatingTextWidget */
-Uml::Text_Role AssociationWidget::CalculateNameType(Text_Role defaultRole) {
+Uml::Text_Role AssociationWidget::CalculateNameType(Uml::Text_Role defaultRole) {
 
     Text_Role result = defaultRole;
     if( m_pView -> getType() == dt_Collaboration ) {
@@ -1828,7 +1828,7 @@
     return distance;
 }
 
-QPoint AssociationWidget::calculateTextPosition(Text_Role role) {
+QPoint AssociationWidget::calculateTextPosition(Uml::Text_Role role) {
     const int SPACE = 2;
     QPoint p(-1, -1), q(-1, -1);
 
@@ -2099,7 +2099,7 @@
     }
 }
 
-void AssociationWidget::setTextPosition(Text_Role role) {
+void AssociationWidget::setTextPosition(Uml::Text_Role role) {
     bool startMove = false;
     if( m_role[A].m_pMulti && m_role[A].m_pMulti->getStartMove() )
         startMove = true;
@@ -2136,7 +2136,7 @@
     ft->setY( y );
 }
 
-void AssociationWidget::setTextPositionRelatively(Text_Role role, const QPoint &oldPosition) {
+void AssociationWidget::setTextPositionRelatively(Uml::Text_Role role, const QPoint &oldPosition) {
     bool startMove = false;
     if( m_role[A].m_pMulti && m_role[A].m_pMulti->getStartMove() )
         startMove = true;
--- trunk/KDE/kdesdk/umbrello/umbrello/assocrules.cpp #684190:684191
@@ -263,7 +263,7 @@
     return false;
 }
 
-bool AssocRules::allowMultiplicity( Uml::Association_Type assocType, Widget_Type widgetType ) {
+bool AssocRules::allowMultiplicity( Uml::Association_Type assocType, Uml::Widget_Type widgetType ) {
     for( int i = 0; i < m_nNumRules; i++ )
         if( assocType == m_AssocRules[ i ].assoc_type )
             if( widgetType == m_AssocRules[ i ].widgetA_type || widgetType == m_AssocRules[ i ].widgetB_type )
@@ -271,7 +271,7 @@
     return false;
 }
 
-bool AssocRules::allowSelf( Uml::Association_Type assocType, Widget_Type widgetType ) {
+bool AssocRules::allowSelf( Uml::Association_Type assocType, Uml::Widget_Type widgetType ) {
     for( int i = 0; i < m_nNumRules; i++ )
         if( assocType == m_AssocRules[ i ].assoc_type )
             if( widgetType == m_AssocRules[ i ].widgetA_type || widgetType == m_AssocRules[ i ].widgetB_type )