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

[Ralf Habacker]

SVN commit 1273304 by habacker:

Renamed getLineWidth() to lineWidth().

 M  +1 -1      dialogs/umlviewdialog.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/umlwidget.cpp  
 M  +1 -1      widgets/widgetbase.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp #1273303:1273304
@@ -104,7 +104,7 @@
 
     m_diagramProperties->ui_gridSpaceX->setValue( m_pView->getSnapX());
     m_diagramProperties->ui_gridSpaceY->setValue( m_pView->getSnapY());
-    m_diagramProperties->ui_lineWidth->setValue( m_pView->getLineWidth());
+    m_diagramProperties->ui_lineWidth->setValue( m_pView->lineWidth());
     m_diagramProperties->ui_documentation->setText(m_pView->documentation());
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/linepath.cpp #1273303:1273304
@@ -479,7 +479,7 @@
     if(m_pAssociation->umlScene()->getID() != viewID) {
         return;
     }
-    setLineWidth( m_pAssociation->umlScene()->getLineWidth() );
+    setLineWidth( m_pAssociation->umlScene()->lineWidth() );
 }
 
 /**
@@ -573,8 +573,8 @@
 {
     Uml::AssociationType type = getAssocType();
     if( type == Uml::AssociationType::Dependency || type == Uml::AssociationType::Realization || type == Uml::AssociationType::Anchor )
-        return QPen( lineColor(), getLineWidth(), Qt::DashLine );
-    return QPen( lineColor(), getLineWidth() );
+        return QPen( lineColor(), lineWidth(), Qt::DashLine );
+    return QPen( lineColor(), lineWidth() );
 }
 
 /**
@@ -762,7 +762,7 @@
  */
 void LinePath::growList(LineList &list, int by)
 {
-    QPen pen( lineColor(), getLineWidth() );
+    QPen pen( lineColor(), lineWidth() );
     for (int i = 0; i < by; i++) {
         UMLSceneLine * line = new UMLSceneLine( getScene() );
         line -> setZ( 0 );
@@ -816,7 +816,7 @@
         if (!m_pCircle) {
             m_pCircle = new Circle( canvas, 6 );
             m_pCircle->show();
-            m_pCircle->setPen( QPen( lineColor(), getLineWidth() ) );
+            m_pCircle->setPen( QPen( lineColor(), lineWidth() ) );
         }
         break;
     default:
@@ -999,7 +999,7 @@
  * This class doesn't hold this information but is a wrapper
  * method to stop calls to undefined variable like m_pAssociation.
  */
-uint LinePath::getLineWidth()
+uint LinePath::lineWidth()
 {
     if( !m_pAssociation )
         return 0;
@@ -1008,7 +1008,7 @@
         return viewLineWidth;
     else {
         uWarning() << "Ignore wrong LineWidth of " << viewLineWidth
-                   << " in LinePath::getLineWidth";
+                   << " in LinePath::lineWidth";
         return 0;
     }
 }
@@ -1178,7 +1178,7 @@
     switch( getAssocType() ) {
        case Uml::AssociationType::Child2Category:
            m_pSubsetSymbol = new SubsetSymbol(getScene());
-           m_pSubsetSymbol->setPen( QPen( lineColor(), getLineWidth() ) );
+           m_pSubsetSymbol->setPen( QPen( lineColor(), lineWidth() ) );
            updateSubsetSymbol();
            m_pSubsetSymbol->show();
            break;
--- trunk/KDE/kdesdk/umbrello/umbrello/linepath.h #1273303:1273304
@@ -143,7 +143,7 @@
     Uml::AssociationType getAssocType() const;
 
     QColor lineColor();
-    uint getLineWidth();
+    uint lineWidth();
 
     void moveSelected( int pointIndex );
 
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstateassociation.cpp #1273303:1273304
@@ -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->lineColor(), m_pUMLScene->getLineWidth(), Qt::DashLine));
+    m_associationLine->setPen(QPen(m_pUMLScene->lineColor(), m_pUMLScene->lineWidth(), Qt::DashLine));
 
     m_associationLine->setVisible(true);
 
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstatemessages.cpp #1273303:1273304
@@ -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->lineColor(), m_pUMLScene->getLineWidth(), Qt::DashLine));
+        m_messageLine->setPen(QPen(m_pUMLScene->lineColor(), m_pUMLScene->lineWidth(), 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->lineColor(), m_pUMLScene->getLineWidth(), Qt::DashLine));
+        m_messageLine->setPen(QPen(m_pUMLScene->lineColor(), m_pUMLScene->lineWidth(), Qt::DashLine));
 
         m_messageLine->setVisible(true);
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #1273303:1273304
@@ -938,7 +938,7 @@
     canvas()->setAllChanged();
 }
 
-uint UMLView::getLineWidth() const
+uint UMLView::lineWidth() const
 {
     return m_Options.uiState.lineWidth;
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.h #1273303:1273304
@@ -155,7 +155,7 @@
     /**
      * Returns the line width to use.
      */
-    uint getLineWidth() const;
+    uint lineWidth() const;
 
     /**
      * Sets the line width.
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1273303:1273304
@@ -523,7 +523,7 @@
         return;
     }
     if (m_usesDiagramLineWidth) {
-        m_LineWidth = m_scene->getLineWidth();
+        m_LineWidth = m_scene->lineWidth();
     }
     update();
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/widgetbase.cpp #1273303:1273304
@@ -311,7 +311,7 @@
         setLineWidth( lineWidth.toInt() );
         m_usesDiagramLineWidth = false;
     } else if ( m_scene ) {
-        setLineWidth( m_scene->getLineWidth() );
+        setLineWidth( m_scene->lineWidth() );
         m_usesDiagramLineWidth = true;
     }
     QString textColor = qElement.attribute( "textcolor", "none" );