Merge branch 'master' into irc-support

2019-09-18 13:03:16 +02:00
parent 997a0598cd b06918eb47
commit 3ab7362304
204 changed files with 17026 additions and 16467 deletions
@@ -1,33 +1,33 @@
-#pragma once
-
-#include "common/Channel.hpp"
-#include "common/ChannelChatters.hpp"
-
-namespace chatterino {
-
-class Irc;
-class IrcServer;
-
-class IrcChannel : public Channel, public ChannelChatters
-{
-public:
-    explicit IrcChannel(const QString &name, IrcServer *server);
-
-    void sendMessage(const QString &message) override;
-
-    // server may be nullptr
-    IrcServer *server();
-
-    // Channel methods
-    virtual bool canReconnect() const override;
-    virtual void reconnect() override;
-
-private:
-    void setServer(IrcServer *server);
-
-    IrcServer *server_;
-
-    friend class Irc;
-};
-
-}  // namespace chatterino
+#pragma once
+
+#include "common/Channel.hpp"
+#include "common/ChannelChatters.hpp"
+
+namespace chatterino {
+
+class Irc;
+class IrcServer;
+
+class IrcChannel : public Channel, public ChannelChatters
+{
+public:
+    explicit IrcChannel(const QString &name, IrcServer *server);
+
+    void sendMessage(const QString &message) override;
+
+    // server may be nullptr
+    IrcServer *server();
+
+    // Channel methods
+    virtual bool canReconnect() const override;
+    virtual void reconnect() override;
+
+private:
+    void setServer(IrcServer *server);
+
+    IrcServer *server_;
+
+    friend class Irc;
+};
+
+}  // namespace chatterino