Commit a7e2d50f authored by wmayer's avatar wmayer
Browse files

Applay fix from master using Qt's QUuid class

parent b77b59f0
......@@ -114,6 +114,7 @@
#include <QReadWriteLock>
#include <QMutex>
#include <QMutexLocker>
#include <QUuid>
#endif //_PreComp_
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment