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

[Andi Fischer]

SVN commit 1285798 by fischer:

Small changes according to the coding guide lines.

 M  +6 -4      associationwidget.cpp  
 M  +3 -4      associationwidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationwidget.cpp #1285797:1285798
@@ -718,7 +718,7 @@
 
     if( m_pName != NULL ) {
         m_pName->setLink(this);
-        m_pName->setTextRole( CalculateNameType(TextRole::Name) );
+        m_pName->setTextRole( calculateNameType(TextRole::Name) );
 
         if ( FloatingTextWidget::isTextValid(m_pName->text()) ) {
             m_pName->show();
@@ -883,7 +883,7 @@
             return;
 
         newLabel = true;
-        m_pName = new FloatingTextWidget(m_scene, CalculateNameType(Uml::TextRole::Name), strName);
+        m_pName = new FloatingTextWidget(m_scene, calculateNameType(Uml::TextRole::Name), strName);
         m_pName->setLink(this);
     } else {
         m_pName->setText(strName);
@@ -1156,8 +1156,10 @@
     return result;
 }
 
-/** This function calculates which role should be set for the m_pName FloatingTextWidget */
-Uml::TextRole AssociationWidget::CalculateNameType(Uml::TextRole defaultRole)
+/**
+ * This function calculates which role should be set for the m_pName FloatingTextWidget.
+ */
+Uml::TextRole AssociationWidget::calculateNameType(Uml::TextRole defaultRole)
 {
     TextRole result = defaultRole;
     if( m_scene->type() == DiagramType::Collaboration ) {
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationwidget.h #1285797:1285798
@@ -221,11 +221,10 @@
 
     void clipSize();
 
-    void saveToXMI( QDomDocument & qDoc, QDomElement & qElement );
-    bool loadFromXMI( QDomElement & qElement );
-
     bool loadFromXMI( QDomElement & qElement, const UMLWidgetList& widgets,
                       const MessageWidgetList* pMessages = NULL);
+    virtual bool loadFromXMI(QDomElement & qElement);
+    virtual void saveToXMI(QDomDocument & qDoc, QDomElement & qElement);
 
     void cleanup();
 
@@ -249,7 +248,7 @@
 
     void moveEvent(QMoveEvent *me);
 
-    Uml::TextRole CalculateNameType(Uml::TextRole defaultRoleType);
+    Uml::TextRole calculateNameType(Uml::TextRole defaultRoleType);
 
     bool isPointInsideBoundaries(int PosX, int PosY, QPoint & SPoint,
                                  uint & StartSegmentIndex, uint & EndSegmentIndex);