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

[Andi Fischer]

SVN commit 1293138 by fischer:

Differences to trunk reduced.

 M  +14 -6     umlscene.cpp  
 M  +1 -1      widgets/widget_utils.cpp  
 M  +0 -2      widgets/widgetlist_utils.cpp  


--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1293137:1293138
@@ -1136,9 +1136,9 @@
  *  at_Association, at_UniAssociation, at_Composition, at_Aggregation
  * This is used for seeking an attribute association.
  *
+ * @param at  The AssociationType of the widget to find.
  * @param pWidgetA  Pointer to the UMLWidget of role A.
  * @param pWidgetB  Pointer to the UMLWidget of role B.
- * @param roleNameB Name at the B side of the association (the attribute name)
  *
  * @return Returns the widget found, returns 0 if no widget found.
  */
@@ -1796,6 +1796,14 @@
     return counter;
 }
 
+/**
+ * Fills the List with all the selected widgets from the diagram
+ * The list can be filled with all the selected widgets, or be filtered to prevent
+ * text widgets other than tr_Floating to be append.
+ *
+ * @param filterText Don't append the text, unless their role is tr_Floating
+ * @return           The UMLWidgetList to fill.
+ */
 UMLWidgetList UMLScene::selectedWidgetsExt(bool filterText /*= true*/)
 {
     UMLWidgetList widgetList;
@@ -1803,7 +1811,7 @@
     foreach(UMLWidget* widgt, selectedWidgets()) {
         if (filterText && widgt->baseType() == WidgetBase::wt_Text) {
             const FloatingTextWidget *ft = static_cast<const FloatingTextWidget*>(widgt);
-            if (ft->textRole() == TextRole::Floating)
+            if (ft->textRole() == Uml::TextRole::Floating)
                 widgetList.append(widgt);
         } else {
             widgetList.append(widgt);
@@ -3998,15 +4006,15 @@
     }
 
     if (!widgetsLoaded) {
-        uWarning() << "failed umlview load on widgets";
+        uWarning() << "failed UMLScene load on widgets";
         return false;
     }
     if (!messagesLoaded) {
-        uWarning() << "failed umlview load on messages";
+        uWarning() << "failed UMLScene load on messages";
         return false;
     }
     if (!associationsLoaded) {
-        uWarning() << "failed umlview load on associations";
+        uWarning() << "failed UMLScene load on associations";
         return false;
     }
     return true;
@@ -4109,7 +4117,7 @@
                 */
             } else {
                 if (!addAssociation(assoc, false)) {
-                    uError() << "Could not addAssociation(" << (void*)assoc << ") to umlview, deleting.";
+                    uError() << "Could not addAssociation(" << assoc << ") to UMLScene, deleting.";
                     //               assoc->cleanup();
                     delete assoc;
                     //return false; // soften error.. may not be that bad
--- branches/work/soc-umbrello/umbrello/widgets/widget_utils.cpp #1293137:1293138
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2004-2011                                               *
+ *   copyright (C) 2004-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
--- branches/work/soc-umbrello/umbrello/widgets/widgetlist_utils.cpp #1293137:1293138
@@ -27,8 +27,6 @@
  */
 qreal getSmallestX(const UMLWidgetList &widgetList)
 {
-    UMLWidgetListIt it(widgetList);
-
     qreal smallestX = 0;
 
     int i = 1;