projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: avoid de-duplication of user's CXXFLAGS
[quassel.git]
/
src
/
client
/
treemodel.cpp
diff --git
a/src/client/treemodel.cpp
b/src/client/treemodel.cpp
index
006434c
..
c08737c
100644
(file)
--- a/
src/client/treemodel.cpp
+++ b/
src/client/treemodel.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-202
0
by the Quassel Project *
+ * Copyright (C) 2005-202
2
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-45,7
+45,6
@@
private:
AbstractTreeItem::AbstractTreeItem(AbstractTreeItem* parent)
: QObject(parent)
, _flags(Qt::ItemIsSelectable | Qt::ItemIsEnabled)
AbstractTreeItem::AbstractTreeItem(AbstractTreeItem* parent)
: QObject(parent)
, _flags(Qt::ItemIsSelectable | Qt::ItemIsEnabled)
- , _treeItemFlags(nullptr)
{}
bool AbstractTreeItem::newChild(AbstractTreeItem* item)
{}
bool AbstractTreeItem::newChild(AbstractTreeItem* item)
@@
-102,7
+101,7
@@
void AbstractTreeItem::removeAllChilds()
childIter = _childItems.begin();
while (childIter != _childItems.end()) {
child = *childIter;
childIter = _childItems.begin();
while (childIter != _childItems.end()) {
child = *childIter;
- child->setTreeItemFlags(
nullptr); // disable self deletion, as this would only fuck up consi
tency and the child gets deleted anyways
+ child->setTreeItemFlags(
{}); // disable self deletion, as this would only fuck up consis
tency and the child gets deleted anyways
child->removeAllChilds();
++childIter;
}
child->removeAllChilds();
++childIter;
}
@@
-518,7
+517,7
@@
void TreeModel::beginRemoveChilds(int firstRow, int lastRow)
disconnect(parentItem->child(i), nullptr, this, nullptr);
}
disconnect(parentItem->child(i), nullptr, this, nullptr);
}
- // consitency checks
+ // consi
s
tency checks
QModelIndex parent = indexByItem(parentItem);
Q_ASSERT(firstRow <= lastRow);
Q_ASSERT(parentItem->childCount() > lastRow);
QModelIndex parent = indexByItem(parentItem);
Q_ASSERT(firstRow <= lastRow);
Q_ASSERT(parentItem->childCount() > lastRow);