Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-01 21:12:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add Merge database utility function (#47)

Browse source 
Thank you to @TheZ3ro and @monomon for there major contributions to this PR!
This commit is contained in:
Jonathan White 2016-11-07 22:37:42 -05:00 • committed by GitHub
parent e00c6f9c77
commit e25cd9ba48
16 changed files with 382 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/Database.cpp
View file

@ -282,6 +282,12 @@ void Database::recycleGroup(Group* group)
}
}
void Database::merge(const Database* other)
{
m_rootGroup->merge(other->rootGroup());
Q_EMIT modified();
}
void Database::setEmitModified(bool value)
{
if (m_emitModified && !value) {