X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircchannel.h;h=d970814590490f155b25ed20d627aa2af9e0f47f;hp=2cbfa1aa2030eb6d66ed8ffaf1c6513a8974cfc7;hb=6c5dfecc534c825a628221e0bc2f6fec2feafe7c;hpb=b797e5f581b10a517c30f78cb53f813af741e261

diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h
index 2cbfa1aa..d9708145 100644
--- a/src/common/ircchannel.h
+++ b/src/common/ircchannel.h
@@ -29,7 +29,7 @@
 #include "syncableobject.h"
 
 class IrcUser;
-class NetworkInfo;
+class Network;
 class SignalProxy;
 
 class IrcChannel : public SyncableObject {
@@ -39,14 +39,12 @@ class IrcChannel : public SyncableObject {
   Q_PROPERTY(QString topic READ topic WRITE setTopic STORED false)
 
 public:
-  IrcChannel(const QString &channelname, NetworkInfo *networkInfo);
+  IrcChannel(const QString &channelname, Network *network);
   ~IrcChannel();
 
   bool isKnownUser(IrcUser *ircuser) const;
   bool isValidChannelUserMode(const QString &mode) const;
 
-  bool initialized() const;
-
   QString name() const;
   QString topic() const;
 
@@ -89,8 +87,6 @@ public slots:
   // init seters
   void initSetUserModes(const QVariantMap &usermodes);
 
-  void setInitialized();
-
 signals:
   void topicSet(QString topic);
   void userModesSet(QString nick, QString modes);
@@ -107,8 +103,6 @@ signals:
   void ircUserModeRemoved(IrcUser *ircuser, QString mode);
   void ircUserModesSet(IrcUser *ircuser, QString modes);
 
-  void initDone();
-
 private slots:
    void ircUserDestroyed();
    void ircUserNickSet(QString nick);
@@ -120,7 +114,7 @@ private:
 
   QHash<IrcUser *, QString> _userModes;
 
-  NetworkInfo *networkInfo;
+  Network *network;
 
   QTextCodec *_codecForEncoding;
   QTextCodec *_codecForDecoding;