projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #72 from jpnurmi/datastream
[quassel.git]
/
src
/
uisupport
/
bufferview.cpp
diff --git
a/src/uisupport/bufferview.cpp
b/src/uisupport/bufferview.cpp
index
d48d7c4
..
167d6b9
100644
(file)
--- a/
src/uisupport/bufferview.cpp
+++ b/
src/uisupport/bufferview.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
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 *
@@
-392,10
+392,15
@@
void BufferView::setExpandedState(const QModelIndex &networkIdx)
storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
}
storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
}
-
+#if QT_VERSION < 0x050000
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
{
QTreeView::dataChanged(topLeft, bottomRight);
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
{
QTreeView::dataChanged(topLeft, bottomRight);
+#else
+void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
+{
+ QTreeView::dataChanged(topLeft, bottomRight, roles);
+#endif
// determine how many items have been changed and if any of them is a networkitem
// which just swichted from active to inactive or vice versa
// determine how many items have been changed and if any of them is a networkitem
// which just swichted from active to inactive or vice versa