Mark some constructor as explicit.

This commit is contained in:
Felix Geyer 2012-01-11 19:18:35 +01:00
parent 6422dee4fc
commit 279585fff4
10 changed files with 13 additions and 11 deletions

View file

@ -30,7 +30,7 @@ public:
Sha256 Sha256
}; };
CryptoHash(CryptoHash::Algorithm algo); explicit CryptoHash(CryptoHash::Algorithm algo);
~CryptoHash(); ~CryptoHash();
void addData(const QByteArray& data); void addData(const QByteArray& data);
void reset(); void reset();
@ -40,7 +40,8 @@ public:
private: private:
CryptoHashPrivate* const d_ptr; CryptoHashPrivate* const d_ptr;
Q_DECLARE_PRIVATE(CryptoHash);
Q_DECLARE_PRIVATE(CryptoHash)
}; };
#endif // KEEPASSX_CRYPTOHASH_H #endif // KEEPASSX_CRYPTOHASH_H

View file

@ -55,8 +55,9 @@ public:
int blockSize() const; int blockSize() const;
private: private:
Q_DISABLE_COPY(SymmetricCipher)
SymmetricCipherBackend* m_backend; SymmetricCipherBackend* m_backend;
Q_DISABLE_COPY(SymmetricCipher)
}; };
#endif // KEEPASSX_SYMMETRICCIPHER_H #endif // KEEPASSX_SYMMETRICCIPHER_H

View file

@ -23,7 +23,7 @@
class SymmetricCipherBackend class SymmetricCipherBackend
{ {
public: public:
virtual ~SymmetricCipherBackend() {}; virtual ~SymmetricCipherBackend() {}
virtual void setAlgorithm(SymmetricCipher::Algorithm algo) = 0; virtual void setAlgorithm(SymmetricCipher::Algorithm algo) = 0;
virtual void setMode(SymmetricCipher::Mode mode) = 0; virtual void setMode(SymmetricCipher::Mode mode) = 0;
virtual void setDirection(SymmetricCipher::Direction direction) = 0; virtual void setDirection(SymmetricCipher::Direction direction) = 0;

View file

@ -20,7 +20,7 @@
#include "crypto/CryptoHash.h" #include "crypto/CryptoHash.h"
#include "format/KeePass2.h" #include "format/KeePass2.h"
KeePass2RandomStream::KeePass2RandomStream(QByteArray key) KeePass2RandomStream::KeePass2RandomStream(const QByteArray& key)
: m_cipher(SymmetricCipher::Salsa20, SymmetricCipher::Stream, SymmetricCipher::Encrypt, : m_cipher(SymmetricCipher::Salsa20, SymmetricCipher::Stream, SymmetricCipher::Encrypt,
CryptoHash::hash(key, CryptoHash::Sha256), KeePass2::INNER_STREAM_SALSA20_IV) CryptoHash::hash(key, CryptoHash::Sha256), KeePass2::INNER_STREAM_SALSA20_IV)
, m_offset(0) , m_offset(0)

View file

@ -25,7 +25,7 @@
class KeePass2RandomStream class KeePass2RandomStream
{ {
public: public:
KeePass2RandomStream(QByteArray key); explicit KeePass2RandomStream(const QByteArray& key);
QByteArray randomBytes(int size); QByteArray randomBytes(int size);
QByteArray process(const QByteArray& data); QByteArray process(const QByteArray& data);
void processInPlace(QByteArray& data); void processInPlace(QByteArray& data);

View file

@ -27,7 +27,7 @@ class QIODevice;
class KeePass2Reader class KeePass2Reader
{ {
Q_DECLARE_TR_FUNCTIONS(KeePass2Reader); Q_DECLARE_TR_FUNCTIONS(KeePass2Reader)
public: public:
KeePass2Reader(); KeePass2Reader();

View file

@ -35,7 +35,7 @@ class Metadata;
class KeePass2XmlReader class KeePass2XmlReader
{ {
Q_DECLARE_TR_FUNCTIONS(KeePass2XmlReader); Q_DECLARE_TR_FUNCTIONS(KeePass2XmlReader)
public: public:
KeePass2XmlReader(); KeePass2XmlReader();

View file

@ -46,7 +46,7 @@ class DatabaseTabWidget : public QTabWidget
Q_OBJECT Q_OBJECT
public: public:
DatabaseTabWidget(QWidget* parent); explicit DatabaseTabWidget(QWidget* parent);
void openDatabase(const QString& fileName); void openDatabase(const QString& fileName);
DatabaseWidget* currentDatabaseWidget(); DatabaseWidget* currentDatabaseWidget();

View file

@ -32,7 +32,7 @@ class EditGroupWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
EditGroupWidget(QWidget* parent = 0); explicit EditGroupWidget(QWidget* parent = 0);
~EditGroupWidget(); ~EditGroupWidget();
void loadGroup(Group* group, bool create); void loadGroup(Group* group, bool create);

View file

@ -26,7 +26,7 @@ class PasswordKey : public Key
{ {
public: public:
PasswordKey(); PasswordKey();
PasswordKey(const QString& password); explicit PasswordKey(const QString& password);
QByteArray rawKey() const; QByteArray rawKey() const;
void setPassword(const QString& password); void setPassword(const QString& password);
PasswordKey* clone() const; PasswordKey* clone() const;