projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clang-tidy: Avoid potential memory leak in QtUi
[quassel.git]
/
src
/
client
/
treemodel.cpp
diff --git
a/src/client/treemodel.cpp
b/src/client/treemodel.cpp
index
3360199
..
a8cd86b
100644
(file)
--- a/
src/client/treemodel.cpp
+++ b/
src/client/treemodel.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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 *
@@
-105,7
+105,7
@@
void AbstractTreeItem::removeAllChilds()
child = *childIter;
child->setTreeItemFlags(0); // disable self deletion, as this would only fuck up consitency and the child gets deleted anyways
child->removeAllChilds();
child = *childIter;
child->setTreeItemFlags(0); // disable self deletion, as this would only fuck up consitency and the child gets deleted anyways
child->removeAllChilds();
-
childIter++
;
+
++childIter
;
}
emit beginRemoveChilds(0, numChilds - 1);
}
emit beginRemoveChilds(0, numChilds - 1);
@@
-220,7
+220,7
@@
void AbstractTreeItem::dumpChildList()
while (childIter != _childItems.constEnd()) {
child = *childIter;
qDebug() << "Row:" << child->row() << child << child->data(0, Qt::DisplayRole);
while (childIter != _childItems.constEnd()) {
child = *childIter;
qDebug() << "Row:" << child->row() << child << child->data(0, Qt::DisplayRole);
-
childIter++
;
+
++childIter
;
}
}
qDebug() << "==== End Of Childlist ====";
}
}
qDebug() << "==== End Of Childlist ====";
@@
-275,21
+275,8
@@
int SimpleTreeItem::columnCount() const
/*****************************************
* PropertyMapItem
*****************************************/
/*****************************************
* PropertyMapItem
*****************************************/
-PropertyMapItem::PropertyMapItem(const QStringList &propertyOrder, AbstractTreeItem *parent)
- : AbstractTreeItem(parent),
- _propertyOrder(propertyOrder)
-{
-}
-
-
PropertyMapItem::PropertyMapItem(AbstractTreeItem *parent)
PropertyMapItem::PropertyMapItem(AbstractTreeItem *parent)
- : AbstractTreeItem(parent),
- _propertyOrder(QStringList())
-{
-}
-
-
-PropertyMapItem::~PropertyMapItem()
+ : AbstractTreeItem(parent)
{
}
{
}
@@
-304,7
+291,7
@@
QVariant PropertyMapItem::data(int column, int role) const
return toolTip(column);
case Qt::DisplayRole:
case TreeModel::SortRole: // fallthrough, since SortRole should default to DisplayRole
return toolTip(column);
case Qt::DisplayRole:
case TreeModel::SortRole: // fallthrough, since SortRole should default to DisplayRole
- return property(
_propertyOrder
[column].toLatin1());
+ return property(
propertyOrder()
[column].toLatin1());
default:
return QVariant();
}
default:
return QVariant();
}
@@
-316,20
+303,15
@@
bool PropertyMapItem::setData(int column, const QVariant &value, int role)
if (column >= columnCount() || role != Qt::DisplayRole)
return false;
if (column >= columnCount() || role != Qt::DisplayRole)
return false;
+ setProperty(propertyOrder()[column].toLatin1(), value);
emit dataChanged(column);
emit dataChanged(column);
- return
setProperty(_propertyOrder[column].toLatin1(), value)
;
+ return
true
;
}
int PropertyMapItem::columnCount() const
{
}
int PropertyMapItem::columnCount() const
{
- return _propertyOrder.count();
-}
-
-
-void PropertyMapItem::appendProperty(const QString &property)
-{
- _propertyOrder << property;
+ return propertyOrder().count();
}
}
@@
-556,10
+538,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
+586,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();