changed .clang-format

src/widgets/dialogs/EmotePopup.cpp

@@ -16,55 +16,57 @@
 
 namespace chatterino {
 namespace {
-auto makeTitleMessage(const QString &title)
-{
-    MessageBuilder builder;
-    builder.emplace<TextElement>(title, MessageElementFlag::Text);
-    builder->flags.set(MessageFlag::Centered);
-    return builder.release();
-}
-auto makeEmoteMessage(const EmoteMap &map)
-{
-    MessageBuilder builder;
-    builder->flags.set(MessageFlag::Centered);
-    builder->flags.set(MessageFlag::DisableCompactEmotes);
-
-    for (const auto &emote : map) {
-        builder
-            .emplace<EmoteElement>(emote.second, MessageElementFlag::AlwaysShow)
-            ->setLink(Link(Link::InsertText, emote.first.string));
+    auto makeTitleMessage(const QString &title)
+    {
+        MessageBuilder builder;
+        builder.emplace<TextElement>(title, MessageElementFlag::Text);
+        builder->flags.set(MessageFlag::Centered);
+        return builder.release();
     }
-
-    return builder.release();
-}
-void addEmoteSets(std::vector<std::shared_ptr<TwitchAccount::EmoteSet>> sets,
-                  Channel &globalChannel, Channel &subChannel)
-{
-    for (const auto &set : sets) {
-        auto &channel = set->key == "0" ? globalChannel : subChannel;
-
-        // TITLE
-        auto text =
-            set->key == "0" || set->text.isEmpty() ? "Twitch" : set->text;
-        channel.addMessage(makeTitleMessage(text));
-
-        // EMOTES
+    auto makeEmoteMessage(const EmoteMap &map)
+    {
         MessageBuilder builder;
         builder->flags.set(MessageFlag::Centered);
         builder->flags.set(MessageFlag::DisableCompactEmotes);
 
-        for (const auto &emote : set->emotes) {
+        for (const auto &emote : map) {
             builder
-                .emplace<EmoteElement>(
-                    getApp()->emotes->twitch.getOrCreateEmote(emote.id,
-                                                              emote.name),
-                    MessageElementFlag::AlwaysShow)
-                ->setLink(Link(Link::InsertText, emote.name.string));
+                .emplace<EmoteElement>(emote.second,
+                                       MessageElementFlag::AlwaysShow)
+                ->setLink(Link(Link::InsertText, emote.first.string));
         }
 
-        channel.addMessage(builder.release());
+        return builder.release();
+    }
+    void addEmoteSets(
+        std::vector<std::shared_ptr<TwitchAccount::EmoteSet>> sets,
+        Channel &globalChannel, Channel &subChannel)
+    {
+        for (const auto &set : sets) {
+            auto &channel = set->key == "0" ? globalChannel : subChannel;
+
+            // TITLE
+            auto text =
+                set->key == "0" || set->text.isEmpty() ? "Twitch" : set->text;
+            channel.addMessage(makeTitleMessage(text));
+
+            // EMOTES
+            MessageBuilder builder;
+            builder->flags.set(MessageFlag::Centered);
+            builder->flags.set(MessageFlag::DisableCompactEmotes);
+
+            for (const auto &emote : set->emotes) {
+                builder
+                    .emplace<EmoteElement>(
+                        getApp()->emotes->twitch.getOrCreateEmote(emote.id,
+                                                                  emote.name),
+                        MessageElementFlag::AlwaysShow)
+                    ->setLink(Link(Link::InsertText, emote.name.string));
+            }
+
+            channel.addMessage(builder.release());
+        }
     }
-}
 }  // namespace
 
 EmotePopup::EmotePopup()

src/widgets/dialogs/LoginDialog.cpp

@@ -7,7 +7,7 @@
 #include "providers/twitch/PartialTwitchUser.hpp"
 
 #ifdef USEWINSDK
-#include <Windows.h>
+#    include <Windows.h>
 #endif
 
 #include <QClipboard>
@@ -21,54 +21,54 @@ namespace chatterino {
 
 namespace {
 
-void LogInWithCredentials(const std::string &userID,
-                          const std::string &username,
-                          const std::string &clientID,
-                          const std::string &oauthToken)
-{
-    QStringList errors;
+    void LogInWithCredentials(const std::string &userID,
+                              const std::string &username,
+                              const std::string &clientID,
+                              const std::string &oauthToken)
+    {
+        QStringList errors;
 
-    if (userID.empty()) {
-        errors.append("Missing user ID");
+        if (userID.empty()) {
+            errors.append("Missing user ID");
+        }
+        if (username.empty()) {
+            errors.append("Missing username");
+        }
+        if (clientID.empty()) {
+            errors.append("Missing Client ID");
+        }
+        if (oauthToken.empty()) {
+            errors.append("Missing OAuth Token");
+        }
+
+        if (errors.length() > 0) {
+            QMessageBox messageBox;
+            messageBox.setIcon(QMessageBox::Critical);
+            messageBox.setText(errors.join("<br />"));
+            messageBox.setStandardButtons(QMessageBox::Ok);
+            messageBox.exec();
+            return;
+        }
+
+        //    QMessageBox messageBox;
+        //    messageBox.setIcon(QMessageBox::Information);
+        //    messageBox.setText("Successfully logged in with user <b>" +
+        //    qS(username) + "</b>!");
+        pajlada::Settings::Setting<std::string>::set(
+            "/accounts/uid" + userID + "/username", username);
+        pajlada::Settings::Setting<std::string>::set(
+            "/accounts/uid" + userID + "/userID", userID);
+        pajlada::Settings::Setting<std::string>::set(
+            "/accounts/uid" + userID + "/clientID", clientID);
+        pajlada::Settings::Setting<std::string>::set(
+            "/accounts/uid" + userID + "/oauthToken", oauthToken);
+
+        getApp()->accounts->twitch.reloadUsers();
+
+        //    messageBox.exec();
+
+        getApp()->accounts->twitch.currentUsername = username;
     }
-    if (username.empty()) {
-        errors.append("Missing username");
-    }
-    if (clientID.empty()) {
-        errors.append("Missing Client ID");
-    }
-    if (oauthToken.empty()) {
-        errors.append("Missing OAuth Token");
-    }
-
-    if (errors.length() > 0) {
-        QMessageBox messageBox;
-        messageBox.setIcon(QMessageBox::Critical);
-        messageBox.setText(errors.join("<br />"));
-        messageBox.setStandardButtons(QMessageBox::Ok);
-        messageBox.exec();
-        return;
-    }
-
-    //    QMessageBox messageBox;
-    //    messageBox.setIcon(QMessageBox::Information);
-    //    messageBox.setText("Successfully logged in with user <b>" +
-    //    qS(username) + "</b>!");
-    pajlada::Settings::Setting<std::string>::set(
-        "/accounts/uid" + userID + "/username", username);
-    pajlada::Settings::Setting<std::string>::set(
-        "/accounts/uid" + userID + "/userID", userID);
-    pajlada::Settings::Setting<std::string>::set(
-        "/accounts/uid" + userID + "/clientID", clientID);
-    pajlada::Settings::Setting<std::string>::set(
-        "/accounts/uid" + userID + "/oauthToken", oauthToken);
-
-    getApp()->accounts->twitch.reloadUsers();
-
-    //    messageBox.exec();
-
-    getApp()->accounts->twitch.currentUsername = username;
-}
 
 }  // namespace