jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the position of the Q_REQUIRED_RESULT macro (#2411)

Browse Source 
The Q_REQUIRED_RESULT macro was appended to a few method declarations.
It should've been prepended instead.
This commit is contained in:
Gianluca Recchia
2018-10-24 14:09:12 +02:00
committed by Jonathan White
parent 6ea869bb18
commit 1d9f46ebc5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto/kdf/AesKdf.h
View File

@@ -35,8 +35,8 @@ protected:
int benchmarkImpl(int msec) const override;
private:
static bool
transformKeyRaw(const QByteArray& key, const QByteArray& seed, int rounds, QByteArray* result) Q_REQUIRED_RESULT;
Q_REQUIRED_RESULT static bool
transformKeyRaw(const QByteArray& key, const QByteArray& seed, int rounds, QByteArray* result);
};
#endif // KEEPASSX_AESKDF_H

4
src/crypto/kdf/Argon2Kdf.h
View File

@@ -45,13 +45,13 @@ protected:
quint32 m_parallelism;
private:
static bool transformKeyRaw(const QByteArray& key,
Q_REQUIRED_RESULT static bool transformKeyRaw(const QByteArray& key,
const QByteArray& seed,
quint32 version,
quint32 rounds,
quint64 memory,
quint32 parallelism,
QByteArray& result) Q_REQUIRED_RESULT;
QByteArray& result);
};
#endif // KEEPASSX_ARGON2KDF_H

2
src/keys/CompositeKey.h
View File

@@ -39,7 +39,7 @@ public:
QByteArray rawKey() const override;
QByteArray rawKey(const QByteArray* transformSeed, bool* ok = nullptr) const;
bool transform(const Kdf& kdf, QByteArray& result) const Q_REQUIRED_RESULT;
Q_REQUIRED_RESULT bool transform(const Kdf& kdf, QByteArray& result) const;
bool challenge(const QByteArray& seed, QByteArray& result) const;
void addKey(QSharedPointer<Key> key);