General cleanups/reformats

- Clean up imports
- Comment EmojiData
- Reorder TwitchAccount constructor
- Fix typo in TwitchChannel
- Add emoji parsing test code at the bottom of EmoteManager

src/widgets/basewidget.cpp

@@ -33,9 +33,9 @@ float BaseWidget::getScale() const
 
     if (baseWidget == nullptr) {
         return 1.f;
-    } else {
-        return baseWidget->scale;
     }
+
+    return baseWidget->scale;
 }
 
 QSize BaseWidget::getScaleIndependantSize() const
@@ -98,7 +98,7 @@ void BaseWidget::childEvent(QChildEvent *event)
     if (event->added()) {
         BaseWidget *widget = dynamic_cast<BaseWidget *>(event->child());
 
-        if (widget) {
+        if (widget != nullptr) {
             this->widgets.push_back(widget);
         }
     } else if (event->removed()) {

src/widgets/helper/titlebarbutton.cpp

@@ -2,6 +2,7 @@
 
 namespace chatterino {
 namespace widgets {
+
 TitleBarButton::TitleBarButton()
     : RippleEffectButton(nullptr)
 {
@@ -114,5 +115,6 @@ void TitleBarButton::paintEvent(QPaintEvent *)
 
     this->fancyPaint(painter);
 }
+
 }  // namespace widgets
 }  // namespace chatterino

src/widgets/helper/titlebarbutton.hpp

@@ -4,6 +4,7 @@
 
 namespace chatterino {
 namespace widgets {
+
 class TitleBarButton : public RippleEffectButton
 {
 public:
@@ -15,10 +16,11 @@ public:
     void setButtonStyle(Style style);
 
 protected:
-    virtual void paintEvent(QPaintEvent *) override;
+    void paintEvent(QPaintEvent *) override;
 
 private:
     Style style;
 };
+
 }  // namespace widgets
 }  // namespace chatterino

src/widgets/split.cpp

@@ -18,17 +18,12 @@
 
 #include <QApplication>
 #include <QClipboard>
-#include <QDebug>
 #include <QDesktopServices>
 #include <QDockWidget>
 #include <QDrag>
-#include <QFont>
-#include <QFontDatabase>
 #include <QListWidget>
 #include <QMimeData>
 #include <QPainter>
-#include <QShortcut>
-#include <QTimer>
 #include <QVBoxLayout>
 #include <boost/signals2.hpp>
 
@@ -540,5 +535,6 @@ void Split::drag()
         SplitContainer::isDraggingSplit = false;
     }
 }
+
 }  // namespace widgets
 }  // namespace chatterino

src/widgets/split.hpp

@@ -19,7 +19,6 @@
 #include <boost/signals2/connection.hpp>
 
 namespace chatterino {
-
 namespace widgets {
 
 class SplitContainer;
@@ -45,7 +44,7 @@ class Split : public BaseWidget
 
 public:
     Split(SplitContainer *parent, const std::string &_uuid);
-    virtual ~Split();
+    ~Split() override;
 
     pajlada::Settings::Setting<QString> channelName;
     boost::signals2::signal<void()> channelChanged;
@@ -75,11 +74,11 @@ public:
     void drag();
 
 protected:
-    virtual void paintEvent(QPaintEvent *) override;
-    virtual void mouseMoveEvent(QMouseEvent *) override;
-    virtual void mousePressEvent(QMouseEvent *event) override;
-    virtual void keyPressEvent(QKeyEvent *) override;
-    virtual void keyReleaseEvent(QKeyEvent *) override;
+    void paintEvent(QPaintEvent *) override;
+    void mouseMoveEvent(QMouseEvent *) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void keyPressEvent(QKeyEvent *) override;
+    void keyReleaseEvent(QKeyEvent *) override;
 
 private:
     SplitContainer &parentPage;