changed .clang-format

2018-08-15 22:46:20 +02:00
parent 44c16f1b3a
commit af7b742a23
46 changed files with 1636 additions and 1611 deletions
@@ -10,99 +10,100 @@

 namespace chatterino {
 namespace {
-Url getEmoteLink(const QJsonObject &urls, const QString &emoteScale)
-{
-    auto emote = urls.value(emoteScale);
-    if (emote.isUndefined()) {
-        return {""};
-    }
-
-    assert(emote.isString());
-
-    return {"https:" + emote.toString()};
-}
-void fillInEmoteData(const QJsonObject &urls, const EmoteName &name,
-                     const QString &tooltip, Emote &emoteData)
-{
-    auto url1x = getEmoteLink(urls, "1");
-    auto url2x = getEmoteLink(urls, "2");
-    auto url3x = getEmoteLink(urls, "4");
-
-    //, code, tooltip
-    emoteData.name = name;
-    emoteData.images =
-        ImageSet{Image::fromUrl(url1x, 1), Image::fromUrl(url2x, 0.5),
-                 Image::fromUrl(url3x, 0.25)};
-    emoteData.tooltip = {tooltip};
-}
-EmotePtr cachedOrMake(Emote &&emote, const EmoteId &id)
-{
-    static std::unordered_map<EmoteId, std::weak_ptr<const Emote>> cache;
-    static std::mutex mutex;
-
-    return cachedOrMakeEmotePtr(std::move(emote), cache, mutex, id);
-}
-std::pair<Outcome, EmoteMap> parseGlobalEmotes(const QJsonObject &jsonRoot,
-                                               const EmoteMap &currentEmotes)
-{
-    auto jsonSets = jsonRoot.value("sets").toObject();
-    auto emotes = EmoteMap();
-
-    for (auto jsonSet : jsonSets) {
-        auto jsonEmotes = jsonSet.toObject().value("emoticons").toArray();
-
-        for (auto jsonEmoteValue : jsonEmotes) {
-            auto jsonEmote = jsonEmoteValue.toObject();
-
-            auto name = EmoteName{jsonEmote.value("name").toString()};
-            auto id = EmoteId{jsonEmote.value("id").toString()};
-            auto urls = jsonEmote.value("urls").toObject();
-
-            auto emote = Emote();
-            fillInEmoteData(urls, name, name.string + "<br/>Global FFZ Emote",
-                            emote);
-            emote.homePage =
-                Url{QString("https://www.frankerfacez.com/emoticon/%1-%2")
-                        .arg(id.string)
-                        .arg(name.string)};
-
-            emotes[name] =
-                cachedOrMakeEmotePtr(std::move(emote), currentEmotes);
+    Url getEmoteLink(const QJsonObject &urls, const QString &emoteScale)
+    {
+        auto emote = urls.value(emoteScale);
+        if (emote.isUndefined()) {
+            return {""};
        }
+
+        assert(emote.isString());
+
+        return {"https:" + emote.toString()};
    }
+    void fillInEmoteData(const QJsonObject &urls, const EmoteName &name,
+                         const QString &tooltip, Emote &emoteData)
+    {
+        auto url1x = getEmoteLink(urls, "1");
+        auto url2x = getEmoteLink(urls, "2");
+        auto url3x = getEmoteLink(urls, "4");

-    return {Success, std::move(emotes)};
-}
-std::pair<Outcome, EmoteMap> parseChannelEmotes(const QJsonObject &jsonRoot)
-{
-    auto jsonSets = jsonRoot.value("sets").toObject();
-    auto emotes = EmoteMap();
+        //, code, tooltip
+        emoteData.name = name;
+        emoteData.images =
+            ImageSet{Image::fromUrl(url1x, 1), Image::fromUrl(url2x, 0.5),
+                     Image::fromUrl(url3x, 0.25)};
+        emoteData.tooltip = {tooltip};
+    }
+    EmotePtr cachedOrMake(Emote &&emote, const EmoteId &id)
+    {
+        static std::unordered_map<EmoteId, std::weak_ptr<const Emote>> cache;
+        static std::mutex mutex;

-    for (auto jsonSet : jsonSets) {
-        auto jsonEmotes = jsonSet.toObject().value("emoticons").toArray();
+        return cachedOrMakeEmotePtr(std::move(emote), cache, mutex, id);
+    }
+    std::pair<Outcome, EmoteMap> parseGlobalEmotes(
+        const QJsonObject &jsonRoot, const EmoteMap &currentEmotes)
+    {
+        auto jsonSets = jsonRoot.value("sets").toObject();
+        auto emotes = EmoteMap();

-        for (auto _jsonEmote : jsonEmotes) {
-            auto jsonEmote = _jsonEmote.toObject();
+        for (auto jsonSet : jsonSets) {
+            auto jsonEmotes = jsonSet.toObject().value("emoticons").toArray();

-            // margins
-            auto id = EmoteId{QString::number(jsonEmote.value("id").toInt())};
-            auto name = EmoteName{jsonEmote.value("name").toString()};
-            auto urls = jsonEmote.value("urls").toObject();
+            for (auto jsonEmoteValue : jsonEmotes) {
+                auto jsonEmote = jsonEmoteValue.toObject();

-            Emote emote;
-            fillInEmoteData(urls, name, name.string + "<br/>Channel FFZ Emote",
-                            emote);
-            emote.homePage =
-                Url{QString("https://www.frankerfacez.com/emoticon/%1-%2")
-                        .arg(id.string)
-                        .arg(name.string)};
+                auto name = EmoteName{jsonEmote.value("name").toString()};
+                auto id = EmoteId{jsonEmote.value("id").toString()};
+                auto urls = jsonEmote.value("urls").toObject();

-            emotes[name] = cachedOrMake(std::move(emote), id);
+                auto emote = Emote();
+                fillInEmoteData(urls, name,
+                                name.string + "<br/>Global FFZ Emote", emote);
+                emote.homePage =
+                    Url{QString("https://www.frankerfacez.com/emoticon/%1-%2")
+                            .arg(id.string)
+                            .arg(name.string)};
+
+                emotes[name] =
+                    cachedOrMakeEmotePtr(std::move(emote), currentEmotes);
+            }
        }
-    }

-    return {Success, std::move(emotes)};
-}
+        return {Success, std::move(emotes)};
+    }
+    std::pair<Outcome, EmoteMap> parseChannelEmotes(const QJsonObject &jsonRoot)
+    {
+        auto jsonSets = jsonRoot.value("sets").toObject();
+        auto emotes = EmoteMap();
+
+        for (auto jsonSet : jsonSets) {
+            auto jsonEmotes = jsonSet.toObject().value("emoticons").toArray();
+
+            for (auto _jsonEmote : jsonEmotes) {
+                auto jsonEmote = _jsonEmote.toObject();
+
+                // margins
+                auto id =
+                    EmoteId{QString::number(jsonEmote.value("id").toInt())};
+                auto name = EmoteName{jsonEmote.value("name").toString()};
+                auto urls = jsonEmote.value("urls").toObject();
+
+                Emote emote;
+                fillInEmoteData(urls, name,
+                                name.string + "<br/>Channel FFZ Emote", emote);
+                emote.homePage =
+                    Url{QString("https://www.frankerfacez.com/emoticon/%1-%2")
+                            .arg(id.string)
+                            .arg(name.string)};
+
+                emotes[name] = cachedOrMake(std::move(emote), id);
+            }
+        }
+
+        return {Success, std::move(emotes)};
+    }
 }  // namespace

 FfzEmotes::FfzEmotes()