}
IrcUser *NetworkInfo::newIrcUser(const QString &hostmask) {
- QString nick(nickFromMask(hostmask));
+ QString nick(nickFromMask(hostmask).toLower());
if(!_ircUsers.contains(nick)) {
IrcUser *ircuser = new IrcUser(hostmask, this);
// mark IrcUser as already initialized to keep the SignalProxy from requesting initData
_ircUsers[nick] = ircuser;
emit ircUserAdded(hostmask);
}
- return _ircUsers[nick];
+ return _ircUsers[nick];
}
void NetworkInfo::removeIrcUser(IrcUser *ircuser) {
removeIrcUser(ircuser);
}
-IrcUser *NetworkInfo::ircUser(const QString &nickname) const {
+IrcUser *NetworkInfo::ircUser(QString nickname) const {
+ nickname = nickname.toLower();
if(_ircUsers.contains(nickname))
return _ircUsers[nickname];
else
return _ircUsers.values();
}
-IrcChannel *NetworkInfo::newIrcChannel(QString channelname) {
- channelname = channelname.toLower();
- if(!_ircChannels.contains(channelname)) {
+IrcChannel *NetworkInfo::newIrcChannel(const QString &channelname) {
+ if(!_ircChannels.contains(channelname.toLower())) {
IrcChannel *channel = new IrcChannel(channelname, this);
// mark IrcUser as already initialized to keep the SignalProxy from requesting initData
if(initialized())
connect(channel, SIGNAL(initDone()), this, SIGNAL(ircChannelInitDone()));
connect(channel, SIGNAL(destroyed()), this, SLOT(channelDestroyed()));
- _ircChannels[channelname] = channel;
+ _ircChannels[channelname.toLower()] = channel;
emit ircChannelAdded(channelname);
}
- return _ircChannels[channelname];
+ return _ircChannels[channelname.toLower()];
}
void NetworkInfo::ircUserNickChanged(QString newnick) {
QString oldnick = _ircUsers.key(qobject_cast<IrcUser*>(sender()));
-
+
if(oldnick.isNull())
return;
- _ircUsers[newnick] = _ircUsers.take(oldnick);
+ _ircUsers[newnick.toLower()] = _ircUsers.take(oldnick);
if(myNick() == oldnick)
setMyNick(newnick);