#include "buffertreemodel.h"
#include "quasselui.h"
#include "signalproxy.h"
-#include "synchronizer.h"
#include "util.h"
QPointer<Client> Client::instanceptr = 0;
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();
- }
- _networkInfo.clear();
+ 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();
+ }
+ Q_ASSERT(_networkInfo.isEmpty());
+
coreConnectionInfo.clear();
sessionData.clear();
layoutQueue.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();
+
}
void Client::updateCoreConnectionProgress() {
emit coreConnectionProgress(1,1);
emit connected();
-
foreach(NetworkInfo *net, networkInfos()) {
disconnect(net, 0, this, SLOT(updateCoreConnectionProgress()));
}
-
+
// signalProxy()->dumpProxyStats();
}
//Buffer *b = buffer(id);
//b->setActive(true);
- NetworkInfo *netinfo = new NetworkInfo(netid, signalProxy(), this);
- connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));
- connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress()));
- connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress()));
+ 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(destroyed()), this, SLOT(networkInfoDestroyed()));
_networkInfo[netid] = netinfo;
}