From ef06165ea2f4998e8c04c6c62b04a2fe504e5656 Mon Sep 17 00:00:00 2001 From: Kyle Manna Date: Sun, 8 Jan 2017 18:45:02 -0800 Subject: [PATCH] keys: CompositeKey: Change Q_FOREACH to C++11 for() * Use the C++11 range based loop as recommended from https://github.com/keepassxreboot/keepassxc/pull/119 Signed-off-by: Kyle Manna --- src/keys/CompositeKey.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/keys/CompositeKey.cpp b/src/keys/CompositeKey.cpp index d2334e3c2..ae654eb74 100644 --- a/src/keys/CompositeKey.cpp +++ b/src/keys/CompositeKey.cpp @@ -70,7 +70,7 @@ CompositeKey& CompositeKey::operator=(const CompositeKey& key) for (const Key* subKey : asConst(key.m_keys)) { addKey(*subKey); } - Q_FOREACH (const ChallengeResponseKey* subKey, key.m_challengeResponseKeys) { + for (const ChallengeResponseKey* subKey : asConst(key.m_challengeResponseKeys)) { addChallengeResponseKey(*subKey); } @@ -160,7 +160,7 @@ bool CompositeKey::challenge(const QByteArray& seed, QByteArray& result) const CryptoHash cryptoHash(CryptoHash::Sha256); - Q_FOREACH (ChallengeResponseKey* key, m_challengeResponseKeys) { + for (ChallengeResponseKey* key : m_challengeResponseKeys) { /* If the device isn't present or fails, return an error */ if (key->challenge(seed) == false) { return false;