projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moving InputLine (ex-ChannelWidgetInput) to uisupport, since we'll need
[quassel.git]
/
src
/
common
/
networkinfo.cpp
diff --git
a/src/common/networkinfo.cpp
b/src/common/networkinfo.cpp
index
75a45c0
..
0ef2f1f
100644
(file)
--- a/
src/common/networkinfo.cpp
+++ b/
src/common/networkinfo.cpp
@@
-183,6
+183,14
@@
IrcUser *NetworkInfo::newIrcUser(const QString &hostmask) {
return _ircUsers[nick];
}
return _ircUsers[nick];
}
+void NetworkInfo::removeIrcUser(QString nick) {
+ IrcUser *ircuser;
+ if((ircuser = ircUser(nick)) != 0) {
+ ircuser->deleteLater();
+ emit ircUserRemoved(nick);
+ }
+}
+
IrcUser *NetworkInfo::ircUser(const QString &nickname) const {
if(_ircUsers.contains(nickname))
return _ircUsers[nickname];
IrcUser *NetworkInfo::ircUser(const QString &nickname) const {
if(_ircUsers.contains(nickname))
return _ircUsers[nickname];
@@
-331,7
+339,9
@@
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);
- _ircUsers.remove(_ircUsers.key(ircuser));
+ QString nick = _ircUsers.key(ircuser);
+ _ircUsers.remove(nick);
+ emit ircUserRemoved(nick);
}
void NetworkInfo::channelDestroyed() {
}
void NetworkInfo::channelDestroyed() {
@@
-356,8
+366,8
@@
void NetworkInfo::determinePrefixes() {
_prefixes = PREFIX.section(")", 1);
_prefixModes = PREFIX.mid(1).section(")", 0, 0);
} else {
_prefixes = PREFIX.section(")", 1);
_prefixModes = PREFIX.mid(1).section(")", 0, 0);
} else {
- QString defaultPrefixes("@%+");
- QString defaultPrefixModes("ohv");
+ QString defaultPrefixes("
~&
@%+");
+ QString defaultPrefixModes("
qa
ohv");
// we just assume that in PREFIX are only prefix chars stored
for(int i = 0; i < defaultPrefixes.size(); i++) {
// we just assume that in PREFIX are only prefix chars stored
for(int i = 0; i < defaultPrefixes.size(); i++) {