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

[Andi Fischer]

SVN commit 1273668 by fischer:

Small changes to reduce the diff to trunk.

 M  +1 -1      association.cpp  
 M  +1 -1      cmds/widget/cmd_changeFillColor.cpp  
 M  +1 -1      cmds/widget/cmd_changeLineColor.cpp  
 M  +1 -1      dialogs/umlwidgetcolorpage.cpp  
 M  +1 -1      listpopupmenu.cpp  
 M  +4 -5      object_factory.cpp  
 M  +2 -1      package.cpp  
 M  +0 -1      toolbarstate.cpp  
 M  +0 -3      toolbarstatearrow.cpp  
 M  +0 -3      toolbarstateassociation.cpp  
 M  +2 -2      widgets/widgetbase.cpp  
 M  +1 -1      widgets/widgetbase.h  


--- branches/work/soc-umbrello/umbrello/association.cpp #1273667:1273668
@@ -415,7 +415,7 @@
     Uml::IDType roleBObjID = STR2ID(element.attribute( "roleb", "-1" ));
     if (assocType == Uml::AssociationType::Aggregation ||
         assocType == Uml::AssociationType::Composition) {
-        // Flip roles to compensate for changed diamond logic in LinePath.
+        // Flip roles to compensate for changed diamond logic in AssociationLine.
         // For further explanations see AssociationWidget::loadFromXMI.
         Uml::IDType tmp = roleAObjID;
         roleAObjID = roleBObjID;
--- branches/work/soc-umbrello/umbrello/cmds/widget/cmd_changeFillColor.cpp #1273667:1273668
@@ -24,7 +24,7 @@
         m_color(col)
     {
         setText(i18n("Change fill color : %1", w->name()));
-        m_oldColor = w->getFillColor();
+        m_oldColor = w->fillColor();
     }
 
     CmdChangeFillColor::~CmdChangeFillColor()
--- branches/work/soc-umbrello/umbrello/cmds/widget/cmd_changeLineColor.cpp #1273667:1273668
@@ -25,7 +25,7 @@
         UMLWidget * widget = view->getFirstMultiSelectedWidget();
         m_view = view;
         m_newColor = col;
-        m_oldColor = widget->getLineColor();
+        m_oldColor = widget->lineColor();
     }*/
 
     CmdChangeLineColor::CmdChangeLineColor(UMLWidget *w, const QColor& col)
--- branches/work/soc-umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp #1273667:1273668
@@ -35,7 +35,7 @@
     m_options = 0;
     init();
     m_pLineColorB->setColor( pWidget->lineColor() );
-    m_pFillColorB->setColor( pWidget->getFillColor() );
+    m_pFillColorB->setColor( pWidget->fillColor() );
     m_pUseFillColorCB->setChecked( pWidget->useFillColor() );
 
     if (!m_pUMLWidget) {  //  when we are on the diagram
--- branches/work/soc-umbrello/umbrello/listpopupmenu.cpp #1273667:1273668
@@ -260,7 +260,7 @@
 
     default:
         uWarning() << "unhandled ListViewType "
-                   << type;  //:TODO: QLatin1String(ENUM_NAME(UMLListViewItem, ListViewType, type));
+                   << UMLListViewItem::toString(type);
         break;
     }
     setupMenu(mt);
--- branches/work/soc-umbrello/umbrello/object_factory.cpp #1273667:1273668
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *  copyright (C) 2006-2011                                                *
+ *  copyright (C) 2006-2012                                                *
  *  Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                   *
  ***************************************************************************/
 
@@ -132,7 +132,7 @@
             o = new UMLCategory(name, g_predefinedId);
             break;
         default:
-            uWarning() << "error unknown type: " << type;
+            uWarning() << "error unknown type: " << UMLObject::toString(type);
             return NULL;
     }
     o->setUMLPackage(parentPkg);
@@ -170,7 +170,7 @@
         } else {
             Uml::ModelType mt = Model_Utils::convert_OT_MT(type);
             uDebug() << "Object_Factory::createUMLObject(" << n << "): "
-                << "parentPkg is not set, assuming Model_Type " << mt;
+                << "parentPkg is not set, assuming Model_Type " << mt.toString();
             parentPkg = doc->rootFolder(mt);
         }
     }
@@ -296,7 +296,7 @@
             break;
         }
     default:
-        uDebug() << "ERROR UMLDoc::createChildObject type:" << type;
+        uDebug() << "ERROR UMLDoc::createChildObject type:" << UMLObject::toString(type);
     }
     return static_cast<UMLClassifierListItem*>(returnObject);
 }
@@ -368,4 +368,3 @@
 }
 
 }  // end namespace Object_Factory
-
--- branches/work/soc-umbrello/umbrello/package.cpp #1273667:1273668
@@ -155,10 +155,11 @@
       QString name = pObject->name();
       QString oldName = name;
       while ( findObject( name ) != NULL  ) {
+         QString prevName = name;
          name = Model_Utils::uniqObjectName(pObject->baseType(),this);
          bool ok = true;
          name = KInputDialog::getText(i18nc("object name", "Name"),
-                                      i18n("An object with the name %1\nalready exists in the package %2.\nPlease enter a new name:", name, this->name()),
+                                      i18n("An object with the name %1\nalready exists in the package %2.\nPlease enter a new name:", prevName, this->name()),
                                       name, &ok, (QWidget*)UMLApp::app());
          if (!ok) {
             name = oldName;
--- branches/work/soc-umbrello/umbrello/toolbarstate.cpp #1273667:1273668
@@ -14,7 +14,6 @@
 // qt includes
 #include <qwmatrix.h> // need for inverseWorldMatrix.map
 
-
 // app includes
 #include "associationwidget.h"
 #include "messagewidget.h"
--- branches/work/soc-umbrello/umbrello/toolbarstatearrow.cpp #1273667:1273668
@@ -11,9 +11,6 @@
 // own header
 #include "toolbarstatearrow.h"
 
-// qt includes
-
-
 // app includes
 #include "umlscene.h"
 
--- branches/work/soc-umbrello/umbrello/toolbarstateassociation.cpp #1273667:1273668
@@ -29,9 +29,6 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-// qt includes
-
-
 /**
  * Creates a new ToolBarStateAssociation.
  *
--- branches/work/soc-umbrello/umbrello/widgets/widgetbase.cpp #1273667:1273668
@@ -941,7 +941,7 @@
     case ListPopupMenu::mt_Fill_Color:
         widget = umlScene()->getFirstMultiSelectedWidget();
         if (widget) {
-            newColour = widget->getFillColor();
+            newColour = widget->fillColor();
         }
         if (KColorDialog::getColor(newColour)) {
             umlScene()->selectionSetFillColor(newColour);
@@ -1233,7 +1233,7 @@
 
 ///////////////////////////////SOME DEPRECATED STUFF///////////////
 
-QColor WidgetBase::getFillColor() const
+QColor WidgetBase::fillColor() const
 {
     QBrush b = brush();
     if (b.gradient() || b.style() == Qt::TexturePattern || b.style() == Qt::NoBrush) {
--- branches/work/soc-umbrello/umbrello/widgets/widgetbase.h #1273667:1273668
@@ -271,7 +271,7 @@
 
     // DEPRECATED SECTION ///////////////////////////////
 
-    QColor getFillColor() const;
+    QColor fillColor() const;
     void setFillColor(const QColor& col) { setBrush(QBrush(col)); }
 
     bool useFillColor() const { return false; }