diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-05-20 12:45:56 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-27 13:21:40 +0200 |
| commit | ae0eb22591e7af6555d0cff39d63861a4fe4b890 (patch) | |
| tree | 296b02afb65f4cf55d3fcca15d389f06ceb130b7 | |
| parent | fb214079bda2122878466db510fc7549065c3ae3 (diff) | |
Optimize QUuid::QUuid(const char *)
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>
| -rw-r--r-- | src/corelib/plugin/quuid.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index e99f87a86f..63f6e045ea 100644 --- 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 |