projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb21407
)
Optimize QUuid::QUuid(const char *)
author
Liang Qi
<liang.qi@nokia.com>
Fri, 20 May 2011 10:45:56 +0000
(12:45 +0200)
committer
Qt Continuous Integration System
<qt-info@nokia.com>
Fri, 27 May 2011 11:21:40 +0000
(13:21 +0200)
Reviewed-by: joao
(cherry picked from commit
96d10abbb40c52ac6274f1144766f3fb27dfd726
)
Change-Id: I050b602b6cac669b4d88046b0a707048ce0a8cda
Reviewed-on: http://codereview.qt.nokia.com/170
Reviewed-by: Liang Qi <liang.qi@nokia.com>
src/corelib/plugin/quuid.cpp
patch
|
blob
|
history
diff --git
a/src/corelib/plugin/quuid.cpp
b/src/corelib/plugin/quuid.cpp
index
e99f87a
..
63f6e04
100644
(file)
--- a/
src/corelib/plugin/quuid.cpp
+++ b/
src/corelib/plugin/quuid.cpp
@@
-341,7
+341,15
@@
QUuid::QUuid(const QString &text)
*/
QUuid::QUuid(const char *text)
{
- *this = QUuid(QString::fromLatin1(text));
+ if (!text) {
+ *this = QUuid();
+ return;
+ }
+
+ if (!_q_uuidFromHex(text, data1, data2, data3, data4)) {
+ *this = QUuid();
+ return;
+ }
}
#endif