Always convert explicitly from QByteArray to QString.

This commit is contained in:
Felix Geyer 2012-06-24 18:23:27 +02:00
parent d0016bf6c4
commit b0ad864fe0
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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);