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

[Ralf Habacker]

SVN commit 1286945 by habacker:

Renamed sigColorChanged into sigFillColorChanged which fit more.

 M  +5 -5      umlscene.cpp  
 M  +2 -2      umlscene.h  
 M  +1 -1      widgets/objectwidget.cpp  
 M  +1 -1      widgets/objectwidget.h  
 M  +4 -4      widgets/umlwidget.cpp  
 M  +1 -1      widgets/umlwidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1286944:1286945
@@ -407,7 +407,7 @@
     w->setVisible(true);
     w->setActivated();
     w->setFont(getFont());
-    w->slotColorChanged(getID());
+    w->slotFillColorChanged(getID());
     w->slotTextColorChanged(getID());
     w->slotLineWidthChanged(getID());
     resizeCanvasToItems();
@@ -481,7 +481,7 @@
     newWidget->setVisible(true);
     newWidget->setActivated();
     newWidget->setFont(getFont());
-    newWidget->slotColorChanged(getID());
+    newWidget->slotFillColorChanged(getID());
     newWidget->slotTextColorChanged(getID());
     newWidget->slotLineWidthChanged(getID());
     newWidget->updateComponentSize();
@@ -941,7 +941,7 @@
     m_SelectedList.removeAll(o);
     disconnect(this, SIGNAL(sigRemovePopupMenu()), o, SLOT(slotRemovePopupMenu()));
     disconnect(this, SIGNAL(sigClearAllSelected()), o, SLOT(slotClearAllSelected()));
-    disconnect(this, SIGNAL(sigColorChanged(Uml::IDType)), o, SLOT(slotColorChanged(Uml::IDType)));
+    disconnect(this, SIGNAL(sigFillColorChanged(Uml::IDType)), o, SLOT(slotFillColorChanged(Uml::IDType)));
     disconnect(this, SIGNAL(sigLineColorChanged(Uml::IDType)), o, SLOT(slotLineColorChanged(Uml::IDType)));
     disconnect(this, SIGNAL(sigTextColorChanged(Uml::IDType)), o, SLOT(slotTextColorChanged(Uml::IDType)));
     if (t == WidgetBase::wt_Message) {
@@ -984,7 +984,7 @@
 void UMLScene::setFillColor(const QColor &color)
 {
     m_Options.uiState.fillColor = color;
-    emit sigColorChanged(getID());
+    emit sigFillColorChanged(getID());
     setAllChanged();
 }
 
@@ -4041,7 +4041,7 @@
                 uError() << "diagram style " << diagramStyle << " is not yet implemented";
                 continue;
             }
-            m_doc->setMainViewID(m_nID);
+            m_doc->setMainViewID(m_nID);
             m_Type = Uml::DiagramType::Class;
             UMLListView *lv = UMLApp::app()->listView();
             ulvi = new UMLListViewItem(lv->theLogicalView(), name(),
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1286944:1286945
@@ -717,12 +717,12 @@
     void alignHorizontalDistribute();
 
 signals:
-    void sigColorChanged( Uml::IDType );
+    void sigFillColorChanged( Uml::IDType );
     void sigLineColorChanged( Uml::IDType );
     void sigTextColorChanged( Uml::IDType );
+    void sigLineWidthChanged( Uml::IDType );
     void sigRemovePopupMenu();
     void sigClearAllSelected();
-    void sigLineWidthChanged( Uml::IDType );
     void sigSnapToGridToggled(bool);
     void sigSnapComponentSizeToGridToggled(bool);
     void sigShowGridToggled(bool);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.cpp #1286944:1286945
@@ -199,7 +199,7 @@
     }
 }
 
