More improvements to encoding handling. There is now a server encoding that

[quassel.git] / src / common / ircchannel.cpp

diff --git a/src/common/ircchannel.cpp b/src/common/ircchannel.cpp
index 0587697..f5710ba 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);
 }


@@ -124,7 +125,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);
   }