Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
FreeCAD
FreeCAD
Commits
a7e2d50f
Commit
a7e2d50f
authored
Jan 02, 2013
by
wmayer
Browse files
Applay fix from master using Qt's QUuid class
parent
b77b59f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Base/PreCompiled.h
View file @
a7e2d50f
...
...
@@ -114,6 +114,7 @@
#include <QReadWriteLock>
#include <QMutex>
#include <QMutexLocker>
#include <QUuid>
#endif //_PreComp_
...
...
src/Base/Uuid.cpp
View file @
a7e2d50f
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment