X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetworkinfo.h;h=2caa4dc9960153452facfb70acc4b7b246debc68;hp=e27c66b4d8a58c2e48be8d6534a764d8c719e642;hb=b797e5f581b10a517c30f78cb53f813af741e261;hpb=27be9c5a706bf690921617bf66614c4479550c4d

diff --git a/src/common/networkinfo.h b/src/common/networkinfo.h
index e27c66b4..2caa4dc9 100644
--- a/src/common/networkinfo.h
+++ b/src/common/networkinfo.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -28,12 +28,15 @@
 #include <QVariantMap>
 #include <QPointer>
 
+#include "types.h"
+#include "syncableobject.h"
+
 class SignalProxy;
 class IrcUser;
 class IrcChannel;
 
 
-class NetworkInfo : public QObject {
+class NetworkInfo : public SyncableObject {
   Q_OBJECT
 
   Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName STORED false)
@@ -44,12 +47,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 +62,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 +74,30 @@ public:
 
   bool supports(const QString &param) const;
   QString support(const QString &param) const;
-  
+
   IrcUser *newIrcUser(const QString &hostmask);
+  IrcUser *newIrcUser(const QByteArray &hostmask);
   IrcUser *ircUser(QString nickname) const;
+  IrcUser *ircUser(const QByteArray &nickname) const;
   QList<IrcUser *> ircUsers() const;
-  
+
   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 +169,9 @@ private:
   QPointer<SignalProxy> _proxy;
   void determinePrefixes();
 
+  QTextCodec *_codecForEncoding;
+  QTextCodec *_codecForDecoding;
+
 };
 
 #endif