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

[Ralf Habacker]

SVN commit 1273303 by habacker:

Renamed getLineColor() to lineColor().

 M  +1 -1      cmds/widget/cmd_changeLineColor.cpp  
 M  +8 -8      linepath.cpp  
 M  +1 -1      linepath.h  
 M  +1 -1      toolbarstateassociation.cpp  
 M  +2 -2      toolbarstatemessages.cpp  
 M  +1 -1      umlview.cpp  
 M  +1 -1      umlview.h  
 M  +1 -1      widgets/objectwidget.cpp  
 M  +1 -1      widgets/umlwidget.cpp  
 M  +1 -1      widgets/widgetbase.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/cmds/widget/cmd_changeLineColor.cpp #1273302:1273303
@@ -25,7 +25,7 @@
         UMLWidget * widget = view->getFirstMultiSelectedWidget();
         m_view = view;
         m_newColor = col;
-        m_oldColor = widget->getLineColor();
+        m_oldColor = widget->lineColor();
     }*/
 
     CmdChangeLineColor::CmdChangeLineColor(UMLWidget *w, const QColor& col)
--- trunk/KDE/kdesdk/umbrello/umbrello/linepath.cpp #1273302:1273303
@@ -426,7 +426,7 @@
     if(m_pAssociation->umlScene()->getID() != viewID) {
         return;
     }
