X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=bf430f8eef38e94e3ff02fc7a29a8e830800590c;hp=c67fea89a6e15df89d7e6fdffb68266ad8550d67;hb=99bb37d9938f3d88ce7551ded454146359fadc03;hpb=da3aa4136fe01e142238f0f42fe1273481037b9d

diff --git a/src/common/network.h b/src/common/network.h
index c67fea89..bf430f8e 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -95,6 +95,7 @@ public:
   QString networkName() const;
   QString currentServer() const;
   QString myNick() const;
+  inline IrcUser *me() const { return ircUser(myNick()); }
   IdentityId identity() const;
   QStringList nicks() const;
   QStringList channels() const;
@@ -133,8 +134,6 @@ public:
   QList<IrcChannel *> ircChannels() const;
   quint32 ircChannelCount() const;
 
-  inline QHash<QString, QString> persistentChannels() const { return _persistentChannels; }
-
   QByteArray codecForServer() const;
   QByteArray codecForEncoding() const;
   QByteArray codecForDecoding() const;
@@ -183,26 +182,21 @@ public slots:
   void removeSupport(const QString &param);
 
   inline void addIrcUser(const QString &hostmask) { newIrcUser(hostmask); }
+  inline void addIrcChannel(const QString &channel) { newIrcChannel(channel); }
   void removeIrcUser(const QString &nick);
   void removeIrcChannel(const QString &channel);
 
-  void addPersistentChannel(const QString &channel, const QString &key = QString());
-  void removePersistentChannel(const QString &channel);
-  void setPersistentChannelKey(const QString &channel, const QString &key);
-
   //init geters
   QVariantMap initSupports() const;
   QVariantList initServerList() const;
   QStringList initIrcUsers() const;
   QStringList initIrcChannels() const;
-  QStringList initPersistentChannels() const;
   
   //init seters
   void initSetSupports(const QVariantMap &supports);
   void initSetServerList(const QVariantList &serverList);
   void initSetIrcUsers(const QStringList &hostmasks);
   void initSetIrcChannels(const QStringList &channels);
-  void initSetPersistentChannels(const QStringList &channels);
   
   IrcUser *updateNickFromMask(const QString &mask);
 
@@ -216,6 +210,7 @@ public slots:
   void emitConnectionError(const QString &);
 
 private slots:
+  void ircUserDestroyed();
   void channelDestroyed();
   void removeIrcUser(IrcUser *ircuser);
   void removeIrcChannel(IrcChannel *ircChannel);
@@ -261,10 +256,6 @@ signals:
   void ircUserRemoved(const QString &nick);
   void ircChannelRemoved(const QString &channel);
 
-  void persistentChannelAdded(const QString &channel, const QString &key);
-  void persistentChannelRemoved(const QString &channel);
-  void persistentChannelKeySet(const QString &channel, const QString &key);
-
   // needed for client sync progress
   void ircUserRemoved(QObject *);
   void ircChannelRemoved(QObject *);
@@ -293,7 +284,6 @@ private:
   QHash<QString, IrcUser *> _ircUsers;  // stores all known nicks for the server
   QHash<QString, IrcChannel *> _ircChannels; // stores all known channels
   QHash<QString, QString> _supports;  // stores results from RPL_ISUPPORT
-  QHash<QString, QString> _persistentChannels;  // stores persistent channels and their passwords, if any
 
   QVariantList _serverList;
   bool _useRandomServer;