X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=255d3ec42e86146356e7f58d13ff72db962f13b7;hp=80131fac206f96a6e13a1f9a1ff3e19bd2194fd2;hb=c5cbe5eb77fce2ab954a98399a1450803108217b;hpb=23eed68958b7585552be04fab4e5871a781b7f38

diff --git a/src/common/network.h b/src/common/network.h
index 80131fac..255d3ec4 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -37,6 +37,9 @@ class SignalProxy;
 class IrcUser;
 class IrcChannel;
 
+// defined below!
+struct NetworkInfo;
+
 // TODO: ConnectionInfo to propagate and sync the current state of NetworkConnection, encodings etcpp
 
 class Network : public SyncableObject {
@@ -52,7 +55,7 @@ class Network : public SyncableObject {
 
 public:
   Network(const NetworkId &networkid, QObject *parent = 0);
-  //virtual ~Network();
+  // ~Network();
 
   NetworkId networkId() const;
 
@@ -79,6 +82,9 @@ public:
   QStringList channels() const;
   QList<QVariantMap> serverList() const;
 
+  NetworkInfo networkInfo() const;
+  void setNetworkInfo(const NetworkInfo &);
+
   QString prefixes();
   QString prefixModes();
 
@@ -94,8 +100,8 @@ public:
 
   IrcChannel *newIrcChannel(const QString &channelname);
   IrcChannel *newIrcChannel(const QByteArray &channelname);
-  IrcChannel *ircChannel(QString channelname);
-  IrcChannel *ircChannel(const QByteArray &channelname);
+  IrcChannel *ircChannel(QString channelname) const;
+  IrcChannel *ircChannel(const QByteArray &channelname) const;
   QList<IrcChannel *> ircChannels() const;
   quint32 ircChannelCount() const;
 
@@ -201,8 +207,7 @@ private:
 
   QList<QVariantMap> _serverList;
   //QVariantMap networkSettings;
-  //QVariantMap identity;
-  
+
   QPointer<SignalProxy> _proxy;
   void determinePrefixes();
 
@@ -211,4 +216,16 @@ private:
 
 };
 
+//! Stores all editable information about a network (as opposed to runtime state).
+struct NetworkInfo {
+  NetworkId networkId;
+  IdentityId identity;
+  QString networkName;
+  QByteArray codecForEncoding;
+  QByteArray codecForDecoding;
+  QList<QVariantMap> serverList;
+
+};
+
+
 #endif