projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yet another protocol break (I warned you...).
[quassel.git]
/
src
/
common
/
ircuser.cpp
diff --git
a/src/common/ircuser.cpp
b/src/common/ircuser.cpp
index
64f5d32
..
4c12580
100644
(file)
--- a/
src/common/ircuser.cpp
+++ b/
src/common/ircuser.cpp
@@
-28,8
+28,7
@@
#include <QTextCodec>
#include <QDebug>
#include <QTextCodec>
#include <QDebug>
-IrcUser::IrcUser(const QString &hostmask, Network *network)
- : SyncableObject(network),
+IrcUser::IrcUser(const QString &hostmask, Network *network) : SyncableObject(network),
_initialized(false),
_nick(nickFromMask(hostmask)),
_user(userFromMask(hostmask)),
_initialized(false),
_nick(nickFromMask(hostmask)),
_user(userFromMask(hostmask)),
@@
-145,7
+144,7
@@
QString IrcUser::decodeString(const QByteArray &text) const {
return ::decodeString(text, codecForDecoding());
}
return ::decodeString(text, codecForDecoding());
}
-QByteArray IrcUser::encodeString(const QString string) const {
+QByteArray IrcUser::encodeString(const QString
&
string) const {
if(codecForEncoding()) {
return codecForEncoding()->fromUnicode(string);
}
if(codecForEncoding()) {
return codecForEncoding()->fromUnicode(string);
}
@@
-227,12
+226,7
@@
void IrcUser::setNick(const QString &nick) {
}
void IrcUser::updateObjectName() {
}
void IrcUser::updateObjectName() {
- QString newName = QString::number(network()->networkId().toInt()) + "/" + _nick;
- QString oldName = objectName();
- if(oldName != newName) {
- setObjectName(newName);
- emit renameObject(oldName, newName);
- }
+ renameObject(QString::number(network()->networkId().toInt()) + "/" + _nick);
}
void IrcUser::updateHostmask(const QString &mask) {
}
void IrcUser::updateHostmask(const QString &mask) {
@@
-249,9
+243,8
@@
void IrcUser::joinChannel(IrcChannel *channel) {
Q_ASSERT(channel);
if(!_channels.contains(channel)) {
_channels.insert(channel);
Q_ASSERT(channel);
if(!_channels.contains(channel)) {
_channels.insert(channel);
- channel->join(this);
+ channel->join
IrcUsers
(this);
connect(channel, SIGNAL(destroyed()), this, SLOT(channelDestroyed()));
connect(channel, SIGNAL(destroyed()), this, SLOT(channelDestroyed()));
- emit channelJoined(channel->name());
}
}
}
}
@@
-265,6
+258,8
@@
void IrcUser::partChannel(IrcChannel *channel) {
disconnect(channel, 0, this, 0);
channel->part(this);
emit channelParted(channel->name());
disconnect(channel, 0, this, 0);
channel->part(this);
emit channelParted(channel->name());
+ if(_channels.isEmpty() && network()->isMe(this))
+ deleteLater();
}
}
}
}
@@
-280,10
+275,10
@@
void IrcUser::partChannel(const QString &channelname) {
void IrcUser::channelDestroyed() {
// private slot!
IrcChannel *channel = static_cast<IrcChannel*>(sender());
void IrcUser::channelDestroyed() {
// private slot!
IrcChannel *channel = static_cast<IrcChannel*>(sender());
- Q_ASSERT(channel);
if(_channels.contains(channel)) {
_channels.remove(channel);
if(_channels.contains(channel)) {
_channels.remove(channel);
- disconnect(channel, 0, this, 0);
+ if(_channels.isEmpty())
+ deleteLater();
}
}
}
}