projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement UI and serialization logic for sender modes
[quassel.git]
/
src
/
common
/
ircchannel.cpp
diff --git
a/src/common/ircchannel.cpp
b/src/common/ircchannel.cpp
index
6673a79
..
c759e1d
100644
(file)
--- a/
src/common/ircchannel.cpp
+++ b/
src/common/ircchannel.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-198,9
+198,6
@@
void IrcChannel::joinIrcUsers(const QList<IrcUser *> &users, const QStringList &
// If you wonder why there is no counterpart to ircUserJoined:
// the joins are propagated by the ircuser. The signal ircUserJoined is only for convenience
// If you wonder why there is no counterpart to ircUserJoined:
// the joins are propagated by the ircuser. The signal ircUserJoined is only for convenience
- // Also update the IRC user's record of modes; this allows easier tracking
- ircuser->addUserModes(modes[i]);
-
newNicks << ircuser->nick();
newModes << modes[i];
newUsers << ircuser;
newNicks << ircuser->nick();
newModes << modes[i];
newUsers << ircuser;
@@
-291,8
+288,6
@@
void IrcChannel::addUserMode(IrcUser *ircuser, const QString &mode)
if (!_userModes[ircuser].contains(mode)) {
_userModes[ircuser] += mode;
if (!_userModes[ircuser].contains(mode)) {
_userModes[ircuser] += mode;
- // Also update the IRC user's record of modes; this allows easier tracking
- ircuser->addUserModes(mode);
QString nick = ircuser->nick();
SYNC_OTHER(addUserMode, ARG(nick), ARG(mode))
emit ircUserModeAdded(ircuser, mode);
QString nick = ircuser->nick();
SYNC_OTHER(addUserMode, ARG(nick), ARG(mode))
emit ircUserModeAdded(ircuser, mode);
@@
-314,8
+309,6
@@
void IrcChannel::removeUserMode(IrcUser *ircuser, const QString &mode)
if (_userModes[ircuser].contains(mode)) {
_userModes[ircuser].remove(mode);
if (_userModes[ircuser].contains(mode)) {
_userModes[ircuser].remove(mode);
- // Also update the IRC user's record of modes; this allows easier tracking
- ircuser->removeUserModes(mode);
QString nick = ircuser->nick();
SYNC_OTHER(removeUserMode, ARG(nick), ARG(mode));
emit ircUserModeRemoved(ircuser, mode);
QString nick = ircuser->nick();
SYNC_OTHER(removeUserMode, ARG(nick), ARG(mode));
emit ircUserModeRemoved(ircuser, mode);
@@
-562,9
+555,8
@@
bool IrcChannel::hasMode(const QChar &mode) const
return _C_channelModes.contains(mode);
case Network::D_CHANMODE:
return _D_channelModes.contains(mode);
return _C_channelModes.contains(mode);
case Network::D_CHANMODE:
return _D_channelModes.contains(mode);
- default:
- return false;
}
}
+ return false;
}
}
@@
-597,9
+589,11
@@
QStringList IrcChannel::modeValueList(const QChar &mode) const
case Network::A_CHANMODE:
if (_A_channelModes.contains(mode))
return _A_channelModes[mode];
case Network::A_CHANMODE:
if (_A_channelModes.contains(mode))
return _A_channelModes[mode];
+ break;
default:
default:
-
return QStringList()
;
+ ;
}
}
+ return {};
}
}