From ae0eb22591e7af6555d0cff39d63861a4fe4b890 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Fri, 20 May 2011 12:45:56 +0200
Subject: 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>
---
 src/corelib/plugin/quuid.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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
 
-- 
cgit v1.2.3