Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanek Bevendorff <janek@jbev.net>2018-11-22 13:47:31 +0300
committerGitHub <noreply@github.com>2018-11-22 13:47:31 +0300
commitd612cad09a4f1cd8ef9bf6be8bf90b75248ecfef (patch)
tree94fbd4d07f56f9646dc8c0dd8e7586776c2e3585 /tests/TestKdbx4.h
parent917c4cc18b8dbc04034cb0d43301b3f406644885 (diff)
Refactor Database and Database widgets (#2491)
The Database, DatabaseWidget, and DatabaseTabWidget classes share many responsibilities in inconsistent ways resulting in impenetrable and unmaintainable code and a diverse set of bugs and architecture restrictions. This patch reworks the architecture, responsibilities of, and dependencies between these classes. The core changes are: * Move loading and saving logic from widgets into the Database class * Get rid of the DatabaseManagerStruct and move all the information contained in it into the Database * Let database objects keep track of modifications and dirty/clean state instead of handing this to external widgets * Move GUI interactions for loading and saving from the DatabaseTabWidget into the DatabaseWidget (resolves #2494 as a side-effect) * Heavily clean up DatabaseTabWidget and degrade it to a slightly glorified QTabWidget * Use QSharedPointers for all Database objects * Remove the modifiedImmediate signal and replace it with a markAsModified() method * Implement proper tabName() method instead of reading back titles from GUI widgets (resolves #1389 and its duplicates #2146 #855) * Fix unwanted AES-KDF downgrade if database uses Argon2 and has CustomData * Improve code This patch is also the first major step towards solving issues #476 and #2322.
Diffstat (limited to 'tests/TestKdbx4.h')
-rw-r--r--tests/TestKdbx4.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/TestKdbx4.h b/tests/TestKdbx4.h
index edf319a96..e5fd85ae3 100644
--- a/tests/TestKdbx4.h
+++ b/tests/TestKdbx4.h
@@ -35,18 +35,18 @@ private slots:
protected:
void initTestCaseImpl() override;
- Database* readXml(QBuffer* buf, bool strictMode, bool& hasError, QString& errorString) override;
- Database* readXml(const QString& path, bool strictMode, bool& hasError, QString& errorString) override;
+ QSharedPointer<Database> readXml(QBuffer* buf, bool strictMode, bool& hasError, QString& errorString) override;
+ QSharedPointer<Database> readXml(const QString& path, bool strictMode, bool& hasError, QString& errorString) override;
void writeXml(QBuffer* buf, Database* db, bool& hasError, QString& errorString) override;
void readKdbx(const QString& path,
QSharedPointer<const CompositeKey> key,
- QScopedPointer<Database>& db,
+ QSharedPointer<Database> db,
bool& hasError,
QString& errorString) override;
void readKdbx(QIODevice* device,
QSharedPointer<const CompositeKey> key,
- QScopedPointer<Database>& db,
+ QSharedPointer<Database> db,
bool& hasError,
QString& errorString) override;
void writeKdbx(QIODevice* device, Database* db, bool& hasError, QString& errorString) override;