[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Completion of previous commit - prepare for xmi.id type switchover.


  M +22 -0     umlnamespace.h   1.34


--- kdesdk/umbrello/umbrello/umlnamespace.h  #1.33:1.34
@@ -198,4 +198,26 @@ namespace Uml {
         enum Parameter_Direction { pd_In, pd_InOut, pd_Out };
 
+#if defined (ID_USE_STRING)
+        /**
+         * The data type used for unique IDs.
+         */
+        typedef QString IDType;
+        /**
+         * Reserved value for uninitialized/illegal ID.
+         */
+        const IDType id_None = "-1";
+
+#       define STR2ID(id)  id
+#       define ID2STR(id)  id
+#else
+        // DEPRECATED
+        // This configuration will be removed shortly
+        typedef int IDType;
+        const IDType id_None = -1;
+
+#       define STR2ID(id)  (id).toInt()
+#       define ID2STR(id)  QString::number(id)
+#endif
+
         /**
          * Function for comparing tags in XMI files.