Applay fix from master using Qt's QUuid class

FreeCAD · Jan 2, 2013 · a7e2d50 · a7e2d50
1 parent b77b59f
commit a7e2d50
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Base/PreCompiled.h b/src/Base/PreCompiled.h
@@ -114,6 +114,7 @@
 #include <QReadWriteLock>
 #include <QMutex>
 #include <QMutexLocker>
+#include <QUuid>
 
 
 #endif //_PreComp_

diff --git a/src/Base/Uuid.cpp b/src/Base/Uuid.cpp
@@ -26,6 +26,8 @@
 #ifndef _PreComp_
 # ifdef FC_OS_WIN32
 #  include <Rpc.h>
+# else
+#  include <QUuid>
 # endif
 #endif
 
@@ -82,6 +84,12 @@ std::string Uuid::CreateUuid(void)
     /* convert it from rcp memory to our own */
     //container = nssUTF8_Duplicate(uuidStr, NULL);
     RpcStringFree(&uuidStr);
+#elif 1
+    std::string Uuid;
+    QString uuid = QUuid::createUuid().toString();
+    uuid = uuid.mid(1);
+    uuid.chop(1);
+    Uuid = (const char*)uuid.toAscii();
 #else
     // use Python's implemententation
     std::string Uuid;