From c51585c2794b99b0f80cd12f7d556f2d9ed0d6d6 Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Sun, 7 Jan 2018 22:59:59 +0100 Subject: [PATCH] Fix type conversion error in older Qt versions --- src/format/KeePass2.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/format/KeePass2.cpp b/src/format/KeePass2.cpp index 88286a051..aa081e7b5 100644 --- a/src/format/KeePass2.cpp +++ b/src/format/KeePass2.cpp @@ -65,16 +65,16 @@ QSharedPointer KeePass2::kdfFromParameters(const QVariantMap &p) { QByteArray uuidBytes = p.value(KDFPARAM_UUID).toByteArray(); if (uuidBytes.size() != Uuid::Length) { - return nullptr; + return {}; } QSharedPointer kdf(uuidToKdf(Uuid(uuidBytes))); if (kdf.isNull()) { - return nullptr; + return {}; } if (!kdf->processParameters(p)) { - return nullptr; + return {}; } return kdf; @@ -95,7 +95,7 @@ QSharedPointer KeePass2::uuidToKdf(const Uuid& uuid) } Q_ASSERT_X(false, "uuidToKdf", "Invalid UUID"); - return nullptr; + return {}; } KeePass2::ProtectedStreamAlgo KeePass2::idToProtectedStreamAlgo(quint32 id)