projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use null QVariant instead of "ALL" for select limit on psql
[quassel.git]
/
src
/
common
/
ircchannel.cpp
diff --git
a/src/common/ircchannel.cpp
b/src/common/ircchannel.cpp
index
3fc3461
..
145a198
100644
(file)
--- a/
src/common/ircchannel.cpp
+++ b/
src/common/ircchannel.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
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 *
@@
-36,6
+36,7
@@
IrcChannel::IrcChannel(const QString &channelname, Network *network)
_initialized(false),
_name(channelname),
_topic(QString()),
_initialized(false),
_name(channelname),
_topic(QString()),
+ _encrypted(false),
_network(network),
_codecForEncoding(0),
_codecForDecoding(0)
_network(network),
_codecForEncoding(0),
_codecForDecoding(0)
@@
-96,7
+97,7
@@
QString IrcChannel::userModes(const QString &nick) const
void IrcChannel::setCodecForEncoding(const QString &name)
{
void IrcChannel::setCodecForEncoding(const QString &name)
{
- setCodecForEncoding(QTextCodec::codecForName(name.to
Ascii
()));
+ setCodecForEncoding(QTextCodec::codecForName(name.to
Latin1
()));
}
}
@@
-108,7
+109,7
@@
void IrcChannel::setCodecForEncoding(QTextCodec *codec)
void IrcChannel::setCodecForDecoding(const QString &name)
{
void IrcChannel::setCodecForDecoding(const QString &name)
{
- setCodecForDecoding(QTextCodec::codecForName(name.to
Ascii
()));
+ setCodecForDecoding(QTextCodec::codecForName(name.to
Latin1
()));
}
}
@@
-151,6
+152,13
@@
void IrcChannel::setPassword(const QString &password)
SYNC(ARG(password))
}
SYNC(ARG(password))
}
+void IrcChannel::setEncrypted(bool encrypted)
+{
+ _encrypted = encrypted;
+ SYNC(ARG(encrypted))
+ emit encryptedSet(encrypted);
+}
+
void IrcChannel::joinIrcUsers(const QList<IrcUser *> &users, const QStringList &modes)
{
void IrcChannel::joinIrcUsers(const QList<IrcUser *> &users, const QStringList &modes)
{