bash-tech/squawk
1
0
Fork 0
forked from blue/squawk
Code Pull requests Activity

debugging account removal

Browse source
This commit is contained in:
Blue 2019-05-30 12:36:21 +03:00
parent 234697050b
commit b845518ced
6 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ui/models/contact.cpp
View file

@ -132,8 +132,9 @@ void Models::Contact::removePresence(const QString& name)
qDebug() << "an attempt to remove non existing presence " << name << " from the contact " << jid << " of account " << getAccountName() << ", skipping";
} else {
Presence* pr = itr.value();
presences.erase(itr);
removeChild(pr->row());
presences.erase(itr);
pr->deleteLater();
}
}

6
ui/models/roster.cpp
View file

@ -164,7 +164,7 @@ QModelIndex Models::Roster::parent (const QModelIndex& child) const
Item *parentItem = childItem->parentItem();
if (parentItem == root) {
return QModelIndex();
return createIndex(0, 0, parentItem);
}
return createIndex(parentItem->row(), 0, parentItem);
@ -455,6 +455,7 @@ void Models::Roster::onChildIsAboutToBeRemoved(Models::Item* parent, int first,
if (parent != root) {
row = parent->row();
}
qDebug() << "Removing row" << parent->child(first)->getName() << "from" << parent->getName() << "index is" << first;
beginRemoveRows(createIndex(row, 0, parent), first, last);
}
@ -525,6 +526,7 @@ void Models::Roster::removeAccount(const QString& account)
int index = acc->row();
root->removeChild(index);
accountsModel->removeAccount(index);
accounts.erase(itr);
std::multimap<ElId, Contact*>::const_iterator cItr = contacts.begin();
while (cItr != contacts.end()) {
@ -548,5 +550,5 @@ void Models::Roster::removeAccount(const QString& account)
}
}
delete acc;
acc->deleteLater();
}