rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Formatting and consistency fixes

Browse Source
This commit is contained in:
Jonathan White
2017-12-20 09:57:17 -05:00
parent 4592de8fb6
commit 61c4fe8992
6 changed files with 29 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/format/KeePass2Reader.h
View File

@@ -31,6 +31,8 @@
class BaseKeePass2Reader
{
Q_DECLARE_TR_FUNCTIONS(BaseKeePass2Reader)
public:
BaseKeePass2Reader();
@@ -44,7 +46,7 @@ public:
virtual QByteArray streamKey();
virtual KeePass2::ProtectedStreamAlgo protectedStreamAlgo() const;
virtual ~BaseKeePass2Reader();
virtual ~BaseKeePass2Reader() = default;
protected:
void raiseError(const QString& errorMessage);
@@ -60,20 +62,17 @@ protected:
class KeePass2Reader : public BaseKeePass2Reader
{
Q_DECLARE_TR_FUNCTIONS(KeePass2Reader)
public:
virtual Database* readDatabase(QIODevice* device, const CompositeKey& key, bool keepDatabase = false) override;
Database* readDatabase(QIODevice* device, const CompositeKey& key, bool keepDatabase = false) override;
using BaseKeePass2Reader::readDatabase;
virtual bool hasError() override;
virtual QString errorString() override;
virtual QByteArray xmlData() override;
virtual QByteArray streamKey() override;
virtual KeePass2::ProtectedStreamAlgo protectedStreamAlgo() const override;
bool hasError() override;
QString errorString() override;
QByteArray xmlData() override;
QByteArray streamKey() override;
KeePass2::ProtectedStreamAlgo protectedStreamAlgo() const override;
quint32 version() const;
BaseKeePass2Reader* reader() const;
private:
QScopedPointer<BaseKeePass2Reader> m_reader;
quint32 m_version;