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/util/concurrentmap.hpp

@@ -15,9 +15,7 @@ template <typename TKey, typename TValue>
 class ConcurrentMap
 {
 public:
-    ConcurrentMap()
-    {
-    }
+    ConcurrentMap() = default;
 
     bool tryGet(const TKey &name, TValue &value) const
     {
@@ -84,5 +82,6 @@ private:
     mutable QMutex mutex;
     QMap<TKey, TValue> data;
 };
+
+}  // namespace util
 }  // namespace chatterino
-}

src/util/distancebetweenpoints.hpp

@@ -1,6 +1,8 @@
 #pragma once
 
-#include <math.h>
+#include <QPointF>
+
+#include <cmath>
 
 namespace chatterino {
 namespace util {

src/util/emotemap.hpp

@@ -9,9 +9,7 @@ namespace chatterino {
 namespace util {
 
 struct EmoteData {
-    EmoteData()
-    {
-    }
+    EmoteData() = default;
 
     EmoteData(messages::Image *_image)
         : image1x(_image)
@@ -29,7 +27,7 @@ struct EmoteData {
     messages::Image *image3x = nullptr;
 };
 
-typedef ConcurrentMap<QString, EmoteData> EmoteMap;
+using EmoteMap = ConcurrentMap<QString, EmoteData>;
 
 }  // namespace util
 }  // namespace chatterino

src/util/irchelpers.hpp

@@ -4,7 +4,8 @@
 
 namespace chatterino {
 namespace util {
-QString ParseTagString(const QString &input)
+
+inline QString ParseTagString(const QString &input)
 {
     QString output = input;
     output.detach();
@@ -49,9 +50,10 @@ QString ParseTagString(const QString &input)
 
     if (changed) {
         return output.replace("\0", "");
-    } else {
-        return output;
     }
+
+    return output;
 }
-}
+
+}  // namespace util
 }  // namespace chatterino

src/util/networkmanager.hpp

@@ -51,11 +51,11 @@ public:
         worker->moveToThread(&NetworkManager::workerThread);
         QObject::connect(
             &requester, &NetworkRequester::requestUrl, worker,
-            [ worker, onFinished = std::move(onFinished), request = std::move(request) ]() {
+            [worker, onFinished = std::move(onFinished), request = std::move(request)]() {
                 QNetworkReply *reply = NetworkManager::NaM.get(request);
 
                 QObject::connect(reply, &QNetworkReply::finished,
-                                 [ worker, reply, onFinished = std::move(onFinished) ]() {
+                                 [worker, reply, onFinished = std::move(onFinished)]() {
                                      onFinished(reply);
                                      delete worker;
                                  });
@@ -111,11 +111,11 @@ public:
         worker->moveToThread(&NetworkManager::workerThread);
         QObject::connect(
             &requester, &NetworkRequester::requestUrl, worker,
-            [ worker, data, onFinished = std::move(onFinished), request = std::move(request) ]() {
+            [worker, data, onFinished = std::move(onFinished), request = std::move(request)]() {
                 QNetworkReply *reply = NetworkManager::NaM.put(request, *data);
 
                 QObject::connect(reply, &QNetworkReply::finished,
-                                 [ worker, reply, onFinished = std::move(onFinished) ]() {
+                                 [worker, reply, onFinished = std::move(onFinished)]() {
                                      onFinished(reply);
                                      delete worker;
                                  });
@@ -133,11 +133,11 @@ public:
         worker->moveToThread(&NetworkManager::workerThread);
         QObject::connect(
             &requester, &NetworkRequester::requestUrl, worker,
-            [ onFinished = std::move(onFinished), request = std::move(request), worker ]() {
+            [onFinished = std::move(onFinished), request = std::move(request), worker]() {
                 QNetworkReply *reply = NetworkManager::NaM.put(request, "");
 
                 QObject::connect(reply, &QNetworkReply::finished,
-                                 [ onFinished = std::move(onFinished), reply, worker ]() {
+                                 [onFinished = std::move(onFinished), reply, worker]() {
                                      onFinished(reply);
                                      delete worker;
                                  });
@@ -155,11 +155,11 @@ public:
         worker->moveToThread(&NetworkManager::workerThread);
         QObject::connect(
             &requester, &NetworkRequester::requestUrl, worker,
-            [ onFinished = std::move(onFinished), request = std::move(request), worker ]() {
+            [onFinished = std::move(onFinished), request = std::move(request), worker]() {
                 QNetworkReply *reply = NetworkManager::NaM.deleteResource(request);
 
                 QObject::connect(reply, &QNetworkReply::finished,
-                                 [ onFinished = std::move(onFinished), reply, worker ]() {
+                                 [onFinished = std::move(onFinished), reply, worker]() {
                                      onFinished(reply);
                                      delete worker;
                                  });