diff --git a/launcher/DataMigrationTask.cpp b/launcher/DataMigrationTask.cpp
index 27ce5f01b..72295a565 100644
--- a/launcher/DataMigrationTask.cpp
+++ b/launcher/DataMigrationTask.cpp
@@ -18,7 +18,7 @@ DataMigrationTask::DataMigrationTask(QObject* parent,
                                      const IPathMatcher::Ptr pathMatcher)
     : Task(parent), m_sourcePath(sourcePath), m_targetPath(targetPath), m_pathMatcher(pathMatcher), m_copy(sourcePath, targetPath)
 {
-    m_copy.matcher(m_pathMatcher.get()).whitelist(true);
+    m_copy.matcher(m_pathMatcher).whitelist(true);
 }
 
 void DataMigrationTask::executeTask()
diff --git a/launcher/FileSystem.h b/launcher/FileSystem.h
index bfed576c1..6772d0589 100644
--- a/launcher/FileSystem.h
+++ b/launcher/FileSystem.h
@@ -99,7 +99,7 @@ class copy : public QObject {
         m_followSymlinks = follow;
         return *this;
     }
-    copy& matcher(const IPathMatcher* filter)
+    copy& matcher(IPathMatcher::Ptr filter)
     {
         m_matcher = filter;
         return *this;
@@ -126,7 +126,7 @@ class copy : public QObject {
 
    private:
     bool m_followSymlinks = true;
-    const IPathMatcher* m_matcher = nullptr;
+    IPathMatcher::Ptr m_matcher = nullptr;
     bool m_whitelist = false;
     QDir m_src;
     QDir m_dst;
@@ -187,7 +187,7 @@ class create_link : public QObject {
         m_useHardLinks = useHard;
         return *this;
     }
-    create_link& matcher(const IPathMatcher* filter)
+    create_link& matcher(IPathMatcher::Ptr filter)
     {
         m_matcher = filter;
         return *this;
@@ -237,7 +237,7 @@ class create_link : public QObject {
 
    private:
     bool m_useHardLinks = false;
-    const IPathMatcher* m_matcher = nullptr;
+    IPathMatcher::Ptr m_matcher = nullptr;
     bool m_whitelist = false;
     bool m_recursive = true;
 
@@ -461,7 +461,7 @@ class clone : public QObject {
         m_src.setPath(src);
         m_dst.setPath(dst);
     }
-    clone& matcher(const IPathMatcher* filter)
+    clone& matcher(IPathMatcher::Ptr filter)
     {
         m_matcher = filter;
         return *this;
@@ -487,7 +487,7 @@ class clone : public QObject {
     bool operator()(const QString& offset, bool dryRun = false);
 
    private:
-    const IPathMatcher* m_matcher = nullptr;
+    IPathMatcher::Ptr m_matcher = nullptr;
     bool m_whitelist = false;
     QDir m_src;
     QDir m_dst;
diff --git a/launcher/InstanceCopyTask.cpp b/launcher/InstanceCopyTask.cpp
index 8abf30640..467c86a06 100644
--- a/launcher/InstanceCopyTask.cpp
+++ b/launcher/InstanceCopyTask.cpp
@@ -57,13 +57,13 @@ void InstanceCopyTask::executeTask()
     m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this, copySaves] {
         if (m_useClone) {
             FS::clone folderClone(m_origInstance->instanceRoot(), m_stagingPath);
-            folderClone.matcher(m_matcher.get());
+            folderClone.matcher(m_matcher);
 
             return folderClone();
         } else if (m_useLinks || m_useHardLinks) {
             FS::create_link folderLink(m_origInstance->instanceRoot(), m_stagingPath);
             int depth = m_linkRecursively ? -1 : 0;  // we need to at least link the top level instead of the instance folder
-            folderLink.linkRecursively(true).setMaxDepth(depth).useHardLinks(m_useHardLinks).matcher(m_matcher.get());
+            folderLink.linkRecursively(true).setMaxDepth(depth).useHardLinks(m_useHardLinks).matcher(m_matcher);
 
             bool there_were_errors = false;
 
@@ -115,7 +115,7 @@ void InstanceCopyTask::executeTask()
             return !there_were_errors;
         } else {
             FS::copy folderCopy(m_origInstance->instanceRoot(), m_stagingPath);
-            folderCopy.followSymlinks(false).matcher(m_matcher.get());
+            folderCopy.followSymlinks(false).matcher(m_matcher);
 
             return folderCopy();
         }
diff --git a/launcher/InstanceCopyTask.h b/launcher/InstanceCopyTask.h
index 357c6df0b..e7991c0b4 100644
--- a/launcher/InstanceCopyTask.h
+++ b/launcher/InstanceCopyTask.h
@@ -27,7 +27,7 @@ class InstanceCopyTask : public InstanceTask {
     InstancePtr m_origInstance;
     QFuture<bool> m_copyFuture;
     QFutureWatcher<bool> m_copyFutureWatcher;
-    std::unique_ptr<IPathMatcher> m_matcher;
+    IPathMatcher::Ptr m_matcher;
     bool m_keepPlaytime;
     bool m_useLinks = false;
     bool m_useHardLinks = false;
diff --git a/launcher/JavaCommon.cpp b/launcher/JavaCommon.cpp
index e16ac9255..b2f7bcdcf 100644
--- a/launcher/JavaCommon.cpp
+++ b/launcher/JavaCommon.cpp
@@ -122,7 +122,7 @@ void JavaCommon::TestCheck::run()
     checker->performCheck();
 }
 
-void JavaCommon::TestCheck::checkFinished(JavaCheckResult result)
+void JavaCommon::TestCheck::checkFinished(const JavaCheckResult& result)
 {
     if (result.validity != JavaCheckResult::Validity::Valid) {
         javaBinaryWasBad(m_parent, result);
@@ -141,7 +141,7 @@ void JavaCommon::TestCheck::checkFinished(JavaCheckResult result)
     checker->performCheck();
 }
 
-void JavaCommon::TestCheck::checkFinishedWithArgs(JavaCheckResult result)
+void JavaCommon::TestCheck::checkFinishedWithArgs(const JavaCheckResult& result)
 {
     if (result.validity == JavaCheckResult::Validity::Valid) {
         javaWasOk(m_parent, result);
diff --git a/launcher/JavaCommon.h b/launcher/JavaCommon.h
index c96f7a985..a69737f53 100644
--- a/launcher/JavaCommon.h
+++ b/launcher/JavaCommon.h
@@ -32,8 +32,8 @@ class TestCheck : public QObject {
     void finished();
 
    private slots:
-    void checkFinished(JavaCheckResult result);
-    void checkFinishedWithArgs(JavaCheckResult result);
+    void checkFinished(const JavaCheckResult& result);
+    void checkFinishedWithArgs(const JavaCheckResult& result);
 
    private:
     std::shared_ptr<JavaChecker> checker;
diff --git a/launcher/VersionProxyModel.cpp b/launcher/VersionProxyModel.cpp
index 0ab9ae2c3..a94d1e052 100644
--- a/launcher/VersionProxyModel.cpp
+++ b/launcher/VersionProxyModel.cpp
@@ -181,8 +181,8 @@ QVariant VersionProxyModel::data(const QModelIndex& index, int role) const
                 if (value.toBool()) {
                     return tr("Recommended");
                 } else if (hasLatest) {
-                    auto value = sourceModel()->data(parentIndex, BaseVersionList::LatestRole);
-                    if (value.toBool()) {
+                    auto latest = sourceModel()->data(parentIndex, BaseVersionList::LatestRole);
+                    if (latest.toBool()) {
                         return tr("Latest");
                     }
                 }
@@ -191,33 +191,27 @@ QVariant VersionProxyModel::data(const QModelIndex& index, int role) const
             }
         }
         case Qt::DecorationRole: {
-            switch (column) {
-                case Name: {
-                    if (hasRecommended) {
-                        auto recommenced = sourceModel()->data(parentIndex, BaseVersionList::RecommendedRole);
-                        if (recommenced.toBool()) {
-                            return APPLICATION->getThemedIcon("star");
-                        } else if (hasLatest) {
-                            auto latest = sourceModel()->data(parentIndex, BaseVersionList::LatestRole);
-                            if (latest.toBool()) {
-                                return APPLICATION->getThemedIcon("bug");
-                            }
-                        }
-                        QPixmap pixmap;
-                        QPixmapCache::find("placeholder", &pixmap);
-                        if (!pixmap) {
-                            QPixmap px(16, 16);
-                            px.fill(Qt::transparent);
-                            QPixmapCache::insert("placeholder", px);
-                            return px;
-                        }
-                        return pixmap;
+            if (column == Name && hasRecommended) {
+                auto recommenced = sourceModel()->data(parentIndex, BaseVersionList::RecommendedRole);
+                if (recommenced.toBool()) {
+                    return APPLICATION->getThemedIcon("star");
+                } else if (hasLatest) {
+                    auto latest = sourceModel()->data(parentIndex, BaseVersionList::LatestRole);
+                    if (latest.toBool()) {
+                        return APPLICATION->getThemedIcon("bug");
                     }
                 }
-                default: {
-                    return QVariant();
+                QPixmap pixmap;
+                QPixmapCache::find("placeholder", &pixmap);
+                if (!pixmap) {
+                    QPixmap px(16, 16);
+                    px.fill(Qt::transparent);
+                    QPixmapCache::insert("placeholder", px);
+                    return px;
                 }
+                return pixmap;
             }
+            return QVariant();
         }
         default: {
             if (roles.contains((BaseVersionList::ModelRoles)role)) {
diff --git a/launcher/java/JavaChecker.h b/launcher/java/JavaChecker.h
index 743f49417..ed411abff 100644
--- a/launcher/java/JavaChecker.h
+++ b/launcher/java/JavaChecker.h
@@ -38,7 +38,7 @@ class JavaChecker : public QObject {
     int m_permGen = 64;
 
    signals:
-    void checkFinished(JavaCheckResult result);
+    void checkFinished(const JavaCheckResult& result);
 
    private:
     QProcessPtr process;
diff --git a/launcher/java/JavaCheckerJob.cpp b/launcher/java/JavaCheckerJob.cpp
index 870e2a09a..c44518d35 100644
--- a/launcher/java/JavaCheckerJob.cpp
+++ b/launcher/java/JavaCheckerJob.cpp
@@ -17,7 +17,7 @@
 
 #include <QDebug>
 
-void JavaCheckerJob::partFinished(JavaCheckResult result)
+void JavaCheckerJob::partFinished(const JavaCheckResult& result)
 {
     num_finished++;
     qDebug() << m_job_name.toLocal8Bit() << "progress:" << num_finished << "/" << javacheckers.size();
diff --git a/launcher/java/JavaCheckerJob.h b/launcher/java/JavaCheckerJob.h
index 009687917..cbe799d0a 100644
--- a/launcher/java/JavaCheckerJob.h
+++ b/launcher/java/JavaCheckerJob.h
@@ -43,7 +43,7 @@ class JavaCheckerJob : public Task {
     QList<JavaCheckResult> getResults() { return javaresults; }
 
    private slots:
-    void partFinished(JavaCheckResult result);
+    void partFinished(const JavaCheckResult& result);
 
    protected:
     virtual void executeTask() override;
diff --git a/launcher/java/JavaVersion.cpp b/launcher/java/JavaVersion.cpp
index f9ac47824..9c482280f 100644
--- a/launcher/java/JavaVersion.cpp
+++ b/launcher/java/JavaVersion.cpp
@@ -43,7 +43,7 @@ QString JavaVersion::toString() const
     return m_string;
 }
 
-bool JavaVersion::requiresPermGen()
+bool JavaVersion::requiresPermGen() const
 {
     if (m_parseable) {
         return m_major < 8;
diff --git a/launcher/java/JavaVersion.h b/launcher/java/JavaVersion.h
index 7e66269cb..80ad7717b 100644
--- a/launcher/java/JavaVersion.h
+++ b/launcher/java/JavaVersion.h
@@ -23,7 +23,7 @@ class JavaVersion {
     bool operator==(const JavaVersion& rhs);
     bool operator>(const JavaVersion& rhs);
 
-    bool requiresPermGen();
+    bool requiresPermGen() const;
 
     QString toString() const;
 
diff --git a/launcher/launch/steps/CheckJava.cpp b/launcher/launch/steps/CheckJava.cpp
index 81337a88e..443ae2ba5 100644
--- a/launcher/launch/steps/CheckJava.cpp
+++ b/launcher/launch/steps/CheckJava.cpp
@@ -106,7 +106,7 @@ void CheckJava::executeTask()
     emitSucceeded();
 }
 
-void CheckJava::checkJavaFinished(JavaCheckResult result)
+void CheckJava::checkJavaFinished(const JavaCheckResult& result)
 {
     switch (result.validity) {
         case JavaCheckResult::Validity::Errored: {
diff --git a/launcher/launch/steps/CheckJava.h b/launcher/launch/steps/CheckJava.h
index 4436e2a55..961cc7a63 100644
--- a/launcher/launch/steps/CheckJava.h
+++ b/launcher/launch/steps/CheckJava.h
@@ -28,7 +28,7 @@ class CheckJava : public LaunchStep {
     virtual void executeTask();
     virtual bool canAbort() const { return false; }
    private slots:
-    void checkJavaFinished(JavaCheckResult result);
+    void checkJavaFinished(const JavaCheckResult& result);
 
    private:
     void printJavaInfo(const QString& version, const QString& architecture, const QString& realArchitecture, const QString& vendor);
diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp
index 9e42c5dd6..a6fc916f6 100644
--- a/launcher/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
@@ -506,13 +506,9 @@ QVariant PackProfile::data(const QModelIndex& index, int role) const
 
     switch (role) {
         case Qt::CheckStateRole: {
-            switch (column) {
-                case NameColumn: {
-                    return patch->isEnabled() ? Qt::Checked : Qt::Unchecked;
-                }
-                default:
-                    return QVariant();
-            }
+            if (column == NameColumn)
+                return patch->isEnabled() ? Qt::Checked : Qt::Unchecked;
+            return QVariant();
         }
         case Qt::DisplayRole: {
             switch (column) {
diff --git a/launcher/minecraft/WorldList.cpp b/launcher/minecraft/WorldList.cpp
index 812b13c71..cf27be676 100644
--- a/launcher/minecraft/WorldList.cpp
+++ b/launcher/minecraft/WorldList.cpp
@@ -208,13 +208,9 @@ QVariant WorldList::data(const QModelIndex& index, int role) const
             }
 
         case Qt::UserRole:
-            switch (column) {
-                case SizeColumn:
-                    return QVariant::fromValue<qlonglong>(world.bytes());
-
-                default:
-                    return data(index, Qt::DisplayRole);
-            }
+            if (column == SizeColumn)
+                return QVariant::fromValue<qlonglong>(world.bytes());
+            return data(index, Qt::DisplayRole);
 
         case Qt::ToolTipRole: {
             if (column == InfoColumn) {
diff --git a/launcher/minecraft/auth/AccountList.cpp b/launcher/minecraft/auth/AccountList.cpp
index b141909a9..eec8500d5 100644
--- a/launcher/minecraft/auth/AccountList.cpp
+++ b/launcher/minecraft/auth/AccountList.cpp
@@ -262,6 +262,30 @@ int AccountList::count() const
     return m_accounts.count();
 }
 
+QString getAccountStatus(AccountState status)
+{
+    switch (status) {
+        case AccountState::Unchecked:
+            return QObject::tr("Unchecked", "Account status");
+        case AccountState::Offline:
+            return QObject::tr("Offline", "Account status");
+        case AccountState::Online:
+            return QObject::tr("Ready", "Account status");
+        case AccountState::Working:
+            return QObject::tr("Working", "Account status");
+        case AccountState::Errored:
+            return QObject::tr("Errored", "Account status");
+        case AccountState::Expired:
+            return QObject::tr("Expired", "Account status");
+        case AccountState::Disabled:
+            return QObject::tr("Disabled", "Account status");
+        case AccountState::Gone:
+            return QObject::tr("Gone", "Account status");
+        default:
+            return QObject::tr("Unknown", "Account status");
+    }
+}
+
 QVariant AccountList::data(const QModelIndex& index, int role) const
 {
     if (!index.isValid())
@@ -275,51 +299,17 @@ QVariant AccountList::data(const QModelIndex& index, int role) const
     switch (role) {
         case Qt::DisplayRole:
             switch (index.column()) {
-                case ProfileNameColumn: {
+                case ProfileNameColumn:
                     return account->profileName();
-                }
-
                 case NameColumn:
                     return account->accountDisplayString();
-
                 case TypeColumn: {
                     auto typeStr = account->typeString();
                     typeStr[0] = typeStr[0].toUpper();
                     return typeStr;
                 }
-
-                case StatusColumn: {
-                    switch (account->accountState()) {
-                        case AccountState::Unchecked: {
-                            return tr("Unchecked", "Account status");
-                        }
-                        case AccountState::Offline: {
-                            return tr("Offline", "Account status");
-                        }
-                        case AccountState::Online: {
-                            return tr("Ready", "Account status");
-                        }
-                        case AccountState::Working: {
-                            return tr("Working", "Account status");
-                        }
-                        case AccountState::Errored: {
-                            return tr("Errored", "Account status");
-                        }
-                        case AccountState::Expired: {
-                            return tr("Expired", "Account status");
-                        }
-                        case AccountState::Disabled: {
-                            return tr("Disabled", "Account status");
-                        }
-                        case AccountState::Gone: {
-                            return tr("Gone", "Account status");
-                        }
-                        default: {
-                            return tr("Unknown", "Account status");
-                        }
-                    }
-                }
-
+                case StatusColumn:
+                    return getAccountStatus(account->accountState());
                 default:
                     return QVariant();
             }
@@ -331,11 +321,9 @@ QVariant AccountList::data(const QModelIndex& index, int role) const
             return QVariant::fromValue(account);
 
         case Qt::CheckStateRole:
-            if (index.column() == ProfileNameColumn) {
+            if (index.column() == ProfileNameColumn)
                 return account == m_defaultAccount ? Qt::Checked : Qt::Unchecked;
-            } else {
-                return QVariant();
-            }
+            return QVariant();
 
         default:
             return QVariant();
@@ -457,18 +445,14 @@ bool AccountList::loadList()
 
     // Make sure the format version matches.
     auto listVersion = root.value("formatVersion").toVariant().toInt();
-    switch (listVersion) {
-        case AccountListVersion::MojangMSA: {
-            return loadV3(root);
-        } break;
-        default: {
-            QString newName = "accounts-old.json";
-            qWarning() << "Unknown format version when loading account list. Existing one will be renamed to" << newName;
-            // Attempt to rename the old version.
-            file.rename(newName);
-            return false;
-        }
-    }
+    if (listVersion == AccountListVersion::MojangMSA)
+        return loadV3(root);
+
+    QString newName = "accounts-old.json";
+    qWarning() << "Unknown format version when loading account list. Existing one will be renamed to" << newName;
+    // Attempt to rename the old version.
+    file.rename(newName);
+    return false;
 }
 
 bool AccountList::loadV3(QJsonObject& root)
diff --git a/launcher/minecraft/auth/flows/AuthFlow.cpp b/launcher/minecraft/auth/flows/AuthFlow.cpp
index c51839a8c..16e8203f2 100644
--- a/launcher/minecraft/auth/flows/AuthFlow.cpp
+++ b/launcher/minecraft/auth/flows/AuthFlow.cpp
@@ -45,18 +45,12 @@ void AuthFlow::nextStep()
 
 QString AuthFlow::getStateMessage() const
 {
-    switch (m_taskState) {
-        case AccountTaskState::STATE_WORKING: {
-            if (m_currentStep) {
-                return m_currentStep->describe();
-            } else {
-                return tr("Working...");
-            }
-        }
-        default: {
-            return AccountTask::getStateMessage();
-        }
+    if (m_taskState == AccountTaskState::STATE_WORKING) {
+        if (m_currentStep)
+            return m_currentStep->describe();
+        return tr("Working...");
     }
+    return AccountTask::getStateMessage();
 }
 
 void AuthFlow::stepFinished(AccountTaskState resultingState, QString message)
diff --git a/launcher/minecraft/gameoptions/GameOptions.cpp b/launcher/minecraft/gameoptions/GameOptions.cpp
index 4f4fb99a7..25f7074ec 100644
--- a/launcher/minecraft/gameoptions/GameOptions.cpp
+++ b/launcher/minecraft/gameoptions/GameOptions.cpp
@@ -87,16 +87,12 @@ QVariant GameOptions::data(const QModelIndex& index, int role) const
     if (row < 0 || row >= int(contents.size()))
         return QVariant();
 
-    switch (role) {
-        case Qt::DisplayRole:
-            if (column == 0) {
-                return contents[row].key;
-            } else {
-                return contents[row].value;
-            }
-        default:
-            return QVariant();
+    if (role == Qt::DisplayRole) {
+        if (column == 0)
+            return contents[row].key;
+        return contents[row].value;
     }
+    return QVariant();
 }
 
 int GameOptions::rowCount(const QModelIndex&) const
diff --git a/launcher/minecraft/mod/DataPack.cpp b/launcher/minecraft/mod/DataPack.cpp
index fc2d3f68b..3a5d834be 100644
--- a/launcher/minecraft/mod/DataPack.cpp
+++ b/launcher/minecraft/mod/DataPack.cpp
@@ -68,24 +68,18 @@ std::pair<Version, Version> DataPack::compatibleVersions() const
 std::pair<int, bool> DataPack::compare(const Resource& other, SortType type) const
 {
     auto const& cast_other = static_cast<DataPack const&>(other);
+    if (type == SortType::PACK_FORMAT) {
+        auto this_ver = packFormat();
+        auto other_ver = cast_other.packFormat();
 
-    switch (type) {
-        default: {
-            auto res = Resource::compare(other, type);
-            if (res.first != 0)
-                return res;
-            break;
-        }
-        case SortType::PACK_FORMAT: {
-            auto this_ver = packFormat();
-            auto other_ver = cast_other.packFormat();
-
-            if (this_ver > other_ver)
-                return { 1, type == SortType::PACK_FORMAT };
-            if (this_ver < other_ver)
-                return { -1, type == SortType::PACK_FORMAT };
-            break;
-        }
+        if (this_ver > other_ver)
+            return { 1, type == SortType::PACK_FORMAT };
+        if (this_ver < other_ver)
+            return { -1, type == SortType::PACK_FORMAT };
+    } else {
+        auto res = Resource::compare(other, type);
+        if (res.first != 0)
+            return res;
     }
     return { 0, false };
 }
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index a5f1489dd..d4a2c2ff9 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -132,12 +132,9 @@ QVariant ModFolderModel::data(const QModelIndex& index, int role) const
             return {};
         }
         case Qt::CheckStateRole:
-            switch (column) {
-                case ActiveColumn:
-                    return at(row)->enabled() ? Qt::Checked : Qt::Unchecked;
-                default:
-                    return QVariant();
-            }
+            if (column == ActiveColumn)
+                return at(row)->enabled() ? Qt::Checked : Qt::Unchecked;
+            return QVariant();
         default:
             return QVariant();
     }
diff --git a/launcher/minecraft/mod/ResourceFolderModel.cpp b/launcher/minecraft/mod/ResourceFolderModel.cpp
index 0503b660b..55ed2a8fd 100644
--- a/launcher/minecraft/mod/ResourceFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourceFolderModel.cpp
@@ -440,12 +440,9 @@ QVariant ResourceFolderModel::data(const QModelIndex& index, int role) const
             return {};
         }
         case Qt::CheckStateRole:
-            switch (column) {
-                case ACTIVE_COLUMN:
-                    return m_resources[row]->enabled() ? Qt::Checked : Qt::Unchecked;
-                default:
-                    return {};
-            }
+            if (column == ACTIVE_COLUMN)
+                return m_resources[row]->enabled() ? Qt::Checked : Qt::Unchecked;
+            return {};
         default:
             return {};
     }
diff --git a/launcher/minecraft/mod/ResourcePack.cpp b/launcher/minecraft/mod/ResourcePack.cpp
index 074534405..4aa473a34 100644
--- a/launcher/minecraft/mod/ResourcePack.cpp
+++ b/launcher/minecraft/mod/ResourcePack.cpp
@@ -97,24 +97,18 @@ std::pair<Version, Version> ResourcePack::compatibleVersions() const
 std::pair<int, bool> ResourcePack::compare(const Resource& other, SortType type) const
 {
     auto const& cast_other = static_cast<ResourcePack const&>(other);
+    if (type == SortType::PACK_FORMAT) {
+        auto this_ver = packFormat();
+        auto other_ver = cast_other.packFormat();
 
-    switch (type) {
-        default: {
-            auto res = Resource::compare(other, type);
-            if (res.first != 0)
-                return res;
-            break;
-        }
-        case SortType::PACK_FORMAT: {
-            auto this_ver = packFormat();
-            auto other_ver = cast_other.packFormat();
-
-            if (this_ver > other_ver)
-                return { 1, type == SortType::PACK_FORMAT };
-            if (this_ver < other_ver)
-                return { -1, type == SortType::PACK_FORMAT };
-            break;
-        }
+        if (this_ver > other_ver)
+            return { 1, type == SortType::PACK_FORMAT };
+        if (this_ver < other_ver)
+            return { -1, type == SortType::PACK_FORMAT };
+    } else {
+        auto res = Resource::compare(other, type);
+        if (res.first != 0)
+            return res;
     }
     return { 0, false };
 }
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
index f27431576..6ef7b6e63 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
@@ -118,12 +118,9 @@ QVariant ResourcePackFolderModel::data(const QModelIndex& index, int role) const
             return m_resources[row]->internal_id();
         }
         case Qt::CheckStateRole:
-            switch (column) {
-                case ActiveColumn:
-                    return at(row)->enabled() ? Qt::Checked : Qt::Unchecked;
-                default:
-                    return {};
-            }
+            if (column == ActiveColumn)
+                return at(row)->enabled() ? Qt::Checked : Qt::Unchecked;
+            return {};
         default:
             return {};
     }
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.h b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
index ffc358fbb..ee5960e30 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.h
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
@@ -62,7 +62,7 @@ class UserInteractionSupport {
     /**
      * Requests a user interaction to select which optional mods should be installed.
      */
-    virtual std::optional<QVector<QString>> chooseOptionalMods(PackVersion version, QVector<ATLauncher::VersionMod> mods) = 0;
+    virtual std::optional<QVector<QString>> chooseOptionalMods(const PackVersion& version, QVector<ATLauncher::VersionMod> mods) = 0;
 
     /**
      * Requests a user interaction to select a component version from a given version list
diff --git a/launcher/modplatform/legacy_ftb/PackFetchTask.h b/launcher/modplatform/legacy_ftb/PackFetchTask.h
index f2116ce99..e3c303a50 100644
--- a/launcher/modplatform/legacy_ftb/PackFetchTask.h
+++ b/launcher/modplatform/legacy_ftb/PackFetchTask.h
@@ -40,7 +40,7 @@ class PackFetchTask : public QObject {
     void failed(QString reason);
     void aborted();
 
-    void privateFileDownloadFinished(Modpack modpack);
+    void privateFileDownloadFinished(const Modpack& modpack);
     void privateFileDownloadFailed(QString reason, QString packCode);
 };
 
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
index 761f622bb..5fd8ccbd2 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
@@ -52,7 +52,7 @@
 
 namespace LegacyFTB {
 
-PackInstallTask::PackInstallTask(shared_qobject_ptr<QNetworkAccessManager> network, Modpack pack, QString version)
+PackInstallTask::PackInstallTask(shared_qobject_ptr<QNetworkAccessManager> network, const Modpack& pack, QString version)
 {
     m_pack = pack;
     m_version = version;
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.h b/launcher/modplatform/legacy_ftb/PackInstallTask.h
index 30ff48597..42808a1a2 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.h
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h
@@ -18,7 +18,7 @@ class PackInstallTask : public InstanceTask {
     Q_OBJECT
 
    public:
-    explicit PackInstallTask(shared_qobject_ptr<QNetworkAccessManager> network, Modpack pack, QString version);
+    explicit PackInstallTask(shared_qobject_ptr<QNetworkAccessManager> network, const Modpack& pack, QString version);
     virtual ~PackInstallTask() {}
 
     bool canAbort() const override { return true; }
diff --git a/launcher/pathmatcher/MultiMatcher.h b/launcher/pathmatcher/MultiMatcher.h
index 101595809..1d15edf82 100644
--- a/launcher/pathmatcher/MultiMatcher.h
+++ b/launcher/pathmatcher/MultiMatcher.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <SeparatorPrefixTree.h>
 #include <QRegularExpression>
 #include "IPathMatcher.h"
diff --git a/launcher/pathmatcher/RegexpMatcher.h b/launcher/pathmatcher/RegexpMatcher.h
index a6a3e616d..18c42f887 100644
--- a/launcher/pathmatcher/RegexpMatcher.h
+++ b/launcher/pathmatcher/RegexpMatcher.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <QRegularExpression>
 #include "IPathMatcher.h"
 
diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index 1a70ea59a..6cf037743 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -267,6 +267,7 @@ auto ModUpdateDialog::ensureMetadata() -> bool
     bool skip_rest = false;
     ModPlatform::ResourceProvider provider_rest = ModPlatform::ResourceProvider::MODRINTH;
 
+    // adds mod to list based on provider
     auto addToTmp = [&](Mod* m, ModPlatform::ResourceProvider p) {
         switch (p) {
             case ModPlatform::ResourceProvider::MODRINTH:
@@ -278,6 +279,7 @@ auto ModUpdateDialog::ensureMetadata() -> bool
         }
     };
 
+    // ask the user on what provider to seach for the mod first
     for (auto candidate : m_candidates) {
         if (candidate->status() != ModStatus::NoMetadata) {
             onMetadataEnsured(candidate);
@@ -320,6 +322,7 @@ auto ModUpdateDialog::ensureMetadata() -> bool
             addToTmp(candidate, response.chosen);
     }
 
+    // prepare task for the modrinth mods
     if (!modrinth_tmp.empty()) {
         auto modrinth_task = makeShared<EnsureMetadataTask>(modrinth_tmp, index_dir, ModPlatform::ResourceProvider::MODRINTH);
         connect(modrinth_task.get(), &EnsureMetadataTask::metadataReady, [this](Mod* candidate) { onMetadataEnsured(candidate); });
@@ -333,6 +336,7 @@ auto ModUpdateDialog::ensureMetadata() -> bool
         seq.addTask(modrinth_task);
     }
 
+    // prepare task for the flame mods
     if (!flame_tmp.empty()) {
         auto flame_task = makeShared<EnsureMetadataTask>(flame_tmp, index_dir, ModPlatform::ResourceProvider::FLAME);
         connect(flame_task.get(), &EnsureMetadataTask::metadataReady, [this](Mod* candidate) { onMetadataEnsured(candidate); });
@@ -348,6 +352,7 @@ auto ModUpdateDialog::ensureMetadata() -> bool
 
     seq.addTask(m_second_try_metadata);
 
+    // execute all the tasks
     ProgressDialog checking_dialog(m_parent);
     checking_dialog.setSkipButton(true, tr("Abort"));
     checking_dialog.setWindowTitle(tr("Generating metadata..."));
@@ -444,13 +449,8 @@ void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info, QStri
     auto changelog_area = new QTextBrowser();
 
     QString text = info.changelog;
-    switch (info.provider) {
-        case ModPlatform::ResourceProvider::MODRINTH: {
-            text = markdownToHTML(info.changelog.toUtf8());
-            break;
-        }
-        default:
-            break;
+    if (info.provider == ModPlatform::ResourceProvider::MODRINTH) {
+        text = markdownToHTML(info.changelog.toUtf8());
     }
 
     changelog_area->setHtml(text);
diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index 2142e6c9f..440c61420 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -316,10 +316,10 @@ class ServersModel : public QAbstractListModel {
         if (row < 0 || row >= m_servers.size())
             return QVariant();
 
-        switch (column) {
-            case 0:
-                switch (role) {
-                    case Qt::DecorationRole: {
+        switch (role) {
+            case Qt::DecorationRole: {
+                switch (column) {
+                    case 0: {
                         auto& bytes = m_servers[row].m_icon;
                         if (bytes.size()) {
                             QPixmap px;
@@ -328,27 +328,24 @@ class ServersModel : public QAbstractListModel {
                         }
                         return APPLICATION->getThemedIcon("unknown_server");
                     }
-                    case Qt::DisplayRole:
-                        return m_servers[row].m_name;
-                    case ServerPtrRole:
-                        return QVariant::fromValue<void*>((void*)&m_servers[row]);
-                    default:
-                        return QVariant();
-                }
-            case 1:
-                switch (role) {
-                    case Qt::DisplayRole:
+                    case 1:
                         return m_servers[row].m_address;
-                    default:
-                        return QVariant();
-                }
-            case 2:
-                switch (role) {
-                    case Qt::DisplayRole:
+                    case 2:
                         return m_servers[row].m_ping;
                     default:
                         return QVariant();
                 }
+            }
+            case Qt::DisplayRole:
+                if (column == 0)
+                    return m_servers[row].m_name;
+                else
+                    return QVariant();
+            case ServerPtrRole:
+                if (column == 0)
+                    return QVariant::fromValue<void*>((void*)&m_servers[row]);
+                else
+                    return QVariant();
             default:
                 return QVariant();
         }
diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp
index 587bb6ce6..307977abf 100644
--- a/launcher/ui/pages/instance/WorldListPage.cpp
+++ b/launcher/ui/pages/instance/WorldListPage.cpp
@@ -161,12 +161,9 @@ void WorldListPage::retranslate()
 
 bool WorldListPage::worldListFilter(QKeyEvent* keyEvent)
 {
-    switch (keyEvent->key()) {
-        case Qt::Key_Delete:
-            on_actionRemove_triggered();
-            return true;
-        default:
-            break;
+    if (keyEvent->key() == Qt::Key_Delete) {
+        on_actionRemove_triggered();
+        return true;
     }
     return QWidget::eventFilter(ui->worldTreeView, keyEvent);
 }
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
index 6fb867733..d84737bf5 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
@@ -45,7 +45,9 @@
 
 #include "net/ApiDownload.h"
 
-AtlOptionalModListModel::AtlOptionalModListModel(QWidget* parent, ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods)
+AtlOptionalModListModel::AtlOptionalModListModel(QWidget* parent,
+                                                 const ATLauncher::PackVersion& version,
+                                                 QVector<ATLauncher::VersionMod> mods)
     : QAbstractListModel(parent), m_version(version), m_mods(mods)
 {
     // fill mod index
@@ -233,7 +235,7 @@ void AtlOptionalModListModel::clearAll()
     emit dataChanged(AtlOptionalModListModel::index(0, EnabledColumn), AtlOptionalModListModel::index(m_mods.size() - 1, EnabledColumn));
 }
 
-void AtlOptionalModListModel::toggleMod(ATLauncher::VersionMod mod, int index)
+void AtlOptionalModListModel::toggleMod(const ATLauncher::VersionMod& mod, int index)
 {
     auto enable = !m_selection[mod.name];
 
@@ -251,7 +253,7 @@ void AtlOptionalModListModel::toggleMod(ATLauncher::VersionMod mod, int index)
     setMod(mod, index, enable);
 }
 
-void AtlOptionalModListModel::setMod(ATLauncher::VersionMod mod, int index, bool enable, bool shouldEmit)
+void AtlOptionalModListModel::setMod(const ATLauncher::VersionMod& mod, int index, bool enable, bool shouldEmit)
 {
     if (m_selection[mod.name] == enable)
         return;
@@ -313,7 +315,7 @@ void AtlOptionalModListModel::setMod(ATLauncher::VersionMod mod, int index, bool
     }
 }
 
-AtlOptionalModDialog::AtlOptionalModDialog(QWidget* parent, ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods)
+AtlOptionalModDialog::AtlOptionalModDialog(QWidget* parent, const ATLauncher::PackVersion& version, QVector<ATLauncher::VersionMod> mods)
     : QDialog(parent), ui(new Ui::AtlOptionalModDialog)
 {
     ui->setupUi(this);
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.h b/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.h
index 55903003b..87d163f9d 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.h
@@ -55,7 +55,7 @@ class AtlOptionalModListModel : public QAbstractListModel {
         DescriptionColumn,
     };
 
-    AtlOptionalModListModel(QWidget* parent, ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods);
+    AtlOptionalModListModel(QWidget* parent, const ATLauncher::PackVersion& version, QVector<ATLauncher::VersionMod> mods);
 
     QVector<QString> getResult();
 
@@ -78,8 +78,8 @@ class AtlOptionalModListModel : public QAbstractListModel {
     void clearAll();
 
    private:
-    void toggleMod(ATLauncher::VersionMod mod, int index);
-    void setMod(ATLauncher::VersionMod mod, int index, bool enable, bool shouldEmit = true);
+    void toggleMod(const ATLauncher::VersionMod& mod, int index);
+    void setMod(const ATLauncher::VersionMod& mod, int index, bool enable, bool shouldEmit = true);
 
    private:
     NetJob::Ptr m_jobPtr;
@@ -97,7 +97,7 @@ class AtlOptionalModDialog : public QDialog {
     Q_OBJECT
 
    public:
-    AtlOptionalModDialog(QWidget* parent, ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods);
+    AtlOptionalModDialog(QWidget* parent, const ATLauncher::PackVersion& version, QVector<ATLauncher::VersionMod> mods);
     ~AtlOptionalModDialog() override;
 
     QVector<QString> getResult() { return listModel->getResult(); }
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
index 0c7257859..7550ff758 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
@@ -41,7 +41,7 @@
 
 AtlUserInteractionSupportImpl::AtlUserInteractionSupportImpl(QWidget* parent) : m_parent(parent) {}
 
-std::optional<QVector<QString>> AtlUserInteractionSupportImpl::chooseOptionalMods(ATLauncher::PackVersion version,
+std::optional<QVector<QString>> AtlUserInteractionSupportImpl::chooseOptionalMods(const ATLauncher::PackVersion& version,
                                                                                   QVector<ATLauncher::VersionMod> mods)
 {
     AtlOptionalModDialog optionalModDialog(m_parent, version, mods);
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
index 52ced2615..7ff021105 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
@@ -48,7 +48,8 @@ class AtlUserInteractionSupportImpl : public QObject, public ATLauncher::UserInt
 
    private:
     QString chooseVersion(Meta::VersionList::Ptr vlist, QString minecraftVersion) override;
-    std::optional<QVector<QString>> chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods) override;
+    std::optional<QVector<QString>> chooseOptionalMods(const ATLauncher::PackVersion& version,
+                                                       QVector<ATLauncher::VersionMod> mods) override;
     void displayMessage(QString message) override;
 
    private:
diff --git a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
index 134bdc0c3..d2bd0ba69 100644
--- a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
@@ -73,9 +73,6 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
     }
 
     auto pack = modpacks.at(pos);
-    if (role == Qt::ToolTipRole) {
-    }
-
     switch (role) {
         case Qt::ToolTipRole:
             return tr("Minecraft %1").arg(pack.mcVersion);
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
index 49666cf6e..8b3ff8e41 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
@@ -213,7 +213,7 @@ void ListModel::fill(ModpackList modpacks_)
     endResetModel();
 }
 
-void ListModel::addPack(Modpack modpack)
+void ListModel::addPack(const Modpack& modpack)
 {
     beginResetModel();
     this->modpacks.append(modpack);
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h
index c802a4b56..ecdd6cca3 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h
@@ -62,7 +62,7 @@ class ListModel : public QAbstractListModel {
     Qt::ItemFlags flags(const QModelIndex& index) const override;
 
     void fill(ModpackList modpacks);
-    void addPack(Modpack modpack);
+    void addPack(const Modpack& modpack);
     void clear();
     void remove(int row);
 
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
index 4104f1391..187a121cc 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
@@ -216,7 +216,7 @@ void Page::ftbPackDataDownloadAborted()
     CustomMessageBox::selectable(this, tr("Task aborted"), tr("The task has been aborted by the user."), QMessageBox::Information)->show();
 }
 
-void Page::ftbPrivatePackDataDownloadSuccessfully(Modpack pack)
+void Page::ftbPrivatePackDataDownloadSuccessfully(const Modpack& pack)
 {
     privateListModel->addPack(pack);
 }
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.h b/launcher/ui/pages/modplatform/legacy_ftb/Page.h
index 4d317b7c0..ac8abdfa6 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.h
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.h
@@ -80,7 +80,7 @@ class Page : public QWidget, public BasePage {
     void ftbPackDataDownloadFailed(QString reason);
     void ftbPackDataDownloadAborted();
 
-    void ftbPrivatePackDataDownloadSuccessfully(Modpack pack);
+    void ftbPrivatePackDataDownloadSuccessfully(const Modpack& pack);
     void ftbPrivatePackDataDownloadFailed(QString reason, QString packCode);
 
     void onSortingSelectionChanged(QString data);
diff --git a/launcher/ui/widgets/FocusLineEdit.h b/launcher/ui/widgets/FocusLineEdit.h
index f5ea6602e..797969406 100644
--- a/launcher/ui/widgets/FocusLineEdit.h
+++ b/launcher/ui/widgets/FocusLineEdit.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <QLineEdit>
 
 class FocusLineEdit : public QLineEdit {
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index d2d921918..cb8b3289f 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -370,7 +370,7 @@ void JavaSettingsWidget::checkJavaPath(const QString& path)
     m_checker->performCheck();
 }
 
-void JavaSettingsWidget::checkFinished(JavaCheckResult result)
+void JavaSettingsWidget::checkFinished(const JavaCheckResult& result)
 {
     m_result = result;
     switch (result.validity) {
diff --git a/launcher/ui/widgets/JavaSettingsWidget.h b/launcher/ui/widgets/JavaSettingsWidget.h
index 6ea73da60..3aa693c86 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.h
+++ b/launcher/ui/widgets/JavaSettingsWidget.h
@@ -50,7 +50,7 @@ class JavaSettingsWidget : public QWidget {
     void javaVersionSelected(BaseVersion::Ptr version);
     void on_javaBrowseBtn_clicked();
     void on_javaStatusBtn_clicked();
-    void checkFinished(JavaCheckResult result);
+    void checkFinished(const JavaCheckResult& result);
 
    protected: /* methods */
     void checkJavaPathOnEdit(const QString& path);
diff --git a/tests/FileSystem_test.cpp b/tests/FileSystem_test.cpp
index 1d3cee85f..d9c433d69 100644
--- a/tests/FileSystem_test.cpp
+++ b/tests/FileSystem_test.cpp
@@ -2,6 +2,7 @@
 #include <QStandardPaths>
 #include <QTemporaryDir>
 #include <QTest>
+#include <memory>
 
 #include <tasks/Task.h>
 
@@ -42,7 +43,7 @@ class LinkTask : public Task {
 
     ~LinkTask() { delete m_lnk; }
 
-    void matcher(const IPathMatcher* filter) { m_lnk->matcher(filter); }
+    void matcher(IPathMatcher::Ptr filter) { m_lnk->matcher(filter); }
 
     void linkRecursively(bool recursive)
     {
@@ -237,8 +238,8 @@ class FileSystemTest : public QObject {
             qDebug() << tempDir.path();
             qDebug() << target_dir.path();
             FS::copy c(folder, target_dir.path());
-            RegexpMatcher re("[.]?mcmeta");
-            c.matcher(&re);
+            RegexpMatcher::Ptr re = std::make_shared<RegexpMatcher>("[.]?mcmeta");
+            c.matcher(re);
             c();
 
             for (auto entry : target_dir.entryList()) {
@@ -270,8 +271,8 @@ class FileSystemTest : public QObject {
             qDebug() << tempDir.path();
             qDebug() << target_dir.path();
             FS::copy c(folder, target_dir.path());
-            RegexpMatcher re("[.]?mcmeta");
-            c.matcher(&re);
+            RegexpMatcher::Ptr re = std::make_shared<RegexpMatcher>("[.]?mcmeta");
+            c.matcher(re);
             c.whitelist(true);
             c();
 
@@ -462,8 +463,8 @@ class FileSystemTest : public QObject {
             qDebug() << target_dir.path();
 
             LinkTask lnk_tsk(folder, target_dir.path());
-            RegexpMatcher re("[.]?mcmeta");
-            lnk_tsk.matcher(&re);
+            RegexpMatcher::Ptr re = std::make_shared<RegexpMatcher>("[.]?mcmeta");
+            lnk_tsk.matcher(re);
             lnk_tsk.linkRecursively(true);
             QObject::connect(&lnk_tsk, &Task::finished,
                              [&] { QVERIFY2(lnk_tsk.wasSuccessful(), "Task finished but was not successful when it should have been."); });
@@ -508,8 +509,8 @@ class FileSystemTest : public QObject {
             qDebug() << target_dir.path();
 
             LinkTask lnk_tsk(folder, target_dir.path());
-            RegexpMatcher re("[.]?mcmeta");
-            lnk_tsk.matcher(&re);
+            RegexpMatcher::Ptr re = std::make_shared<RegexpMatcher>("[.]?mcmeta");
+            lnk_tsk.matcher(re);
             lnk_tsk.linkRecursively(true);
             lnk_tsk.whitelist(true);
             QObject::connect(&lnk_tsk, &Task::finished,