//connect(this, SIGNAL(disconnectFromIrc(QString)), network, SLOT(disconnectFromIrc(QString)));
//connect(this, SIGNAL(msgFromGui(uint, QString, QString)), network, SLOT(userInput(uint, QString, QString)));
- connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId)));
- connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(networkDisconnected(NetworkId)));
+ //connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId)));
+ //connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(networkDisconnected(NetworkId)));
signalProxy()->attachSignal(conn, SIGNAL(connected(NetworkId)), SIGNAL(networkConnected(NetworkId)));
signalProxy()->attachSignal(conn, SIGNAL(disconnected(NetworkId)), SIGNAL(networkDisconnected(NetworkId)));
}
Message msg(buf, type, text, sender, flags);
msg.setMsgId(Core::storeMessage(msg));
- Q_ASSERT(msg.msgId());
+ Q_ASSERT(msg.msgId() != 0);
emit displayMsg(msg);
}
QVariantMap v;
QVariantList bufs;
- foreach(BufferInfo id, buffers()) bufs << QVariant::fromValue(id);
+ foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
v["BufferInfos"] = bufs;
QVariantList networkids;
- foreach(NetworkId id, _networks.keys()) networkids << QVariant::fromValue(id);
+ foreach(NetworkId id, _networks.keys()) networkids << qVariantFromValue(id);
v["NetworkIds"] = networkids;
quint32 ircusercount = 0;
}
v["IrcUserCount"] = ircusercount;
v["IrcChannelCount"] = ircchannelcount;
- qDebug() << "nets:" << _networks.count() << " chans:" << ircchannelcount << " users:" << ircusercount;
QList<QVariant> idlist;
- foreach(Identity *i, _identities.values()) idlist << QVariant::fromValue<Identity>(*i);
+ foreach(Identity *i, _identities.values()) idlist << qVariantFromValue(*i);
v["Identities"] = idlist;
v["SessionData"] = sessionData;
// Send messages out in smaller packages - we don't want to make the signal data too large!
for(int i = 0; i < msglist.count(); i++) {
- log.append(QVariant::fromValue(msglist[i]));
+ log.append(qVariantFromValue(msglist[i]));
if(log.count() >= 5) {
emit backlogData(id, log, i >= msglist.count() - 1);
log.clear();