projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #146 from benapetr/master
[quassel.git]
/
src
/
common
/
ircuser.cpp
diff --git
a/src/common/ircuser.cpp
b/src/common/ircuser.cpp
index
b9f359e
..
543f2b7
100644
(file)
--- a/
src/common/ircuser.cpp
+++ b/
src/common/ircuser.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
5
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 *
@@
-42,6
+42,7
@@
IrcUser::IrcUser(const QString &hostmask, Network *network) : SyncableObject(net
_ircOperator(),
_lastAwayMessage(0),
_whoisServiceReply(),
_ircOperator(),
_lastAwayMessage(0),
_whoisServiceReply(),
+ _encrypted(false),
_network(network),
_codecForEncoding(0),
_codecForDecoding(0)
_network(network),
_codecForEncoding(0),
_codecForDecoding(0)
@@
-86,7
+87,7
@@
QStringList IrcUser::channels() const
void IrcUser::setCodecForEncoding(const QString &name)
{
void IrcUser::setCodecForEncoding(const QString &name)
{
- setCodecForEncoding(QTextCodec::codecForName(name.to
Ascii
()));
+ setCodecForEncoding(QTextCodec::codecForName(name.to
Latin1
()));
}
}
@@
-98,7
+99,7
@@
void IrcUser::setCodecForEncoding(QTextCodec *codec)
void IrcUser::setCodecForDecoding(const QString &name)
{
void IrcUser::setCodecForDecoding(const QString &name)
{
- setCodecForDecoding(QTextCodec::codecForName(name.to
Ascii
()));
+ setCodecForDecoding(QTextCodec::codecForName(name.to
Latin1
()));
}
}
@@
-248,6
+249,14
@@
void IrcUser::setSuserHost(const QString &suserHost)
}
}
+void IrcUser::setEncrypted(bool encrypted)
+{
+ _encrypted = encrypted;
+ emit encryptedSet(encrypted);
+ SYNC(ARG(encrypted))
+}
+
+
void IrcUser::updateObjectName()
{
renameObject(QString::number(network()->networkId().toInt()) + "/" + _nick);
void IrcUser::updateObjectName()
{
renameObject(QString::number(network()->networkId().toInt()) + "/" + _nick);