Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-26 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Always convert explicitly from QByteArray to QString.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Uuid.cpp
View File

@ -41,12 +41,12 @@ Uuid Uuid::random() {
QString Uuid::toBase64() const QString Uuid::toBase64() const
{ {
return m_data.toBase64(); return QString::fromAscii(m_data.toBase64());
} }
QString Uuid::toHex() const QString Uuid::toHex() const
{ {
return m_data.toHex(); return QString::fromAscii(m_data.toHex());
} }
QByteArray Uuid::toByteArray() const QByteArray Uuid::toByteArray() const

2
tests/TestKeePass2XmlReader.cpp
View File

@ -295,7 +295,7 @@ void TestKeePass2XmlReader::testEntry2()
QVERIFY(attrs.isEmpty()); QVERIFY(attrs.isEmpty());
QCOMPARE(entry->attachments()->keys().size(), 1); 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->autoTypeEnabled(), true);
QCOMPARE(entry->autoTypeObfuscation(), 1); QCOMPARE(entry->autoTypeObfuscation(), 1);