projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build with Qt-5.5
[quassel.git]
/
src
/
client
/
treemodel.cpp
diff --git
a/src/client/treemodel.cpp
b/src/client/treemodel.cpp
index
f599803
..
fd47bc0
100644
(file)
--- a/
src/client/treemodel.cpp
+++ b/
src/client/treemodel.cpp
@@
-556,10
+556,9
@@
void TreeModel::endAppendChilds()
ChildStatus cs = _childStatus;
#ifndef QT_NO_DEBUG
QModelIndex parent = indexByItem(parentItem);
ChildStatus cs = _childStatus;
#ifndef QT_NO_DEBUG
QModelIndex parent = indexByItem(parentItem);
-#endif
Q_ASSERT(cs.parent == parent);
Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);
Q_ASSERT(cs.parent == parent);
Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);
-
+#endif
_aboutToRemoveOrInsert = false;
for (int i = cs.start; i <= cs.end; i++) {
connectItem(parentItem->child(i));
_aboutToRemoveOrInsert = false;
for (int i = cs.start; i <= cs.end; i++) {
connectItem(parentItem->child(i));
@@
-605,9
+604,9
@@
void TreeModel::endRemoveChilds()
#ifndef QT_NO_DEBUG
ChildStatus cs = _childStatus;
QModelIndex parent = indexByItem(parentItem);
#ifndef QT_NO_DEBUG
ChildStatus cs = _childStatus;
QModelIndex parent = indexByItem(parentItem);
-#endif
Q_ASSERT(cs.parent == parent);
Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);
Q_ASSERT(cs.parent == parent);
Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);
+#endif
_aboutToRemoveOrInsert = false;
endRemoveRows();
_aboutToRemoveOrInsert = false;
endRemoveRows();