reformat

src/controllers/ignores/IgnoreModel.cpp

@@ -18,10 +18,11 @@ IgnorePhrase IgnoreModel::getItemFromRow(std::vector<QStandardItem *> &row,
 {
     // key, regex
 
-    return IgnorePhrase{
+    return IgnorePhrase{row[0]->data(Qt::DisplayRole).toString(),
-        row[0]->data(Qt::DisplayRole).toString(), row[1]->data(Qt::CheckStateRole).toBool(),
+                        row[1]->data(Qt::CheckStateRole).toBool(),
-        row[3]->data(Qt::CheckStateRole).toBool(), row[4]->data(Qt::DisplayRole).toString(),
+                        row[3]->data(Qt::CheckStateRole).toBool(),
-        row[2]->data(Qt::CheckStateRole).toBool()};
+                        row[4]->data(Qt::DisplayRole).toString(),
+                        row[2]->data(Qt::CheckStateRole).toBool()};
 }
 
 // turns a row in the model into a vector item

src/messages/MessageElement.cpp

@@ -159,13 +159,11 @@ void TextElement::addToContainer(MessageLayoutContainer &container,
                              ->setLink(this->getLink());
                 e->setTrailingSpace(trailingSpace);
 
-                // If URL link was changed, 
+                // If URL link was changed,
                 // Should update it in MessageLayoutElement too!
                 if (this->getLink().type == Link::Url) {
                     this->linkChanged.connect(
-                        [this, e]() {
+                        [this, e]() { e->setLink(this->getLink()); });
-                            e->setLink(this->getLink());
-                        });
                 }
                 return e;
             };

src/messages/layouts/MessageLayoutElement.cpp

@@ -78,7 +78,8 @@ ImageLayoutElement::ImageLayoutElement(MessageElement &creator, ImagePtr image,
 void ImageLayoutElement::addCopyTextToString(QString &str, int from,
                                              int to) const
 {
-    const auto *emoteElement = dynamic_cast<EmoteElement *>(&this->getCreator());
+    const auto *emoteElement =
+        dynamic_cast<EmoteElement *>(&this->getCreator());
     if (emoteElement) {
         str += emoteElement->getEmote()->getCopyString();
         if (this->hasTrailingSpace()) {

src/providers/LinkResolver.cpp

@@ -9,11 +9,11 @@
 
 namespace chatterino {
 
-void LinkResolver::getLinkInfo(const QString url,
+void LinkResolver::getLinkInfo(
-                           std::function<void(QString, Link)> successCallback)
+    const QString url, std::function<void(QString, Link)> successCallback)
 {
-    QString requestUrl("https://braize.pajlada.com/chatterino/link_resolver/" + 
+    QString requestUrl("https://braize.pajlada.com/chatterino/link_resolver/" +
-        QUrl::toPercentEncoding(url, "", "/:"));
+                       QUrl::toPercentEncoding(url, "", "/:"));
 
     NetworkRequest request(requestUrl);
     request.setCaller(QThread::currentThread());
@@ -31,7 +31,8 @@ void LinkResolver::getLinkInfo(const QString url,
         } else {
             response = root.value("message").toString();
         }
-        successCallback(QUrl::fromPercentEncoding(response.toUtf8()), Link(Link::Url, linkString));
+        successCallback(QUrl::fromPercentEncoding(response.toUtf8()),
+                        Link(Link::Url, linkString));
 
         return Success;
     });

src/widgets/settingspages/FeelPage.cpp

@@ -50,12 +50,12 @@ FeelPage::FeelPage()
         form->addRow("Links:",
                      this->createCheckBox("Open links only on double click",
                                           getSettings()->linksDoubleClickOnly));
-        form->addRow("",
+        form->addRow(
-                     this->createCheckBox("Show link info in tooltips",
+            "", this->createCheckBox("Show link info in tooltips",
-                                          getSettings()->enableLinkInfoTooltip));
+                                     getSettings()->enableLinkInfoTooltip));
-        form->addRow("",
+        form->addRow(
-                     this->createCheckBox("Auto unshort links (requires restart)",
+            "", this->createCheckBox("Auto unshort links (requires restart)",
-                                          getSettings()->enableUnshortLinks));
+                                     getSettings()->enableUnshortLinks));
     }
 
     layout->addSpacing(16);

src/widgets/settingspages/KeyboardSettingsPage.cpp

@@ -41,8 +41,7 @@ KeyboardSettingsPage::KeyboardSettingsPage()
     form->addRow(new QLabel("Ctrl + R"), new QLabel("Change channel"));
     form->addRow(new QLabel("Ctrl + F"),
                  new QLabel("Search in current channel"));
-    form->addRow(new QLabel("Ctrl + E"),
+    form->addRow(new QLabel("Ctrl + E"), new QLabel("Open Emote menu"));
-                 new QLabel("Open Emote menu"));
 }
 
 }  // namespace chatterino

src/widgets/settingspages/NotificationPage.cpp

@@ -32,8 +32,7 @@ NotificationPage::NotificationPage()
             {
                 settings.emplace<QLabel>("Enable for selected channels");
                 settings.append(this->createCheckBox(
-                    "Flash taskbar",
+                    "Flash taskbar", getSettings()->notificationFlashTaskbar));
-                    getSettings()->notificationFlashTaskbar));
                 settings.append(this->createCheckBox(
                     "Playsound (doesn't mute the Windows 8.x sound of toasts)",
                     getSettings()->notificationPlaySound));
@@ -56,8 +55,7 @@ NotificationPage::NotificationPage()
                             auto fileName = QFileDialog::getOpenFileName(
                                 this, tr("Open Sound"), "",
                                 tr("Audio Files (*.mp3 *.wav)"));
-                            getSettings()->notificationPathSound =
+                            getSettings()->notificationPathSound = fileName;
-                                fileName;
                         });
                 }
 

src/widgets/splits/Split.cpp

@@ -107,7 +107,7 @@ Split::Split(QWidget *parent)
 
     this->view_->joinToChannel.connect([this](QString twitchChannel) {
         this->container_->appendNewSplit(false)->setChannel(
-            getApp()->twitch.server->getOrAddChannel(twitchChannel));        
+            getApp()->twitch.server->getOrAddChannel(twitchChannel));
     });
 
     this->input_->textChanged.connect([=](const QString &newText) {
@@ -490,10 +490,12 @@ void Split::showViewerList()
 
         loadingLabel->hide();
         for (int i = 0; i < jsonLabels.size(); i++) {
-            auto currentCategory = chattersObj.value(jsonLabels.at(i)).toArray();
+            auto currentCategory =
-            // If current category of chatters is empty, dont show this category.
+                chattersObj.value(jsonLabels.at(i)).toArray();
+            // If current category of chatters is empty, dont show this
+            // category.
             if (currentCategory.empty()) continue;
-            
+
             chattersList->addItem(labelList.at(i));
             foreach (const QJsonValue &v, currentCategory)
                 chattersList->addItem(v.toString());

src/widgets/splits/SplitContainer.cpp

@@ -101,7 +101,7 @@ void SplitContainer::resetMouseStatus()
     this->update();
 }
 
-Split* SplitContainer::appendNewSplit(bool openChannelNameDialog)
+Split *SplitContainer::appendNewSplit(bool openChannelNameDialog)
 {
     assertInGuiThread();