changed .clang-format

src/widgets/AttachedWindow.cpp

@@ -8,12 +8,12 @@
 #include <QVBoxLayout>
 
 #ifdef USEWINSDK
-#include "util/WindowsHelper.hpp"
+#    include "util/WindowsHelper.hpp"
 
-#include "Windows.h"
+#    include "Windows.h"
 // don't even think about reordering these
-#include "Psapi.h"
-#pragma comment(lib, "Dwmapi.lib")
+#    include "Psapi.h"
+#    pragma comment(lib, "Dwmapi.lib")
 #endif
 
 namespace chatterino {

src/widgets/BaseWindow.cpp

@@ -20,20 +20,20 @@
 #include <functional>
 
 #ifdef USEWINSDK
-#include <ObjIdl.h>
-#include <VersionHelpers.h>
-#include <Windows.h>
-#include <dwmapi.h>
-#include <gdiplus.h>
-#include <windowsx.h>
+#    include <ObjIdl.h>
+#    include <VersionHelpers.h>
+#    include <Windows.h>
+#    include <dwmapi.h>
+#    include <gdiplus.h>
+#    include <windowsx.h>
 
 //#include <ShellScalingApi.h>
-#pragma comment(lib, "Dwmapi.lib")
+#    pragma comment(lib, "Dwmapi.lib")
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
+#    include <QHBoxLayout>
+#    include <QVBoxLayout>
 
-#define WM_DPICHANGED 0x02E0
+#    define WM_DPICHANGED 0x02E0
 #endif
 
 #include "widgets/helper/TitlebarButton.hpp"
@@ -460,11 +460,11 @@ bool BaseWindow::nativeEvent(const QByteArray &eventType, void *message,
                              long *result)
 {
 #ifdef USEWINSDK
-#if (QT_VERSION == QT_VERSION_CHECK(5, 11, 1))
+#    if (QT_VERSION == QT_VERSION_CHECK(5, 11, 1))
     MSG *msg = *reinterpret_cast<MSG **>(message);
-#else
+#    else
     MSG *msg = reinterpret_cast<MSG *>(message);
-#endif
+#    endif
 
     bool returnValue = false;
 

src/widgets/Notebook.cpp

@@ -433,8 +433,7 @@ void SplitNotebook::addCustomButtons()
     // settings
     auto settingsBtn = this->addCustomButton();
 
-    settingsBtn->setVisible(
-        !getSettings()->hidePreferencesButton.getValue());
+    settingsBtn->setVisible(!getSettings()->hidePreferencesButton.getValue());
 
     getSettings()->hidePreferencesButton.connect(
         [settingsBtn](bool hide, auto) { settingsBtn->setVisible(!hide); },

src/widgets/StreamView.cpp

@@ -7,7 +7,7 @@
 #include "widgets/splits/Split.hpp"
 
 #ifdef USEWEBENGINE
-#include <QtWebEngineWidgets>
+#    include <QtWebEngineWidgets>
 #endif
 
 namespace chatterino {

src/widgets/TooltipWidget.cpp

@@ -10,7 +10,7 @@
 #include <QVBoxLayout>
 
 #ifdef USEWINSDK
-#include <Windows.h>
+#    include <Windows.h>
 #endif
 
 namespace chatterino {

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
 

src/widgets/helper/ChannelView.cpp

@@ -39,62 +39,62 @@
 
 namespace chatterino {
 namespace {
-void addEmoteContextMenuItems(const Emote &emote,
-                              MessageElementFlags creatorFlags, QMenu &menu)
-{
-    auto openAction = menu.addAction("Open");
-    auto openMenu = new QMenu;
-    openAction->setMenu(openMenu);
+    void addEmoteContextMenuItems(const Emote &emote,
+                                  MessageElementFlags creatorFlags, QMenu &menu)
+    {
+        auto openAction = menu.addAction("Open");
+        auto openMenu = new QMenu;
+        openAction->setMenu(openMenu);
 
-    auto copyAction = menu.addAction("Copy");
-    auto copyMenu = new QMenu;
-    copyAction->setMenu(copyMenu);
+        auto copyAction = menu.addAction("Copy");
+        auto copyMenu = new QMenu;
+        copyAction->setMenu(copyMenu);
 
-    // see if the QMenu actually gets destroyed
-    QObject::connect(openMenu, &QMenu::destroyed, [] {
-        QMessageBox(QMessageBox::Information, "xD", "the menu got deleted")
-            .exec();
-    });
+        // see if the QMenu actually gets destroyed
+        QObject::connect(openMenu, &QMenu::destroyed, [] {
+            QMessageBox(QMessageBox::Information, "xD", "the menu got deleted")
+                .exec();
+        });
+
+        // Add copy and open links for 1x, 2x, 3x
+        auto addImageLink = [&](const ImagePtr &image, char scale) {
+            if (!image->isEmpty()) {
+                copyMenu->addAction(
+                    QString(scale) + "x link", [url = image->url()] {
+                        QApplication::clipboard()->setText(url.string);
+                    });
+                openMenu->addAction(
+                    QString(scale) + "x link", [url = image->url()] {
+                        QDesktopServices::openUrl(QUrl(url.string));
+                    });
+            }
+        };
+
+        addImageLink(emote.images.getImage1(), '1');
+        addImageLink(emote.images.getImage2(), '2');
+        addImageLink(emote.images.getImage3(), '3');
+
+        // Copy and open emote page link
+        auto addPageLink = [&](const QString &name) {
+            copyMenu->addSeparator();
+            openMenu->addSeparator();
 
-    // Add copy and open links for 1x, 2x, 3x
-    auto addImageLink = [&](const ImagePtr &image, char scale) {
-        if (!image->isEmpty()) {
             copyMenu->addAction(
-                QString(scale) + "x link", [url = image->url()] {
-                    QApplication::clipboard()->setText(url.string);
+                "Copy " + name + " emote link", [url = emote.homePage] {
+                    QApplication::clipboard()->setText(url.string);  //
                 });
-            openMenu->addAction(QString(scale) + "x link",
-                                [url = image->url()] {
-                                    QDesktopServices::openUrl(QUrl(url.string));
-                                });
+            openMenu->addAction(
+                "Open " + name + " emote link", [url = emote.homePage] {
+                    QDesktopServices::openUrl(QUrl(url.string));  //
+                });
+        };
+
+        if (creatorFlags.has(MessageElementFlag::BttvEmote)) {
+            addPageLink("BTTV");
+        } else if (creatorFlags.has(MessageElementFlag::FfzEmote)) {
+            addPageLink("FFZ");
         }
-    };
-
-    addImageLink(emote.images.getImage1(), '1');
-    addImageLink(emote.images.getImage2(), '2');
-    addImageLink(emote.images.getImage3(), '3');
-
-    // Copy and open emote page link
-    auto addPageLink = [&](const QString &name) {
-        copyMenu->addSeparator();
-        openMenu->addSeparator();
-
-        copyMenu->addAction(
-            "Copy " + name + " emote link", [url = emote.homePage] {
-                QApplication::clipboard()->setText(url.string);  //
-            });
-        openMenu->addAction("Open " + name + " emote link",
-                            [url = emote.homePage] {
-                                QDesktopServices::openUrl(QUrl(url.string));  //
-                            });
-    };
-
-    if (creatorFlags.has(MessageElementFlag::BttvEmote)) {
-        addPageLink("BTTV");
-    } else if (creatorFlags.has(MessageElementFlag::FfzEmote)) {
-        addPageLink("FFZ");
     }
-}
 }  // namespace
 
 ChannelView::ChannelView(BaseWidget *parent)

src/widgets/settingspages/ExternalToolsPage.cpp

@@ -9,15 +9,13 @@
     "Choose", "Source", "High", "Medium", "Low", "Audio only"
 
 namespace chatterino {
-
 namespace {
-
-QString CreateLink(const QString &url, const QString &name)
-{
-    return QString("<a href=\"" + url + "\"><span style=\"color: white;\">" +
-                   name + "</span></a>");
-}
-
+    QString createLink(const QString &url, const QString &name)
+    {
+        return QString("<a href=\"" + url +
+                       "\"><span style=\"color: white;\">" + name +
+                       "</span></a>");
+    }
 }  // namespace
 
 ExternalToolsPage::ExternalToolsPage()
@@ -41,8 +39,8 @@ ExternalToolsPage::ExternalToolsPage()
         description->setStyleSheet("color: #bbb");
 
         auto links = new QLabel(
-            CreateLink("https://streamlink.github.io/", "Website") + " " +
-            CreateLink(
+            createLink("https://streamlink.github.io/", "Website") + " " +
+            createLink(
                 "https://github.com/streamlink/streamlink/releases/latest",
                 "Download"));
         links->setTextFormat(Qt::RichText);

src/widgets/settingspages/IgnoresPage.cpp

@@ -69,9 +69,8 @@ void addPhrasesTab(LayoutCreator<QVBoxLayout> layout)
 void addUsersTab(IgnoresPage &page, LayoutCreator<QVBoxLayout> users,
                  QStringListModel &userModel)
 {
-    users.append(
-        page.createCheckBox("Enable twitch ignored users",
-                            getSettings()->enableTwitchIgnoredUsers));
+    users.append(page.createCheckBox("Enable twitch ignored users",
+                                     getSettings()->enableTwitchIgnoredUsers));
 
     auto anyways = users.emplace<QHBoxLayout>().withoutMargin();
     {

src/widgets/settingspages/LookPage.cpp

@@ -31,9 +31,9 @@
 // clang-format on
 
 #ifdef USEWINSDK
-#define WINDOW_TOPMOST "Window always on top"
+#    define WINDOW_TOPMOST "Window always on top"
 #else
-#define WINDOW_TOPMOST "Window always on top (requires restart)"
+#    define WINDOW_TOPMOST "Window always on top (requires restart)"
 #endif
 #define INPUT_EMPTY "Show input box when empty"
 #define LAST_MSG "Mark the last message you read"

src/widgets/settingspages/ModerationPage.cpp

@@ -25,7 +25,7 @@
 
 namespace chatterino {
 
-inline QString CreateLink(const QString &url, bool file = false)
+inline QString createLink(const QString &url, bool file = false)
 {
     if (file) {
         return QString("<a href=\"file:///" + url +

src/widgets/splits/SplitHeader.cpp

@@ -26,86 +26,87 @@
 #include <cmath>
 
 #ifdef USEWEBENGINE
-#include "widgets/StreamView.hpp"
+#    include "widgets/StreamView.hpp"
 #endif
 
 namespace chatterino {
 namespace {
-auto formatRoomMode(TwitchChannel &channel) -> QString
-{
-    QString text;
-
+    auto formatRoomMode(TwitchChannel &channel) -> QString
     {
-        auto modes = channel.accessRoomModes();
+        QString text;
 
-        if (modes->r9k) text += "r9k, ";
-        if (modes->slowMode)
-            text += QString("slow(%1), ").arg(QString::number(modes->slowMode));
-        if (modes->emoteOnly) text += "emote, ";
-        if (modes->submode) text += "sub, ";
+        {
+            auto modes = channel.accessRoomModes();
+
+            if (modes->r9k) text += "r9k, ";
+            if (modes->slowMode)
+                text +=
+                    QString("slow(%1), ").arg(QString::number(modes->slowMode));
+            if (modes->emoteOnly) text += "emote, ";
+            if (modes->submode) text += "sub, ";
+        }
+
+        if (text.length() > 2) {
+            text = text.mid(0, text.size() - 2);
+        }
+
+        if (!text.isEmpty()) {
+            static QRegularExpression commaReplacement("^(.+?, .+?,) (.+)$");
+
+            auto match = commaReplacement.match(text);
+            if (match.hasMatch())
+                text = match.captured(1) + '\n' + match.captured(2);
+        }
+
+        if (text.isEmpty() && channel.hasModRights()) return "none";
+
+        return text;
     }
-
-    if (text.length() > 2) {
-        text = text.mid(0, text.size() - 2);
+    auto formatTooltip(const TwitchChannel::StreamStatus &s)
+    {
+        return QStringList{"<style>.center { text-align: center; }</style>",
+                           "<p class=\"center\">",
+                           s.title,
+                           "<br><br>",
+                           s.game,
+                           "<br>",
+                           s.rerun ? "Vod-casting" : "Live",
+                           " for ",
+                           s.uptime,
+                           " with ",
+                           QString::number(s.viewerCount),
+                           " viewers",
+                           "</p>"}
+            .join("");
     }
+    auto formatTitle(const TwitchChannel::StreamStatus &s, Settings &settings)
+    {
+        auto title = QString();
 
-    if (!text.isEmpty()) {
-        static QRegularExpression commaReplacement("^(.+?, .+?,) (.+)$");
+        // live
+        if (s.rerun)
+            title += " (rerun)";
+        else if (s.streamType.isEmpty())
+            title += " (" + s.streamType + ")";
+        else
+            title += " (live)";
 
-        auto match = commaReplacement.match(text);
-        if (match.hasMatch())
-            text = match.captured(1) + '\n' + match.captured(2);
+        // description
+        if (settings.showViewerCount)
+            title += " - " + QString::number(s.viewerCount);
+        if (settings.showTitle) title += " - " + s.title;
+        if (settings.showGame) title += " - " + s.game;
+        if (settings.showUptime) title += " - " + s.uptime;
+
+        return title;
     }
+    auto distance(QPoint a, QPoint b)
+    {
+        auto x = std::abs(a.x() - b.x());
+        auto y = std::abs(a.y() - b.y());
 
-    if (text.isEmpty() && channel.hasModRights()) return "none";
-
-    return text;
-}
-auto formatTooltip(const TwitchChannel::StreamStatus &s)
-{
-    return QStringList{"<style>.center { text-align: center; }</style>",
-                       "<p class=\"center\">",
-                       s.title,
-                       "<br><br>",
-                       s.game,
-                       "<br>",
-                       s.rerun ? "Vod-casting" : "Live",
-                       " for ",
-                       s.uptime,
-                       " with ",
-                       QString::number(s.viewerCount),
-                       " viewers",
-                       "</p>"}
-        .join("");
-}
-auto formatTitle(const TwitchChannel::StreamStatus &s, Settings &settings)
-{
-    auto title = QString();
-
-    // live
-    if (s.rerun)
-        title += " (rerun)";
-    else if (s.streamType.isEmpty())
-        title += " (" + s.streamType + ")";
-    else
-        title += " (live)";
-
-    // description
-    if (settings.showViewerCount)
-        title += " - " + QString::number(s.viewerCount);
-    if (settings.showTitle) title += " - " + s.title;
-    if (settings.showGame) title += " - " + s.game;
-    if (settings.showUptime) title += " - " + s.uptime;
-
-    return title;
-}
-auto distance(QPoint a, QPoint b)
-{
-    auto x = std::abs(a.x() - b.x());
-    auto y = std::abs(a.y() - b.y());
-
-    return std::sqrt(x * x + y * y);
-}
+        return std::sqrt(x * x + y * y);
+    }
 }  // namespace
 
 SplitHeader::SplitHeader(Split *_split)