#include "client.h"
-#include "networkinfo.h"
-#include "ircuser.h"
-#include "ircchannel.h"
-
-#include "message.h"
-
#include "bufferinfo.h"
#include "buffertreemodel.h"
+#include "global.h"
+#include "ircchannel.h"
+#include "ircuser.h"
+#include "message.h"
+#include "networkinfo.h"
#include "quasselui.h"
#include "signalproxy.h"
-#include "synchronizer.h"
#include "util.h"
QPointer<Client> Client::instanceptr = 0;
// FIXME switch to netids!
// WHEN IS THIS NEEDED ANYHOW!?
+// ...only for finding the Buffer for a channel, I guess...
BufferInfo Client::bufferInfo(QString net, QString buf) {
foreach(Buffer *buffer_, buffers()) {
BufferInfo bufferInfo = buffer_->bufferInfo();
- if(bufferInfo.network() == net && bufferInfo.buffer() == buf)
+ if(!bufferInfo.network().compare(net, Qt::CaseInsensitive) && !bufferInfo.buffer().compare(buf, Qt::CaseInsensitive))
return bufferInfo;
}
Q_ASSERT(false); // should never happen!
}
Client::~Client() {
+
}
void Client::init() {
socket = sock;
connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
- connect(sock, SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
connect(signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
- //connect(sock, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(coreSocketStateChanged(QAbstractSocket::SocketState)));
connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(coreSocketError(QAbstractSocket::SocketError)));
sock->connectToHost(conn["Host"].toString(), conn["Port"].toUInt());
}
void Client::disconnectFromCore() {
socket->close();
- if(clientMode == LocalCore) {
- coreSocketDisconnected();
- }
}
void Client::setCoreConfiguration(const QVariantMap &settings) {
/* Clear internal data. Hopefully nothing relies on it at this point. */
_bufferModel->clear();
- foreach(Buffer *buffer, _buffers.values()) {
+
+ QHash<uint, Buffer *>::iterator bufferIter = _buffers.begin();
+ while(bufferIter != _buffers.end()) {
+ Buffer *buffer = bufferIter.value();
+ disconnect(buffer, SIGNAL(destroyed()), this, 0);
+ bufferIter = _buffers.erase(bufferIter);
buffer->deleteLater();
}
- _buffers.clear();
+ Q_ASSERT(_buffers.isEmpty());
- foreach(NetworkInfo *networkinfo, _networkInfo.values()) {
- networkinfo->deleteLater();
+
+ QHash<uint, NetworkInfo*>::iterator netIter = _networkInfo.begin();
+ while(netIter != _networkInfo.end()) {
+ NetworkInfo *net = netIter.value();
+ disconnect(net, SIGNAL(destroyed()), this, 0);
+ netIter = _networkInfo.erase(netIter);
+ net->deleteLater();
}
- _networkInfo.clear();
+ Q_ASSERT(_networkInfo.isEmpty());
coreConnectionInfo.clear();
sessionData.clear();
layoutTimer->stop();
}
-void Client::coreSocketStateChanged(QAbstractSocket::SocketState state) {
- if(state == QAbstractSocket::UnconnectedState) coreSocketDisconnected();
-}
-
void Client::recvCoreState(const QVariant &state) {
disconnect(this, SIGNAL(recvPartialItem(uint, uint)), this, SIGNAL(coreConnectionProgress(uint, uint)));
disconnect(socket, 0, this, 0); // rest of communication happens through SignalProxy
foreach(QVariant networkid, networkids) {
networkConnected(networkid.toUInt());
}
-
+
instance()->connectedToCore = true;
updateCoreConnectionProgress();
}
emit coreConnectionProgress(1,1);
- emit connected(); // FIXME EgS: This caused the double backlog... but... we shouldn't be calling this whole function all the time...
-
+ emit connected();
foreach(NetworkInfo *net, networkInfos()) {
disconnect(net, 0, this, SLOT(updateCoreConnectionProgress()));
}
//Buffer *b = buffer(id);
//b->setActive(true);
- // FIXME EgS: do we really need to call updateCoreConnectionProgress whenever a new network is connected?
- NetworkInfo *netinfo = new NetworkInfo(netid, signalProxy(), this);
+ NetworkInfo *netinfo = new NetworkInfo(netid, this);
+ netinfo->setProxy(signalProxy());
+
if(!isConnected()) {
connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));
connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress()));
connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress()));
}
+ connect(netinfo, SIGNAL(ircChannelAdded(QString)), this, SLOT(ircChannelAdded(QString)));
connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkInfoDestroyed()));
_networkInfo[netid] = netinfo;
}
//buffer->displayMsg(Message(bufferid, Message::Server, tr("Server disconnected."))); FIXME
buffer->setActive(false);
}
-
+
Q_ASSERT(networkInfo(networkid));
if(!networkInfo(networkid)->initialized()) {
qDebug() << "Network" << networkid << "disconnected while not yet initialized!";
}
}
+void Client::ircChannelAdded(QString chanName) {
+ NetworkInfo *netInfo = qobject_cast<NetworkInfo*>(sender());
+ Q_ASSERT(netInfo);
+ Buffer *buf = buffer(bufferInfo(netInfo->networkName(), chanName));
+ Q_ASSERT(buf);
+ buf->setIrcChannel(netInfo->ircChannel(chanName));
+
+}
+
void Client::updateBufferInfo(BufferInfo id) {
buffer(id)->updateBufferInfo(id);
}