projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Making Quassel slowly ready for its first release...
[quassel.git]
/
src
/
common
/
networkinfo.cpp
diff --git
a/src/common/networkinfo.cpp
b/src/common/networkinfo.cpp
index
0ef2f1f
..
9f87721
100644
(file)
--- a/
src/common/networkinfo.cpp
+++ b/
src/common/networkinfo.cpp
@@
-1,11
+1,11
@@
/***************************************************************************
/***************************************************************************
- * 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 *
* 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 *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
@@
-183,12
+183,20
@@
IrcUser *NetworkInfo::newIrcUser(const QString &hostmask) {
return _ircUsers[nick];
}
return _ircUsers[nick];
}
+void NetworkInfo::removeIrcUser(IrcUser *ircuser) {
+ QString nick = _ircUsers.key(ircuser);
+ if(nick.isNull())
+ return;
+
+ _ircUsers.remove(nick);
+ ircuser->deleteLater();
+ emit ircUserRemoved(nick);
+}
+
void NetworkInfo::removeIrcUser(QString nick) {
IrcUser *ircuser;
void NetworkInfo::removeIrcUser(QString nick) {
IrcUser *ircuser;
- if((ircuser = ircUser(nick)) != 0) {
- ircuser->deleteLater();
- emit ircUserRemoved(nick);
- }
+ if((ircuser = ircUser(nick)) != 0)
+ removeIrcUser(ircuser);
}
IrcUser *NetworkInfo::ircUser(const QString &nickname) const {
}
IrcUser *NetworkInfo::ircUser(const QString &nickname) const {
@@
-339,9
+347,7
@@
void NetworkInfo::ircUserNickChanged(QString newnick) {
void NetworkInfo::ircUserDestroyed() {
IrcUser *ircuser = static_cast<IrcUser *>(sender());
Q_ASSERT(ircuser);
void NetworkInfo::ircUserDestroyed() {
IrcUser *ircuser = static_cast<IrcUser *>(sender());
Q_ASSERT(ircuser);
- QString nick = _ircUsers.key(ircuser);
- _ircUsers.remove(nick);
- emit ircUserRemoved(nick);
+ removeIrcUser(ircuser);
}
void NetworkInfo::channelDestroyed() {
}
void NetworkInfo::channelDestroyed() {