1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize QUuid::QUuid(const char *)

Browse Source 
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>
This commit is contained in:
Liang Qi 2011-05-20 12:45:56 +02:00 committed by Qt Continuous Integration System
parent fb214079bd
commit ae0eb22591
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/plugin/quuid.cpp
View File

@ -341,7 +341,15 @@ QUuid::QUuid(const QString &text)
*/ */
QUuid::QUuid(const char *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 #endif