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

[Oliver Kellogg]

SVN commit 459513 by okellogg:

UMLView::sigLineColorChanged: Remove, use sigColorChanged instead.

 M  +2 -2      linepath.cpp  
 M  +1 -1      linepath.h  
 M  +0 -1      umlview.cpp  
 M  +0 -1      umlview.h  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/linepath.cpp #459512:459513
@@ -83,7 +83,7 @@
     if( getAssocType() == Uml::at_Coll_Message )
         setupParallelLine();
     UMLView * view =  (UMLView *)m_pAssociation -> parent();
-    connect( view, SIGNAL( sigLineColorChanged( Uml::IDType ) ), this, SLOT( slotLineColorChanged( Uml::IDType ) ) );
+    connect( view, SIGNAL( sigColorChanged( Uml::IDType ) ), this, SLOT( slotLineColorChanged( Uml::IDType ) ) );
     connect( view, SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, SLOT( slotLineWidthChanged( Uml::IDType ) ) );
 }
 
@@ -845,7 +845,7 @@
     if( m_pAssociation ) {
         UMLView * view =  (UMLView *)m_pAssociation -> parent();
         if(view) {
-            disconnect( view, SIGNAL( sigLineColorChanged( Uml::IDType ) ), this, SLOT( slotLineColorChanged( Uml::IDType ) ) );
+            disconnect( view, SIGNAL( sigColorChanged( Uml::IDType ) ), this, SLOT( slotLineColorChanged( Uml::IDType ) ) );
             disconnect( view, SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, SLOT( slotLineWidthChanged( Uml::IDType ) ) );
         }
         m_pAssociation = NULL;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/linepath.h #459512:459513
@@ -194,7 +194,7 @@
      * We can't use QCanvasEllipse directly for this because it doesn't
      * use the pen, i.e. QCanvasEllipse only draws filled ellipses.
      */
-class Circle : public QCanvasEllipse {
+    class Circle : public QCanvasEllipse {
     public:
         Circle(QCanvas * canvas, int radius = 0);
         void setRadius(int radius);
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlview.cpp #459512:459513
@@ -885,7 +885,6 @@
 void UMLView::setLineColor(const QColor &color) {
     m_Options.uiState.lineColor = color;
     emit sigColorChanged( getID() );
-    emit sigLineColorChanged( getID() );
     canvas() -> setAllChanged();
 }
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlview.h #459512:459513
@@ -1317,7 +1317,6 @@
     void sigColorChanged( Uml::IDType );
     void sigRemovePopupMenu();
     void sigClearAllSelected();
-    void sigLineColorChanged( Uml::IDType );
     void sigLineWidthChanged( Uml::IDType );
     void sigSnapToGridToggled(bool);
     void sigSnapComponentSizeToGridToggled(bool);