feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TreeModel: takeItem should return the item

Browse Source 
The usual Qt API for "takeXyz()" methods is to return the item that was
"taken".

Change-Id: Ie144051801487a301b3f13e2857735b65f58150b
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-06-09 09:33:14 +02:00
parent 5309e217e4
commit b1393d4778
9 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/treemodel.cpp
View File

@@ -1027,23 +1027,24 @@ void TreeModel::clear()
\note The item is not destroyed, ownership is effectively passed to the caller.
*/
void TreeModel::takeItem(TreeItem *item)
TreeItem *TreeModel::takeItem(TreeItem *item)
{
#if USE_MODEL_TEST
(void) new ModelTest(this, this);
#endif
QTC_ASSERT(item, return);
QTC_ASSERT(item, return item);
TreeItem *parent = item->parent();
QTC_ASSERT(parent, return);
QTC_ASSERT(parent, return item);
int pos = parent->m_children.indexOf(item);
QTC_ASSERT(pos != -1, return);
QTC_ASSERT(pos != -1, return item);
QModelIndex idx = indexForItem(parent);
beginRemoveRows(idx, pos, pos);
item->m_parent = 0;
parent->m_children.removeAt(pos);
endRemoveRows();
return item;
}
//