DEPMOD = common
QT_MOD = core network gui # gui is needed just for QColor... FIXME!
-SRCS += buffer.cpp buffertreemodel.cpp client.cpp clientsettings.cpp mappedselectionmodel.cpp modelpropertymapper.cpp \
+SRCS += buffer.cpp networkmodel.cpp client.cpp clientsettings.cpp mappedselectionmodel.cpp modelpropertymapper.cpp \
nickmodel.cpp selectionmodelsynchronizer.cpp treemodel.cpp
-HDRS += buffer.h buffertreemodel.h client.h clientsettings.h quasselui.h mappedselectionmodel.h modelpropertymapper.h \
+HDRS += buffer.h networkmodel.h client.h clientsettings.h quasselui.h mappedselectionmodel.h modelpropertymapper.h \
nickmodel.h selectionmodelsynchronizer.h treemodel.h
#include <QColor> // FIXME Dependency on QtGui!
-#include "buffertreemodel.h"
+#include "networkmodel.h"
#include "mappedselectionmodel.h"
#include <QAbstractItemView>
#include "qtopiamainwin.h"
-#include "buffertreemodel.h"
+#include "networkmodel.h"
#include "bufferviewwidget.h"
#include "nicklistwidget.h"
#include "chatline.h"
mainWidget = new MainWidget(this);
setCentralWidget(mainWidget);
- BufferTreeModel *model = Client::bufferModel();
+ NetworkModel *model = Client::networkModel();
connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
toolBar = new QToolBar(this);
// FIXME just for testing: select first available buffer
if(Client::allBufferInfos().count() > 1) {
Buffer *b = Client::buffer(Client::allBufferInfos()[1]);
- Client::bufferModel()->selectBuffer(b);
+ Client::networkModel()->selectBuffer(b);
}
#endif
}
#include "client.h"
#include "buffer.h"
#include "bufferview.h"
-#include "buffertreemodel.h"
+#include "networkmodel.h"
/*****************************************
* The TreeView showing the Buffers
}
void BufferView::joinChannel(const QModelIndex &index) {
- Buffer::Type bufferType = (Buffer::Type)index.data(BufferTreeModel::BufferTypeRole).toInt();
+ Buffer::Type bufferType = (Buffer::Type)index.data(NetworkModel::BufferTypeRole).toInt();
if(bufferType != Buffer::ChannelType)
return;
- Client::fakeInput(index.data(BufferTreeModel::BufferUidRole).toUInt(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
+ Client::fakeInput(index.data(NetworkModel::BufferUidRole).toUInt(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
}
void BufferView::keyPressEvent(QKeyEvent *event) {
#include "bufferviewfilter.h"
+#include "networkmodel.h"
+
/*****************************************
* The Filter for the Tree View
*****************************************/
#include <QSortFilterProxyModel>
#include <QSet>
#include "buffer.h"
-#include "buffertreemodel.h"
/*****************************************
* Buffer View Filter