Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanek Bevendorff <janek@jbev.net>2018-01-08 00:59:59 +0300
committerJonathan White <support@dmapps.us>2018-01-13 22:24:59 +0300
commitc51585c2794b99b0f80cd12f7d556f2d9ed0d6d6 (patch)
tree5ae700c462288cfe6ac62c6024113db87c157401 /src/format/KeePass2.cpp
parentdf728083cc147f9669d11b6306999b36c4a79fae (diff)
Fix type conversion error in older Qt versions
Diffstat (limited to 'src/format/KeePass2.cpp')
-rw-r--r--src/format/KeePass2.cpp8
1 files 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<Kdf> KeePass2::kdfFromParameters(const QVariantMap &p)
{
QByteArray uuidBytes = p.value(KDFPARAM_UUID).toByteArray();
if (uuidBytes.size() != Uuid::Length) {
- return nullptr;
+ return {};
}
QSharedPointer<Kdf> kdf(uuidToKdf(Uuid(uuidBytes)));
if (kdf.isNull()) {
- return nullptr;
+ return {};
}
if (!kdf->processParameters(p)) {
- return nullptr;
+ return {};
}
return kdf;
@@ -95,7 +95,7 @@ QSharedPointer<Kdf> KeePass2::uuidToKdf(const Uuid& uuid)
}
Q_ASSERT_X(false, "uuidToKdf", "Invalid UUID");
- return nullptr;
+ return {};
}
KeePass2::ProtectedStreamAlgo KeePass2::idToProtectedStreamAlgo(quint32 id)