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

[Andi Fischer]

SVN commit 1273351 by fischer:

Debug output for BaseType added. Taken from trunk.

 M  +2 -2      umldoc.cpp  
 M  +8 -0      umlobject.cpp  
 M  +2 -1      umlobject.h  


--- branches/work/soc-umbrello/umbrello/umldoc.cpp #1273350:1273351
@@ -71,7 +71,7 @@
 #include <QtXml/QDomDocument>
 
 // Update this version when changing the XMI file format
-#define XMI_FILE_VERSION "1.5.8"
+#define XMI_FILE_VERSION "1.5.9"
 
 /**
  * Constructor for the fileclass of the application.
@@ -2125,7 +2125,7 @@
             }
             else {
                 uError() << "Guess is Uml::ModelType::N_MODELTYPES - package not set correctly for "
-                         << pObject->name() << " / base type " << ot;
+                         << pObject->name() << " / base type " << pObject->baseTypeStr();
                 pkg = m_root[Uml::ModelType::Logical];
             }
         }
--- branches/work/soc-umbrello/umbrello/umlobject.cpp #1273350:1273351
@@ -378,6 +378,14 @@
 }
 
 /**
+ * @return The type used for rtti as string.
+ */
+QLatin1String UMLObject::baseTypeStr() const
+{
+    return QLatin1String(ENUM_NAME(UMLObject, ObjectType, m_BaseType));
+}
+
+/**
  * Set the type of the object.
  *
  * @param ot The ObjectType to set.
--- branches/work/soc-umbrello/umbrello/umlobject.h #1273350:1273351
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2011                                               *
+ *   copyright (C) 2002-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -89,6 +89,7 @@
 
     virtual void setBaseType(ObjectType ot);
     ObjectType baseType() const;
+    QLatin1String baseTypeStr() const;
 
     virtual void setID(Uml::IDType NewID);
     virtual Uml::IDType id() const;