Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-04 20:44:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add custom icons when merging. (#1008)

Browse source 
* Adding missing custom icons on merge.
* qDebug when adding icon
* Adding test for merge custom icons.
This commit is contained in:
louib 2017-10-07 10:40:29 -04:00 • committed by GitHub
parent 0d5fec6dfc
commit 242faa138b
7 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/format/KeePass2XmlReader.cpp
View file

@ -323,9 +323,6 @@ void KeePass2XmlReader::parseMemoryProtection()
else if (m_xml.name() == "ProtectNotes") {
m_meta->setProtectNotes(readBool());
}
/*else if (m_xml.name() == "AutoEnableVisualHiding") {
m_meta->setAutoEnableVisualHiding(readBool());
}*/
else {
skipCurrentElement();
}

1
src/format/KeePass2XmlWriter.cpp
View file

@ -141,7 +141,6 @@ void KeePass2XmlWriter::writeMemoryProtection()
writeBool("ProtectPassword", m_meta->protectPassword());
writeBool("ProtectURL", m_meta->protectUrl());
writeBool("ProtectNotes", m_meta->protectNotes());
// writeBool("AutoEnableVisualHiding", m_meta->autoEnableVisualHiding());
m_xml.writeEndElement();
}