-void ObjectWidget::slotColorChanged(Uml::IDType /*viewID*/)
+void ObjectWidget::slotFillColorChanged(Uml::IDType /*viewID*/)
 {
     UMLWidget::setFillColor( m_scene->fillColor() );
     UMLWidget::setLineColor( m_scene->lineColor() );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.h #1286944:1286945
@@ -237,7 +237,7 @@
     /**
      * Handles a color change signal.
      */
-    virtual void slotColorChanged(Uml::IDType viewID);
+    virtual void slotFillColorChanged(Uml::IDType viewID);
 
     /**
      * Called when a message widget with an end on this object has
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1286944:1286945
@@ -331,7 +331,7 @@
     connect(m_scene, SIGNAL(sigRemovePopupMenu()), this, SLOT(slotRemovePopupMenu()));
     connect(m_scene, SIGNAL(sigClearAllSelected()), this, SLOT(slotClearAllSelected()));
 
-    connect(m_scene, SIGNAL(sigColorChanged(Uml::IDType)), this, SLOT(slotColorChanged(Uml::IDType)));
+    connect(m_scene, SIGNAL(sigFillColorChanged(Uml::IDType)), this, SLOT(slotFillColorChanged(Uml::IDType)));
     connect(m_scene, SIGNAL(sigLineColorChanged(Uml::IDType)), this, SLOT(slotLineColorChanged(Uml::IDType)));
     connect(m_scene, SIGNAL(sigTextColorChanged(Uml::IDType)), this, SLOT(slotTextColorChanged(Uml::IDType)));
     connect(m_scene, SIGNAL(sigLineWidthChanged(Uml::IDType)), this, SLOT(slotLineWidthChanged(Uml::IDType)));
@@ -503,7 +503,7 @@
  *
  * @param sceneID The id of the object behind the widget.
  */
-void UMLWidget::slotColorChanged(Uml::IDType viewID)
+void UMLWidget::slotFillColorChanged(Uml::IDType viewID)
 {
     //only change if on the diagram concerned
     if (m_scene->getID() != viewID) {
@@ -1113,13 +1113,13 @@
     //remove signals from old view - was probably 0 anyway
     disconnect(m_scene, SIGNAL(sigRemovePopupMenu()), this, SLOT(slotRemovePopupMenu()));
     disconnect(m_scene, SIGNAL(sigClearAllSelected()), this, SLOT(slotClearAllSelected()));
-    disconnect(m_scene, SIGNAL(sigColorChanged(Uml::IDType)), this, SLOT(slotColorChanged(Uml::IDType)));
+    disconnect(m_scene, SIGNAL(sigFillColorChanged(Uml::IDType)), this, SLOT(slotFillColorChanged(Uml::IDType)));
     disconnect(m_scene, SIGNAL(sigTextColorChanged(Uml::IDType)), this, SLOT(slotTextColorChanged(Uml::IDType)));
     disconnect(m_scene, SIGNAL(sigLineWidthChanged(Uml::IDType)), this, SLOT(slotLineWidthChanged(Uml::IDType)));
     m_scene = v;
     connect(m_scene, SIGNAL(sigRemovePopupMenu()), this, SLOT(slotRemovePopupMenu()));
     connect(m_scene, SIGNAL(sigClearAllSelected()), this, SLOT(slotClearAllSelected()));
-    connect(m_scene, SIGNAL(sigColorChanged(Uml::IDType)), this, SLOT(slotColorChanged(Uml::IDType)));
+    connect(m_scene, SIGNAL(sigFillColorChanged(Uml::IDType)), this, SLOT(slotFillColorChanged(Uml::IDType)));
     connect(m_scene, SIGNAL(sigTextColorChanged(Uml::IDType)), this, SLOT(slotTextColorChanged(Uml::IDType)));
     connect(m_scene, SIGNAL(sigLineWidthChanged(Uml::IDType)), this, SLOT(slotLineWidthChanged(Uml::IDType)));
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.h #1286944:1286945
@@ -374,7 +374,7 @@
     virtual void updateWidget();
     virtual void slotMenuSelection(QAction* action);
     virtual void slotWidgetMoved(Uml::IDType id);
-    virtual void slotColorChanged(Uml::IDType viewID);
+    virtual void slotFillColorChanged(Uml::IDType viewID);
     virtual void slotLineColorChanged(Uml::IDType viewID);
     virtual void slotTextColorChanged(Uml::IDType viewID);
     virtual void slotLineWidthChanged(Uml::IDType viewID);