X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetworkinfo.h;h=093cb43c1be0013503bd91a6d2134e778493f342;hp=278053d5be7fe9b8052984929aea0030aef87e77;hb=c6df551bf5d6b2f33daa5235d320239fcca37688;hpb=00052de200f8b5f149a486cff1fb4623e1b99ed7

diff --git a/src/common/networkinfo.h b/src/common/networkinfo.h
index 278053d5..093cb43c 100644
--- a/src/common/networkinfo.h
+++ b/src/common/networkinfo.h
@@ -28,6 +28,8 @@
 #include <QVariantMap>
 #include <QPointer>
 
+#include "types.h"
+
 class SignalProxy;
 class IrcUser;
 class IrcChannel;
@@ -44,12 +46,12 @@ public:
   NetworkInfo(const uint &networkid, QObject *parent = 0);
   //virtual ~NetworkInfo();
 
-  uint networkId() const;
+  NetworkId networkId() const;
   bool initialized() const;
 
   SignalProxy *proxy() const;
   void setProxy(SignalProxy *proxy);
-  
+
   bool isMyNick(const QString &nick) const;
   bool isMyNick(IrcUser *ircuser) const;
 
@@ -59,7 +61,7 @@ public:
   QString prefixToMode(const QCharRef &prefix);
   QString modeToPrefix(const QString &mode);
   QString modeToPrefix(const QCharRef &mode);
-  
+
   QString networkName() const;
   QString currentServer() const;
   QString myNick() const;
@@ -71,15 +73,30 @@ public:
 
   bool supports(const QString &param) const;
   QString support(const QString &param) const;
-  
+
   IrcUser *newIrcUser(const QString &hostmask);
-  IrcUser *ircUser(const QString &nickname) const;
+  IrcUser *newIrcUser(const QByteArray &hostmask);
+  IrcUser *ircUser(QString nickname) const;
+  IrcUser *ircUser(const QByteArray &nickname) const;
   QList<IrcUser *> ircUsers() const;
-  
-  IrcChannel *newIrcChannel(QString channelname);
+
+  IrcChannel *newIrcChannel(const QString &channelname);
+  IrcChannel *newIrcChannel(const QByteArray &channelname);
   IrcChannel *ircChannel(QString channelname);
+  IrcChannel *ircChannel(const QByteArray &channelname);
+  
   QList<IrcChannel *> ircChannels() const;
 
+  QTextCodec *codecForEncoding() const;
+  QTextCodec *codecForDecoding() const;
+  void setCodecForEncoding(const QString &codecName);
+  void setCodecForEncoding(QTextCodec *codec);
+  void setCodecForDecoding(const QString &codecName);
+  void setCodecForDecoding(QTextCodec *codec);
+
+  QString decodeString(const QByteArray &text) const;
+  QByteArray encodeString(const QString string) const;
+
 public slots:
   void setNetworkName(const QString &networkName);
   void setCurrentServer(const QString &currentServer);
@@ -151,6 +168,9 @@ private:
   QPointer<SignalProxy> _proxy;
   void determinePrefixes();
 
+  QTextCodec *_codecForEncoding;
+  QTextCodec *_codecForDecoding;
+
 };
 
 #endif