projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Core now remembers the channels you've joined if a disconnect happens, so you'll...
[quassel.git]
/
src
/
common
/
ircchannel.cpp
diff --git
a/src/common/ircchannel.cpp
b/src/common/ircchannel.cpp
index
0587697
..
832a5a9
100644
(file)
--- a/
src/common/ircchannel.cpp
+++ b/
src/common/ircchannel.cpp
@@
-33,12
+33,13
@@
#include <QDebug>
#include <QDebug>
-IrcChannel::IrcChannel(const QString &channelname, Network *network)
- : SyncableObject(network),
+IrcChannel::IrcChannel(const QString &channelname, Network *network) : SyncableObject(network),
_initialized(false),
_name(channelname),
_topic(QString()),
_initialized(false),
_name(channelname),
_topic(QString()),
- network(network)
+ network(network),
+ _codecForEncoding(0),
+ _codecForDecoding(0)
{
setObjectName(QString::number(network->networkId().toInt()) + "/" + channelname);
}
{
setObjectName(QString::number(network->networkId().toInt()) + "/" + channelname);
}
@@
-72,18
+73,6
@@
bool IrcChannel::isValidChannelUserMode(const QString &mode) const {
return isvalid;
}
return isvalid;
}
-QString IrcChannel::name() const {
- return _name;
-}
-
-QString IrcChannel::topic() const {
- return _topic;
-}
-
-QList<IrcUser *> IrcChannel::ircUsers() const {
- return _userModes.keys();
-}
-
QString IrcChannel::userModes(IrcUser *ircuser) const {
if(_userModes.contains(ircuser))
return _userModes[ircuser];
QString IrcChannel::userModes(IrcUser *ircuser) const {
if(_userModes.contains(ircuser))
return _userModes[ircuser];
@@
-95,10
+84,6
@@
QString IrcChannel::userModes(const QString &nick) const {
return userModes(network->ircUser(nick));
}
return userModes(network->ircUser(nick));
}
-QTextCodec *IrcChannel::codecForEncoding() const {
- return _codecForEncoding;
-}
-
void IrcChannel::setCodecForEncoding(const QString &name) {
setCodecForEncoding(QTextCodec::codecForName(name.toAscii()));
}
void IrcChannel::setCodecForEncoding(const QString &name) {
setCodecForEncoding(QTextCodec::codecForName(name.toAscii()));
}
@@
-107,10
+92,6
@@
void IrcChannel::setCodecForEncoding(QTextCodec *codec) {
_codecForEncoding = codec;
}
_codecForEncoding = codec;
}
-QTextCodec *IrcChannel::codecForDecoding() const {
- return _codecForDecoding;
-}
-
void IrcChannel::setCodecForDecoding(const QString &name) {
setCodecForDecoding(QTextCodec::codecForName(name.toAscii()));
}
void IrcChannel::setCodecForDecoding(const QString &name) {
setCodecForDecoding(QTextCodec::codecForName(name.toAscii()));
}
@@
-124,7
+105,7
@@
QString IrcChannel::decodeString(const QByteArray &text) const {
return ::decodeString(text, _codecForDecoding);
}
return ::decodeString(text, _codecForDecoding);
}
-QByteArray IrcChannel::encodeString(const QString string) const {
+QByteArray IrcChannel::encodeString(const QString
&
string) const {
if(codecForEncoding()) {
return _codecForEncoding->fromUnicode(string);
}
if(codecForEncoding()) {
return _codecForEncoding->fromUnicode(string);
}
@@
-139,6
+120,11
@@
void IrcChannel::setTopic(const QString &topic) {
emit topicSet(topic);
}
emit topicSet(topic);
}
+void IrcChannel::setPassword(const QString &password) {
+ _password = password;
+ emit passwordSet(password);
+}
+
void IrcChannel::join(IrcUser *ircuser) {
if(!_userModes.contains(ircuser) && ircuser) {
_userModes[ircuser] = QString();
void IrcChannel::join(IrcUser *ircuser) {
if(!_userModes.contains(ircuser) && ircuser) {
_userModes[ircuser] = QString();