/***************************************************************************
- * Copyright (C) 2005-07 by The Quassel Team *
+ * Copyright (C) 2005-07 by the Quassel IRC Team *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
+ * (at your option) version 3. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#include "client.h"
#include "bufferinfo.h"
-#include "buffertreemodel.h"
#include "global.h"
#include "ircchannel.h"
#include "ircuser.h"
#include "message.h"
#include "networkinfo.h"
+#include "networkmodel.h"
#include "quasselui.h"
#include "signalproxy.h"
#include "util.h"
return bufferInfo(net, "");
}
-BufferTreeModel *Client::bufferModel() {
- return instance()->_bufferModel;
+NetworkModel *Client::networkModel() {
+ return instance()->_networkModel;
}
SignalProxy *Client::signalProxy() {
socket(0),
_signalProxy(new SignalProxy(SignalProxy::Client, this)),
mainUi(0),
- _bufferModel(0),
+ _networkModel(0),
connectedToCore(false)
{
}
void Client::init() {
blockSize = 0;
- _bufferModel = new BufferTreeModel(this);
+ _networkModel = new NetworkModel(this);
connect(this, SIGNAL(bufferSelected(Buffer *)),
- _bufferModel, SLOT(selectBuffer(Buffer *)));
+ _networkModel, SLOT(selectBuffer(Buffer *)));
connect(this, SIGNAL(bufferUpdated(Buffer *)),
- _bufferModel, SLOT(bufferUpdated(Buffer *)));
+ _networkModel, SLOT(bufferUpdated(Buffer *)));
connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)),
- _bufferModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
+ _networkModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
SignalProxy *p = signalProxy();
p->attachSignal(this, SIGNAL(sendSessionData(const QString &, const QVariant &)),
}
void Client::setCoreConfiguration(const QVariantMap &settings) {
- writeDataToDevice(socket, settings);
+ SignalProxy::writeDataToDevice(socket, settings);
}
void Client::coreSocketConnected() {
clientInit["GuiProtocol"] = GUI_PROTOCOL;
clientInit["User"] = coreConnectionInfo["User"].toString();
clientInit["Password"] = coreConnectionInfo["Password"].toString();
- writeDataToDevice(socket, clientInit);
+ SignalProxy::writeDataToDevice(socket, clientInit);
}
void Client::coreSocketDisconnected() {
blockSize = 0;
/* Clear internal data. Hopefully nothing relies on it at this point. */
- _bufferModel->clear();
+ _networkModel->clear();
QHash<uint, Buffer *>::iterator bufferIter = _buffers.begin();
while(bufferIter != _buffers.end()) {
void Client::coreHasData() {
QVariant item;
- if(readDataFromDevice(socket, blockSize, item)) {
+ if(SignalProxy::readDataFromDevice(socket, blockSize, item)) {
emit recvPartialItem(1,1);
QVariantMap msg = item.toMap();
if (!msg["StartWizard"].toBool()) {
NetworkInfo *netinfo = new NetworkInfo(netid, this);
netinfo->setProxy(signalProxy());
+ networkModel()->attachNetworkInfo(netinfo);
if(!isConnected()) {
connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));