1 files changed, 15 insertions, 23 deletions

diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index 4a5f4e791d..8b940aa2dc 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -36,14 +36,13 @@
 #include "qdatastream.h"
 #include "qendian.h"
 #include "qdebug.h"
+#include "private/qtools_p.h"
 
 #ifndef QT_BOOTSTRAPPED
 #include "qcryptographichash.h"
 #endif
 QT_BEGIN_NAMESPACE
 
-static const char digits[] = "0123456789abcdef";
-
 template <class Char, class Integral>
 void _q_toHex(Char *&dst, Integral value)
 {
@@ -52,10 +51,8 @@ void _q_toHex(Char *&dst, Integral value)
     const char* p = reinterpret_cast<const char*>(&value);
 
     for (uint i = 0; i < sizeof(Integral); ++i, dst += 2) {
-        uint j = (p[i] >> 4) & 0xf;
-        dst[0] = Char(digits[j]);
-        j = p[i] & 0xf;
-        dst[1] = Char(digits[j]);
+        dst[0] = Char(QtMiscUtils::toHexLower((p[i] >> 4) & 0xf));
+        dst[1] = Char(QtMiscUtils::toHexLower(p[i] & 0xf));
     }
 }
 
@@ -65,15 +62,9 @@ bool _q_fromHex(const Char *&src, Integral &value)
     value = 0;
 
     for (uint i = 0; i < sizeof(Integral) * 2; ++i) {
-        int ch = *src++;
-        int tmp;
-        if (ch >= '0' && ch <= '9')
-            tmp = ch - '0';
-        else if (ch >= 'a' && ch <= 'f')
-            tmp = ch - 'a' + 10;
-        else if (ch >= 'A' && ch <= 'F')
-            tmp = ch - 'A' + 10;
-        else
+        uint ch = *src++;
+        int tmp = QtMiscUtils::fromHex(ch);
+        if (tmp == -1)
             return false;
 
         value = value * 16 + tmp;
@@ -1002,8 +993,9 @@ QUuid QUuid::createUuid()
 */
 QDebug operator<<(QDebug dbg, const QUuid &id)
 {
+    QDebugStateSaver saver(dbg);
     dbg.nospace() << "QUuid(" << id.toString() << ')';
-    return dbg.space();
+    return dbg;
 }
 #endif