projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Since we're going for one grand unified model to store all the stuff
[quassel.git]
/
src
/
uisupport
/
bufferviewfilter.cpp
diff --git
a/src/uisupport/bufferviewfilter.cpp
b/src/uisupport/bufferviewfilter.cpp
index
4f9f767
..
9f0d4a1
100644
(file)
--- a/
src/uisupport/bufferviewfilter.cpp
+++ b/
src/uisupport/bufferviewfilter.cpp
@@
-58,10
+58,10
@@
bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action
if(parent != QModelIndex())
return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
if(parent != QModelIndex())
return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
- if(!
BufferTree
Model::mimeContainsBufferList(data))
+ if(!
Network
Model::mimeContainsBufferList(data))
return false;
return false;
- QList< QPair<uint, uint> > bufferList =
BufferTree
Model::mimeDataToBufferList(data);
+ QList< QPair<uint, uint> > bufferList =
Network
Model::mimeDataToBufferList(data);
uint netId, bufferId;
for(int i = 0; i < bufferList.count(); i++) {
uint netId, bufferId;
for(int i = 0; i < bufferList.count(); i++) {
@@
-90,8
+90,8
@@
void BufferViewFilter::removeBuffer(const QModelIndex &index) {
return; // only child elements can be deleted
bool lastBuffer = (rowCount(index.parent()) == 1);
return; // only child elements can be deleted
bool lastBuffer = (rowCount(index.parent()) == 1);
- uint netId = index.data(
BufferTree
Model::NetworkIdRole).toUInt();
- uint bufferuid = index.data(
BufferTree
Model::BufferUidRole).toUInt();
+ uint netId = index.data(
Network
Model::NetworkIdRole).toUInt();
+ uint bufferuid = index.data(
Network
Model::BufferUidRole).toUInt();
if(buffers.contains(bufferuid)) {
buffers.remove(bufferuid);
if(buffers.contains(bufferuid)) {
buffers.remove(bufferuid);
@@
-108,7
+108,7
@@
void BufferViewFilter::removeBuffer(const QModelIndex &index) {
bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
- Buffer::Type bufferType = (Buffer::Type) source_bufferIndex.data(
BufferTree
Model::BufferTypeRole).toInt();
+ Buffer::Type bufferType = (Buffer::Type) source_bufferIndex.data(
Network
Model::BufferTypeRole).toInt();
if((mode & NoChannels) && bufferType == Buffer::ChannelType)
return false;
if((mode & NoChannels) && bufferType == Buffer::ChannelType)
return false;
@@
-117,14
+117,14
@@
bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
if((mode & NoServers) && bufferType == Buffer::StatusType)
return false;
if((mode & NoServers) && bufferType == Buffer::StatusType)
return false;
-// bool isActive = source_bufferIndex.data(
BufferTree
Model::BufferActiveRole).toBool();
+// bool isActive = source_bufferIndex.data(
Network
Model::BufferActiveRole).toBool();
// if((mode & NoActive) && isActive)
// return false;
// if((mode & NoInactive) && !isActive)
// return false;
if((mode & FullCustom)) {
// if((mode & NoActive) && isActive)
// return false;
// if((mode & NoInactive) && !isActive)
// return false;
if((mode & FullCustom)) {
- uint bufferuid = source_bufferIndex.data(
BufferTree
Model::BufferUidRole).toUInt();
+ uint bufferuid = source_bufferIndex.data(
Network
Model::BufferUidRole).toUInt();
return buffers.contains(bufferuid);
}
return buffers.contains(bufferuid);
}
@@
-132,7
+132,7
@@
bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
}
bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const {
}
bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const {
- uint net = source_index.data(
BufferTree
Model::NetworkIdRole).toUInt();
+ uint net = source_index.data(
Network
Model::NetworkIdRole).toUInt();
return !((mode & (SomeNets | FullCustom)) && !networks.contains(net));
}
return !((mode & (SomeNets | FullCustom)) && !networks.contains(net));
}
@@
-151,8
+151,8
@@
bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &sourc
}
bool BufferViewFilter::lessThan(const QModelIndex &left, const QModelIndex &right) const {
}
bool BufferViewFilter::lessThan(const QModelIndex &left, const QModelIndex &right) const {
- int lefttype = left.data(
BufferTree
Model::BufferTypeRole).toInt();
- int righttype = right.data(
BufferTree
Model::BufferTypeRole).toInt();
+ int lefttype = left.data(
Network
Model::BufferTypeRole).toInt();
+ int righttype = right.data(
Network
Model::BufferTypeRole).toInt();
if(lefttype != righttype)
return lefttype < righttype;
if(lefttype != righttype)
return lefttype < righttype;