From b0ad864fe0cc641e04c2ecf64b9b454a4231d553 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Sun, 24 Jun 2012 18:23:27 +0200
Subject: [PATCH] Always convert explicitly from QByteArray to QString.

---
 src/core/Uuid.cpp               | 4 ++--
 tests/TestKeePass2XmlReader.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/Uuid.cpp b/src/core/Uuid.cpp
index 7b37490f..75c67171 100644
--- a/src/core/Uuid.cpp
+++ b/src/core/Uuid.cpp
@@ -41,12 +41,12 @@ Uuid Uuid::random() {
 
 QString Uuid::toBase64() const
 {
-    return m_data.toBase64();
+    return QString::fromAscii(m_data.toBase64());
 }
 
 QString Uuid::toHex() const
 {
-    return m_data.toHex();
+    return QString::fromAscii(m_data.toHex());
 }
 
 QByteArray Uuid::toByteArray() const
diff --git a/tests/TestKeePass2XmlReader.cpp b/tests/TestKeePass2XmlReader.cpp
index c0ca80d0..0fde90ef 100644
--- a/tests/TestKeePass2XmlReader.cpp
+++ b/tests/TestKeePass2XmlReader.cpp
@@ -295,7 +295,7 @@ void TestKeePass2XmlReader::testEntry2()
     QVERIFY(attrs.isEmpty());
 
     QCOMPARE(entry->attachments()->keys().size(), 1);
-    QCOMPARE(QString(entry->attachments()->value("myattach.txt")), QString("abcdefghijk"));
+    QCOMPARE(QString::fromAscii(entry->attachments()->value("myattach.txt")), QString("abcdefghijk"));
 
     QCOMPARE(entry->autoTypeEnabled(), true);
     QCOMPARE(entry->autoTypeObfuscation(), 1);