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

[Ralf Habacker]

SVN commit 1288037 by habacker:

Reduced differences to soc-umbrello branch.

 M  +8 -8      umlscene.cpp  
 M  +2 -0      umlscene.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1288036:1288037
@@ -1543,15 +1543,14 @@
 
     // we also have to remove selected messages from sequence diagrams
 
-    /* loop through all messages and check the selection state */
+    // loop through all messages and check the selection state
     foreach(MessageWidget* cur_msgWgt, m_MessageList) {
         if (cur_msgWgt->isSelected()) {
             removeWidget(cur_msgWgt);  // Remove message - it is selected.
         }
     }
 
-    // sometimes we miss one widget, so call this function again to remove it as
-    // well
+    // sometimes we miss one widget, so call this function again to remove it as well
     if (m_SelectedList.count() != 0)
         deleteSelection();
 
@@ -2263,8 +2262,9 @@
  */
 void UMLScene::activateAfterLoad(bool bUseLog)
 {
-    if (m_isActivated)
+    if (m_isActivated) {
         return;
+    }
     if (bUseLog) {
         beginPartialWidgetPaste();
     }
@@ -2350,7 +2350,7 @@
 }
 
 /**
- * Removes all the associations related to Widget
+ * Removes all the associations related to Widget.
  *
  * @param pWidget  Pointer to the widget to remove.
  */
@@ -2364,9 +2364,9 @@
 }
 
 /**
- * Removes all the associations related to Widget
+ * Sets each association as selected if the widgets it associates are selected
  *
- * @param pWidget  Pointer to the widget to remove.
+ * @param bSelect  True to select, false for unselect
  */
 void UMLScene::selectAssociations(bool bSelect)
 {
@@ -3717,8 +3717,8 @@
 void UMLScene::setSnapGridVisible(bool bShow)
 {
     m_bShowSnapGrid = bShow;
+    emit sigShowGridToggled(bShow);
     setAllChanged();
-    emit sigShowGridToggled(isSnapGridVisible());
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1288036:1288037
@@ -12,8 +12,10 @@
 
 // local includes
 #include "associationwidgetlist.h"
+#include "basictypes.h"
 #include "messagewidgetlist.h"
 #include "optionstate.h"
+#include "umlobject.h"
 #include "umlobjectlist.h"
 #include "umlwidgetlist.h"
 #include "worktoolbar.h"