mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-06 22:17:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Replaced Uuid with QUuid

Browse source
This commit is contained in:
pasdam 2018-03-22 22:56:05 +01:00 • committed by Jonathan White
parent dcece140a0
commit ad4423d226
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
49 changed files with 413 additions and 612 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/core/Database.h
View file

@ -23,7 +23,6 @@
#include <QHash>
#include <QObject>
#include "core/Uuid.h"
#include "crypto/kdf/Kdf.h"
#include "keys/CompositeKey.h"
@ -36,7 +35,7 @@ class QIODevice;
struct DeletedObject
{
Uuid uuid;
QUuid uuid;
QDateTime deletionTime;
};
@ -56,7 +55,7 @@ public:
struct DatabaseData
{
Uuid cipher;
QUuid cipher;
CompressionAlgorithm compressionAlgo;
QByteArray transformedMasterKey;
QSharedPointer<Kdf> kdf;
@ -83,14 +82,14 @@ public:
Metadata* metadata();
const Metadata* metadata() const;
Entry* resolveEntry(const Uuid& uuid);
Entry* resolveEntry(const QUuid& uuid);
Entry* resolveEntry(const QString& text, EntryReferenceType referenceType);
Group* resolveGroup(const Uuid& uuid);
Group* resolveGroup(const QUuid& uuid);
QList<DeletedObject> deletedObjects();
void addDeletedObject(const DeletedObject& delObj);
void addDeletedObject(const Uuid& uuid);
void addDeletedObject(const QUuid& uuid);
Uuid cipher() const;
const QUuid& cipher() const;
Database::CompressionAlgorithm compressionAlgo() const;
QSharedPointer<Kdf> kdf() const;
QByteArray transformedMasterKey() const;
@ -98,7 +97,7 @@ public:
QByteArray challengeResponseKey() const;
bool challengeMasterSeed(const QByteArray& masterSeed);
void setCipher(const Uuid& cipher);
void setCipher(const QUuid& cipher);
void setCompressionAlgo(Database::CompressionAlgorithm algo);
void setKdf(QSharedPointer<Kdf> kdf);
bool setKey(const CompositeKey& key, bool updateChangedTime = true, bool updateTransformSalt = false);
@ -117,10 +116,10 @@ public:
/**
* Returns a unique id that is only valid as long as the Database exists.
*/
Uuid uuid();
const QUuid& uuid();
bool changeKdf(QSharedPointer<Kdf> kdf);
static Database* databaseByUuid(const Uuid& uuid);
static Database* databaseByUuid(const QUuid& uuid);
static Database* openDatabaseFile(QString fileName, CompositeKey key);
static Database* unlockFromStdin(QString databaseFilename, QString keyFilename = QString(""));
@ -140,9 +139,9 @@ private slots:
void startModifiedTimer();
private:
Entry* findEntryRecursive(const Uuid& uuid, Group* group);
Entry* findEntryRecursive(const QUuid& uuid, Group* group);
Entry* findEntryRecursive(const QString& text, EntryReferenceType referenceType, Group* group);
Group* findGroupRecursive(const Uuid& uuid, Group* group);
Group* findGroupRecursive(const QUuid& uuid, Group* group);
void createRecycleBin();
QString writeDatabase(QIODevice* device);
@ -155,8 +154,8 @@ private:
DatabaseData m_data;
bool m_emitModified;
Uuid m_uuid;
static QHash<Uuid, Database*> m_uuidMap;
QUuid m_uuid;
static QHash<QUuid, Database*> m_uuidMap;
};
#endif // KEEPASSX_DATABASE_H