-    setLineColor( m_pAssociation->umlScene()->getLineColor() );
+    setLineColor( m_pAssociation->umlScene()->lineColor() );
 }
 
 /**
@@ -573,8 +573,8 @@
 {
     Uml::AssociationType type = getAssocType();
     if( type == Uml::AssociationType::Dependency || type == Uml::AssociationType::Realization || type == Uml::AssociationType::Anchor )
-        return QPen( getLineColor(), getLineWidth(), Qt::DashLine );
-    return QPen( getLineColor(), getLineWidth() );
+        return QPen( lineColor(), getLineWidth(), Qt::DashLine );
+    return QPen( lineColor(), getLineWidth() );
 }
 
 /**
@@ -762,7 +762,7 @@
  */
 void LinePath::growList(LineList &list, int by)
 {
-    QPen pen( getLineColor(), getLineWidth() );
+    QPen pen( lineColor(), getLineWidth() );
     for (int i = 0; i < by; i++) {
         UMLSceneLine * line = new UMLSceneLine( getScene() );
         line -> setZ( 0 );
@@ -807,7 +807,7 @@
         if( getAssocType() == Uml::AssociationType::Aggregation )
             m_pClearPoly->setBrush( QBrush( Qt::white ) );
         else
-            m_pClearPoly -> setBrush( QBrush( getLineColor() ) );
+            m_pClearPoly -> setBrush( QBrush( lineColor() ) );
         m_pClearPoly -> setZ( -1 );
         break;
 
@@ -816,7 +816,7 @@
         if (!m_pCircle) {
             m_pCircle = new Circle( canvas, 6 );
             m_pCircle->show();
-            m_pCircle->setPen( QPen( getLineColor(), getLineWidth() ) );
+            m_pCircle->setPen( QPen( lineColor(), getLineWidth() ) );
         }
         break;
     default:
@@ -985,7 +985,7 @@
  * This class doesn't hold this information but is a wrapper
  * method to stop calls to undefined variable like m_pAssociation.
  */
-QColor LinePath::getLineColor()
+QColor LinePath::lineColor()
 {
     if( !m_pAssociation )
         return Qt::black;
@@ -1178,7 +1178,7 @@
     switch( getAssocType() ) {
        case Uml::AssociationType::Child2Category:
            m_pSubsetSymbol = new SubsetSymbol(getScene());
-           m_pSubsetSymbol->setPen( QPen( getLineColor(), getLineWidth() ) );
+           m_pSubsetSymbol->setPen( QPen( lineColor(), getLineWidth() ) );
            updateSubsetSymbol();
            m_pSubsetSymbol->show();
            break;
--- trunk/KDE/kdesdk/umbrello/umbrello/linepath.h #1273302:1273303
@@ -142,7 +142,7 @@
 
     Uml::AssociationType getAssocType() const;
 
-    QColor getLineColor();
+    QColor lineColor();
     uint getLineWidth();
 
     void moveSelected( int pointIndex );
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstateassociation.cpp #1273302:1273303
@@ -188,7 +188,7 @@
 
     m_associationLine = new UMLSceneLine(m_pUMLScene->canvas());
     m_associationLine->setPoints(pos.x(), pos.y(), pos.x(), pos.y());
-    m_associationLine->setPen(QPen(m_pUMLScene->getLineColor(), m_pUMLScene->getLineWidth(), Qt::DashLine));
+    m_associationLine->setPen(QPen(m_pUMLScene->lineColor(), m_pUMLScene->getLineWidth(), Qt::DashLine));
 
     m_associationLine->setVisible(true);
 
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstatemessages.cpp #1273302:1273303
@@ -200,7 +200,7 @@
 
         m_messageLine = new UMLSceneLine(m_pUMLScene->canvas());
         m_messageLine->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y());
-        m_messageLine->setPen(QPen(m_pUMLScene->getLineColor(), m_pUMLScene->getLineWidth(), Qt::DashLine));
+        m_messageLine->setPen(QPen(m_pUMLScene->lineColor(), m_pUMLScene->getLineWidth(), Qt::DashLine));
 
         m_messageLine->setVisible(true);
 
@@ -243,7 +243,7 @@
     else {
         m_messageLine = new UMLSceneLine(m_pUMLScene->canvas());
         m_messageLine->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y());
-        m_messageLine->setPen(QPen(m_pUMLScene->getLineColor(), m_pUMLScene->getLineWidth(), Qt::DashLine));
+        m_messageLine->setPen(QPen(m_pUMLScene->lineColor(), m_pUMLScene->getLineWidth(), Qt::DashLine));
 
         m_messageLine->setVisible(true);
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #1273302:1273303
@@ -926,7 +926,7 @@
     canvas()->setAllChanged();
 }
 
-QColor UMLView::getLineColor() const
+QColor UMLView::lineColor() const
 {
     return m_Options.uiState.lineColor;
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.h #1273302:1273303
@@ -143,7 +143,7 @@
     /**
      * Returns the line color to use.
      */
-    QColor getLineColor() const;
+    QColor lineColor() const;
 
     /**
      * Sets the line color.
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.cpp #1273302:1273303
@@ -205,7 +205,7 @@
 void ObjectWidget::slotColorChanged(Uml::IDType /*viewID*/)
 {
     UMLWidget::setFillColor( m_scene->fillColor() );
-    UMLWidget::setLineColor( m_scene->getLineColor() );
+    UMLWidget::setLineColor( m_scene->lineColor() );
 
     if( m_pLine)
         m_pLine->setPen( QPen( UMLWidget::lineColor(), UMLWidget::lineWidth(), Qt::DashLine ) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1273302:1273303
@@ -503,7 +503,7 @@
         m_FillColor = m_scene->fillColor();
     }
     if (m_usesDiagramLineColor) {
-        m_LineColor = m_scene->getLineColor();
+        m_LineColor = m_scene->lineColor();
     }
     if (m_usesDiagramUseFillColor) {
         m_useFillColor = m_scene->useFillColor();
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/widgetbase.cpp #1273302:1273303
@@ -303,7 +303,7 @@
         setLineColor( QColor(lineColor) );
         m_usesDiagramLineColor = false;
     } else if (m_Type != WidgetBase::wt_Box && m_scene != NULL) {
-        setLineColor( m_scene->getLineColor() );
+        setLineColor( m_scene->lineColor() );
         m_usesDiagramLineColor = true;
     }
     QString lineWidth = qElement.attribute( "linewidth", "none" );