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

Minor changes to Group API to make it more explicit

Browse source 
* Include check for group as recycle bin directly into the Group::isRecycled() function

* Return the original root group from Database::setRootGroup(...) to force memory management transfer
This commit is contained in:
Jonathan White 2023-08-28 07:19:12 -04:00
parent b4ff1fa36c
commit a02bceabd2
14 changed files with 45 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/TestCli.cpp
View file

@ -1799,7 +1799,8 @@ void TestCli::testMergeWithKeys()
entry->setPassword("secretsecretsecret");
group->addEntry(entry);
sourceDatabase->setRootGroup(rootGroup);
auto oldGroup = sourceDatabase->setRootGroup(rootGroup);
delete oldGroup;
auto* otherRootGroup = new Group();
otherRootGroup->setName("root");
@ -1815,7 +1816,8 @@ void TestCli::testMergeWithKeys()
otherEntry->setPassword("secretsecretsecret 2");
otherGroup->addEntry(otherEntry);
targetDatabase->setRootGroup(otherRootGroup);
oldGroup = targetDatabase->setRootGroup(otherRootGroup);
delete oldGroup;
sourceDatabase->saveAs(sourceDatabaseFilename);
targetDatabase->saveAs(targetDatabaseFilename);