Use QUuid directly on the binary UUID representation

There's no need to convert to string representation, insert the dashes,
parse again into binary form and check if worked if we already have the
binary form. Just use it.

Change-Id: I30a5476a120433c188b9db11cf2a379592b7ec1e
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/systeminfo/linux/qdeviceinfo_linux.cpp b/src/systeminfo/linux/qdeviceinfo_linux.cpp
index a7a97a92..2f80938a 100644
--- a/src/systeminfo/linux/qdeviceinfo_linux.cpp
+++ b/src/systeminfo/linux/qdeviceinfo_linux.cpp
@@ -407,11 +407,9 @@ QString QDeviceInfoPrivate::uniqueDeviceID()
             QCryptographicHash hash2(QCryptographicHash::Sha1);
             hash2.addData(macaddy.toLocal8Bit());
 
-            QString id = hash2.result().toHex();
-
-            id = id.insert(8,'-').insert(13,'-').insert(18,'-').insert(23,'-');
-            if (isUuid(id))
-                uniqueDeviceIDBuffer = id;
+            QUuid id = QUuid::fromRfc4122(hash2.result().left(16));
+            if (!id.isNull())
+                uniqueDeviceIDBuffer = id.toString();
         }
     }