[Uml-devel] branches/work/soc-umbrello/umbrello

[Ralf Habacker]

SVN commit 1288038 by habacker:

Reduced differences to trunk.

 M  +9 -5      umlscene.cpp  
 M  +1 -1      umlscene.h  


--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1288037:1288038
@@ -1087,10 +1087,10 @@
  */
 AssociationWidget * UMLScene::findAssocWidget(Uml::IDType id)
 {
-    foreach(AssociationWidget* wid , m_AssociationList) {
-        UMLAssociation* umlassoc = wid->association();
+    foreach(AssociationWidget* obj , m_AssociationList) {
+        UMLAssociation* umlassoc = obj->association();
         if (umlassoc && umlassoc->id() == id) {
-            return wid;
+            return obj;
         }
     }
     return 0;
@@ -1461,7 +1461,7 @@
 
     foreach(UMLWidget* temp ,  selectedWidgets()) {
         if (temp->baseType() == WidgetBase::wt_Text &&
-            ((FloatingTextWidget *)temp)->textRole() != TextRole::Floating) {
+                ((FloatingTextWidget *)temp)->textRole() != Uml::TextRole::Floating) {
             temp->hide();
 
         } else {
@@ -2261,6 +2261,8 @@
 
 /**
  * Removes all the associations related to Widget.
+ *
+ * @param pWidget  Pointer to the widget to remove.
  */
 void UMLScene::removeAssociations(UMLWidget* Widget)
 {
@@ -2273,6 +2275,8 @@
 
 /**
  * Sets each association as selected if the widgets it associates are selected
+ *
+ * @param bSelect  True to select, false for unselect
  */
 void UMLScene::selectAssociations(bool bSelect)
 {
@@ -2843,7 +2847,7 @@
  * Find the maximum bounding rectangle of FloatingTextWidget widgets.
  * Auxiliary to copyAsImage().
  *
- * @param ft Poqrealer to the FloatingTextWidget widget to consider.
+ * @param ft Pointer to the FloatingTextWidget widget to consider.
  * @param px  X coordinate of lower left corner. This value will be
  *            updated if the X coordinate of the lower left corner
  *            of ft is smaller than the px value passed in.
--- branches/work/soc-umbrello/umbrello/umlscene.h #1288037:1288038
@@ -16,8 +16,8 @@
 #include "basictypes.h"
 #include "messagewidgetlist.h"
 #include "optionstate.h"
+#include "umlobject.h"
 #include "umlobjectlist.h"
-#include "umlobject.h"
 #include "umlwidgetlist.h"
 
 // Qt includes