Handle deleting groups more consistently.

Delete the entries and child groups in Group dtor
no what if the group has a database or not.
This commit is contained in:
Felix Geyer 2013-03-22 20:53:10 +01:00
parent 7be87051ab
commit 72d17c045f

View file

@ -40,7 +40,6 @@ Group::~Group()
this->blockSignals(true); this->blockSignals(true);
// Destroy entries and children manually so DeletedObjects can be added // Destroy entries and children manually so DeletedObjects can be added
// to database. // to database.
if (m_db && m_parent) {
QList<Entry*> entries = m_entries; QList<Entry*> entries = m_entries;
Q_FOREACH (Entry* entry, entries) { Q_FOREACH (Entry* entry, entries) {
entry->blockSignals(true); entry->blockSignals(true);
@ -53,6 +52,7 @@ Group::~Group()
delete group; delete group;
} }
if (m_db && m_parent) {
DeletedObject delGroup; DeletedObject delGroup;
delGroup.deletionTime = Tools::currentDateTimeUtc(); delGroup.deletionTime = Tools::currentDateTimeUtc();
delGroup.uuid = m_uuid; delGroup.uuid = m_uuid;