clang_format and code cleanup

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

1 files changed, 45 insertions, 50 deletions

diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index 136a7371..2cf94250 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -1,18 +1,16 @@
-#include "Application.h"
 #include "BlockedModsDialog.h"
-#include "ui_BlockedModsDialog.h"
-#include <QPushButton>
-#include <QDialogButtonBox>
 #include <QDesktopServices>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include "Application.h"
+#include "ui_BlockedModsDialog.h"
 
 #include <QDebug>
 #include <QStandardPaths>
 
-
-
-
-BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, const QString &text, QList<BlockedMod> &mods) :
-        QDialog(parent), ui(new Ui::BlockedModsDialog), mods(mods) {
+BlockedModsDialog::BlockedModsDialog(QWidget* parent, const QString& title, const QString& text, QList<BlockedMod>& mods)
+    : QDialog(parent), ui(new Ui::BlockedModsDialog), mods(mods)
+{
     ui->setupUi(this);
 
     auto openAllButton = ui->buttonBox->addButton(tr("Open All"), QDialogButtonBox::ActionRole);
@@ -21,7 +19,7 @@ BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, cons
     connect(&watcher, &QFileSystemWatcher::directoryChanged, this, &BlockedModsDialog::directoryChanged);
 
     hashing_task = shared_qobject_ptr<ConcurrentTask>(new ConcurrentTask(this, "MakeHashesTask", 10));
-    
+
     qDebug() << "Mods List: " << mods;
 
     setupWatch();
@@ -33,22 +31,25 @@ BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, cons
     update();
 }
 
-BlockedModsDialog::~BlockedModsDialog() {
+BlockedModsDialog::~BlockedModsDialog()
+{
     delete ui;
 }
 
-void BlockedModsDialog::openAll() {
-    for(auto &mod : mods) {
+void BlockedModsDialog::openAll()
+{
+    for (auto& mod : mods) {
         QDesktopServices::openUrl(mod.websiteUrl);
     }
 }
 
 /// @brief update UI with current status of the blocked mod detection
-void BlockedModsDialog::update() {
+void BlockedModsDialog::update()
+{
     QString text;
     QString span;
 
-    for (auto &mod : mods) {
+    for (auto& mod : mods) {
         if (mod.matched) {
             // &#x2714; -> html for HEAVY CHECK MARK : ✔
             span = QString(tr("<span style=\"color:green\"> &#x2714; Found at %1 </span>")).arg(mod.localPath);
@@ -70,33 +71,34 @@ void BlockedModsDialog::update() {
 
 /// @brief Signal fired when a watched direcotry has changed
 /// @param path the path to the changed directory
-void BlockedModsDialog::directoryChanged(QString path) {
+void BlockedModsDialog::directoryChanged(QString path)
+{
     qDebug() << "Directory changed: " << path;
     scanPath(path);
 }
 
-
 /// @brief add the user downloads folder and the global mods folder to the filesystem watcher
-void BlockedModsDialog::setupWatch() {
+void BlockedModsDialog::setupWatch()
+{
     const QString downloadsFolder = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
     const QString modsFolder = APPLICATION->settings()->get("CentralModsDir").toString();
     watcher.addPath(downloadsFolder);
     watcher.addPath(modsFolder);
 }
 
-
 /// @brief scan all watched folder
-void BlockedModsDialog::scanPaths() {
-    for (auto &dir : watcher.directories()) {
+void BlockedModsDialog::scanPaths()
+{
+    for (auto& dir : watcher.directories()) {
         scanPath(dir);
     }
 }
 
-/// @brief Scan the directory at path, skip paths that do not contain a file name 
+/// @brief Scan the directory at path, skip paths that do not contain a file name
 ///        of a blocked mod we are looking for
 /// @param path the directory to scan
-void BlockedModsDialog::scanPath(QString path) {
-
+void BlockedModsDialog::scanPath(QString path)
+{
     QDir scan_dir(path);
     QDirIterator scan_it(path, QDir::Filter::Files | QDir::Filter::Hidden, QDirIterator::NoIteratorFlags);
     while (scan_it.hasNext()) {
@@ -110,30 +112,26 @@ void BlockedModsDialog::scanPath(QString path) {
 
         qDebug() << "Creating Hash task for path: " << file;
 
-        connect(hash_task.get(), &Task::succeeded, [this, hash_task, file] { 
-            checkMatchHash(hash_task->getResult(), file);
-        });
-        connect(hash_task.get(), &Task::failed, [this, hash_task, file] { 
-            qDebug() << "Failed to hash path: " << file;
-        });
-        
+        connect(hash_task.get(), &Task::succeeded, [this, hash_task, file] { checkMatchHash(hash_task->getResult(), file); });
+        connect(hash_task.get(), &Task::failed, [file] { qDebug() << "Failed to hash path: " << file; });
+
         hashing_task->addTask(hash_task);
     }
 
     hashing_task->start();
-
 }
 
 /// @brief check if the computed hash for the provided path matches a blocked
 ///        mod we are looking for
 /// @param hash the computed hash for the provided path
 /// @param path the path to the local file being compared
-void BlockedModsDialog::checkMatchHash(QString hash, QString path) {
+void BlockedModsDialog::checkMatchHash(QString hash, QString path)
+{
     bool match = false;
 
-    qDebug() << "Checking for match on hash: " << hash << " | From path:" << path;
+    qDebug() << "Checking for match on hash: " << hash << "| From path:" << path;
 
-    for (auto &mod : mods) {
+    for (auto& mod : mods) {
         if (mod.matched) {
             continue;
         }
@@ -142,7 +140,7 @@ void BlockedModsDialog::checkMatchHash(QString hash, QString path) {
             mod.localPath = path;
             match = true;
 
-            qDebug() << "Hash match found: " << mod.name << " " << hash << " | From path:" << path;
+            qDebug() << "Hash match found:" << mod.name << hash << "| From path:" << path;
 
             break;
         }
@@ -156,14 +154,14 @@ void BlockedModsDialog::checkMatchHash(QString hash, QString path) {
 /// @brief Check if the name of the file at path matches the name of a blocked mod we are searching for
 /// @param path the path to check
 /// @return boolean: did the path match the name of a blocked mod?
-bool BlockedModsDialog::checkValidPath(QString path) {
-
+bool BlockedModsDialog::checkValidPath(QString path)
+{
     QFileInfo file = QFileInfo(path);
     QString filename = file.fileName();
 
-    for (auto &mod : mods) {
+    for (auto& mod : mods) {
         if (mod.name.compare(filename, Qt::CaseInsensitive) == 0) {
-            qDebug() << "Name match found: " << mod.name << " | From path:" << path;
+            qDebug() << "Name match found:" << mod.name << "| From path:" << path;
             return true;
         }
     }
@@ -171,21 +169,18 @@ bool BlockedModsDialog::checkValidPath(QString path) {
     return false;
 }
 
-bool BlockedModsDialog::allModsMatched() {
-    for (auto &mod : mods) {
-        if (!mod.matched)
-            return false;
-    }
-    return true;
+bool BlockedModsDialog::allModsMatched()
+{
+    return std::all_of(mods.begin(), mods.end(), [](auto const& mod) { return mod.matched; });
 }
 
 /// qDebug print support for the BlockedMod struct
-QDebug operator<<(QDebug debug, const BlockedMod &m) {
+QDebug operator<<(QDebug debug, const BlockedMod& m)
+{
     QDebugStateSaver saver(debug);
 
-    debug.nospace() << "{ name: " << m.name << ", websiteUrl: " << m.websiteUrl
-        << ", hash: " << m.hash << ", matched: " << m.matched
-        << ", localPath: " << m.localPath <<"}";
+    debug.nospace() << "{ name: " << m.name << ", websiteUrl: " << m.websiteUrl << ", hash: " << m.hash << ", matched: " << m.matched
+                    << ", localPath: " << m.localPath << "}";
 
     return debug;
 }