Committing my local state. Mostly still invisible part on the not yet enabled network...

[quassel.git] / src / common / network.h

diff --git a/src/common/network.h b/src/common/network.h
index 80131fa..255d3ec 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -37,6 +37,9 @@ class SignalProxy;
 class IrcUser;
 class IrcChannel;
 
 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 {
 // 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);
 
 public:
   Network(const NetworkId &networkid, QObject *parent = 0);

-  //virtual ~Network();
+  // ~Network();

 
   NetworkId networkId() const;
 
 
   NetworkId networkId() const;
 


@@ -79,6 +82,9 @@ public:
   QStringList channels() const;
   QList<QVariantMap> serverList() const;
 
   QStringList channels() const;
   QList<QVariantMap> serverList() const;
 

+  NetworkInfo networkInfo() const;
+  void setNetworkInfo(const NetworkInfo &);
+

   QString prefixes();
   QString prefixModes();
 
   QString prefixes();
   QString prefixModes();
 


@@ -94,8 +100,8 @@ public:
 
   IrcChannel *newIrcChannel(const QString &channelname);
   IrcChannel *newIrcChannel(const QByteArray &channelname);
 
   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;
 
   QList<IrcChannel *> ircChannels() const;
   quint32 ircChannelCount() const;
 


@@ -201,8 +207,7 @@ private:
 
   QList<QVariantMap> _serverList;
   //QVariantMap networkSettings;
 
   QList<QVariantMap> _serverList;
   //QVariantMap networkSettings;

-  //QVariantMap identity;
-  
+

   QPointer<SignalProxy> _proxy;
   void determinePrefixes();
 
   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
 #endif