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