#include <QColor> // FIXME Dependency on QtGui!
-#include "client.h"
#include "buffertreemodel.h"
+
+#include "bufferinfo.h"
+#include "client.h"
#include "signalproxy.h"
/*****************************************
}
uint BufferTreeItem::id() const {
- return buf->bufferId().uid();
+ return buf->bufferInfo().uid();
}
void BufferTreeItem::setActivity(const Buffer::ActivityLevel &level) {
return buf->bufferType();
case BufferTreeModel::BufferActiveRole:
return buf->isActive();
- case BufferTreeModel::BufferIdRole:
- return buf->bufferId().uid();
+ case BufferTreeModel::BufferInfoRole:
+ return buf->bufferInfo().uid();
default:
return QVariant();
}
BufferTreeModel::BufferTreeModel(QObject *parent)
: TreeModel(BufferTreeModel::defaultHeader(), parent)
{
- Client::signalProxy()->attachSignal(this, SIGNAL(fakeUserInput(BufferId, QString)), SIGNAL(sendInput(BufferId, QString)));
+ Client::signalProxy()->attachSignal(this, SIGNAL(fakeUserInput(BufferInfo, QString)), SIGNAL(sendInput(BufferInfo, QString)));
}
QList<QVariant >BufferTreeModel::defaultHeader() {
QString net = buffer->networkName();
TreeItem *networkItem;
- if(not(networkItem = rootItem->childById(qHash(net)))) {
+ if(!(networkItem = rootItem->childById(qHash(net)))) {
int nextRow = rootItem->childCount();
networkItem = new NetworkTreeItem(net, rootItem);
NetworkTreeItem *networkItem = static_cast<NetworkTreeItem*>(networkItemIndex.internalPointer());
TreeItem *bufferItem;
- if(not(bufferItem = networkItem->childById(buffer->bufferId().uid()))) {
+ if(!(bufferItem = networkItem->childById(buffer->bufferInfo().uid()))) {
int nextRow = networkItem->childCount();
bufferItem = new BufferTreeItem(buffer, networkItem);
QStringList types;
types << "application/Quassel/BufferItem/row"
<< "application/Quassel/BufferItem/network"
- << "application/Quassel/BufferItem/bufferId";
+ << "application/Quassel/BufferItem/bufferInfo";
return types;
}
mimeData->setData("application/Quassel/BufferItem/row", QByteArray::number(index.row()));
mimeData->setData("application/Quassel/BufferItem/network", getBufferByIndex(index)->networkName().toUtf8());
- mimeData->setData("application/Quassel/BufferItem/bufferId", QByteArray::number(getBufferByIndex(index)->bufferId().uid()));
+ mimeData->setData("application/Quassel/BufferItem/bufferInfo", QByteArray::number(getBufferByIndex(index)->bufferInfo().uid()));
return mimeData;
}
if(isBufferIndex(clicked)) {
Buffer *buffer = getBufferByIndex(clicked);
if(!buffer->isStatusBuffer())
- emit fakeUserInput(buffer->bufferId(), QString("/join " + buffer->bufferName()));
+ emit fakeUserInput(buffer->bufferInfo(), QString("/join " + buffer->bufferName()));
}
}
void BufferTreeModel::selectBuffer(Buffer *buffer) {
QModelIndex index = getOrCreateBufferItemIndex(buffer);
- emit selectionChanged(index);
+ //emit selectionChanged(index);
+ changeCurrent(index, QModelIndex());
}
-
-