1 files changed, 1 insertions, 32 deletions
diff --git a/src/irc/irc_channel.hpp b/src/irc/irc_channel.hpp
index 8f85edb..7000ada 100644
--- a/src/irc/irc_channel.hpp
+++ b/src/irc/irc_channel.hpp
@@ -32,8 +32,7 @@ public:
   IrcUser* add_user(const std::string& name,
                     const std::map<char, char>& prefix_to_mode);
   IrcUser* find_user(const std::string& name) const;
-  void remove_user(const IrcUser* user);
-  void remove_all_users();
+  std::unique_ptr<IrcUser> remove_user(const IrcUser* user);
   const std::vector<std::unique_ptr<IrcUser>>& get_users() const
   { return this->users; }
 
@@ -42,33 +41,3 @@ protected:
   IrcUser* self{nullptr};
   std::vector<std::unique_ptr<IrcUser>> users{};
 };
-
-/**
- * A special channel that is not actually linked to any real irc
- * channel. This is just a channel representing a connection to the
- * server. If an user wants to maintain the connection to the server without
- * having to be on any irc channel of that server, he can just join this
- * dummy channel.
- * It’s not actually dummy because it’s useful and it does things, but well.
- */
-class DummyIrcChannel: public IrcChannel
-{
-public:
-  explicit DummyIrcChannel();
-  DummyIrcChannel(const DummyIrcChannel&) = delete;
-  DummyIrcChannel(DummyIrcChannel&&) = delete;
-  DummyIrcChannel& operator=(const DummyIrcChannel&) = delete;
-  DummyIrcChannel& operator=(DummyIrcChannel&&) = delete;
-
-  /**
-   * This flag is at true whenever the user wants to join this channel, but
-   * he is not yet connected to the server. When the connection is made, we
-   * check that flag and if it’s true, we inform the user that he has just
-   * joined that channel.
-   * If the user is already connected to the server when he tries to join
-   * the channel, we don’t use that flag, we just join it immediately.
-   */
-  bool joining;
-};
-
-