diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index e9d163b6d..eaf56b6d8 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -314,7 +314,7 @@ QString PackInstallTask::getDirForModType(ModType type, const QString& raw)
         case ModType::TexturePackExtract:
         case ModType::ResourcePackExtract:
         case ModType::MCPC:
-            return Q_NULLPTR;
+            return nullptr;
         case ModType::Forge:
             // Forge detection happens later on, if it cannot be detected it will
             // install a jarmod component.
@@ -342,13 +342,13 @@ QString PackInstallTask::getDirForModType(ModType type, const QString& raw)
             return "shaderpacks";
         case ModType::Millenaire:
             qWarning() << "Unsupported mod type: " + raw;
-            return Q_NULLPTR;
+            return nullptr;
         case ModType::Unknown:
             emitFailed(tr("Unknown mod type: %1").arg(raw));
-            return Q_NULLPTR;
+            return nullptr;
     }
 
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QString PackInstallTask::getVersionForLoader(const QString& uid)
@@ -357,7 +357,7 @@ QString PackInstallTask::getVersionForLoader(const QString& uid)
         auto vlist = APPLICATION->metadataIndex()->get(uid);
         if (!vlist) {
             emitFailed(tr("Failed to get local metadata index for %1").arg(uid));
-            return Q_NULLPTR;
+            return nullptr;
         }
 
         vlist->waitToLoad();
@@ -391,21 +391,21 @@ QString PackInstallTask::getVersionForLoader(const QString& uid)
             }
 
             emitFailed(tr("Failed to find version for %1 loader").arg(ModPlatform::getModLoaderAsString(m_version.loader.type)));
-            return Q_NULLPTR;
+            return nullptr;
         }
         if (m_version.loader.choose) {
             // Fabric Loader doesn't depend on a given Minecraft version.
             if (m_version.loader.type == ModPlatform::ModLoaderType::Fabric) {
-                return m_support->chooseVersion(vlist, Q_NULLPTR);
+                return m_support->chooseVersion(vlist, nullptr);
             }
 
             return m_support->chooseVersion(vlist, m_version.minecraft);
         }
     }
 
-    if (m_version.loader.version == Q_NULLPTR || m_version.loader.version.isEmpty()) {
+    if (m_version.loader.version == nullptr || m_version.loader.version.isEmpty()) {
         emitFailed(tr("No loader version set for modpack!"));
-        return Q_NULLPTR;
+        return nullptr;
     }
 
     return m_version.loader.version;
@@ -785,7 +785,7 @@ void PackInstallTask::downloadMods()
             m_jobPtr->addNetAction(dl);
         } else {
             auto relpath = getDirForModType(mod.type, mod.type_raw);
-            if (relpath == Q_NULLPTR) {
+            if (relpath == nullptr) {
                 continue;
             }
 
@@ -863,7 +863,7 @@ void PackInstallTask::downloadMods()
                     m_modsToDecomp.insert(blocked.localPath, mod);
                 } else {
                     auto relpath = getDirForModType(mod.type, mod.type_raw);
-                    if (relpath == Q_NULLPTR) {
+                    if (relpath == nullptr) {
                         continue;
                     }
 
@@ -1045,7 +1045,7 @@ void PackInstallTask::install()
         switch (m_version.loader.type) {
             case ModPlatform::ModLoaderType::NeoForge: {
                 auto version = getVersionForLoader("net.neoforged");
-                if (version == Q_NULLPTR) {
+                if (version == nullptr) {
                     return;
                 }
 
@@ -1054,7 +1054,7 @@ void PackInstallTask::install()
             }
             case ModPlatform::ModLoaderType::Forge: {
                 auto version = getVersionForLoader("net.minecraftforge");
-                if (version == Q_NULLPTR) {
+                if (version == nullptr) {
                     return;
                 }
 
@@ -1063,7 +1063,7 @@ void PackInstallTask::install()
             }
             case ModPlatform::ModLoaderType::Fabric: {
                 auto version = getVersionForLoader("net.fabricmc.fabric-loader");
-                if (version == Q_NULLPTR) {
+                if (version == nullptr) {
                     return;
                 }
 
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.h b/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.h
index 0ab46ed2d..68fc74854 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlFilterModel.h
@@ -23,7 +23,7 @@ namespace Atl {
 class FilterModel : public QSortFilterProxyModel {
     Q_OBJECT
    public:
-    FilterModel(QObject* parent = Q_NULLPTR);
+    FilterModel(QObject* parent = nullptr);
     enum Sorting {
         ByPopularity,
         ByGameVersion,
diff --git a/launcher/ui/pages/modplatform/ftb/FtbFilterModel.h b/launcher/ui/pages/modplatform/ftb/FtbFilterModel.h
index b9b958f05..d487f2c83 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbFilterModel.h
+++ b/launcher/ui/pages/modplatform/ftb/FtbFilterModel.h
@@ -24,7 +24,7 @@ class FilterModel : public QSortFilterProxyModel {
     Q_OBJECT
 
    public:
-    FilterModel(QObject* parent = Q_NULLPTR);
+    FilterModel(QObject* parent = nullptr);
     enum Sorting {
         ByPlays,
         ByInstalls,
diff --git a/launcher/ui/pages/modplatform/import_ftb/ListModel.h b/launcher/ui/pages/modplatform/import_ftb/ListModel.h
index 72628465f..ea10c5309 100644
--- a/launcher/ui/pages/modplatform/import_ftb/ListModel.h
+++ b/launcher/ui/pages/modplatform/import_ftb/ListModel.h
@@ -29,7 +29,7 @@ namespace FTBImportAPP {
 class FilterModel : public QSortFilterProxyModel {
     Q_OBJECT
    public:
-    FilterModel(QObject* parent = Q_NULLPTR);
+    FilterModel(QObject* parent = nullptr);
     enum Sorting { ByName, ByGameVersion };
     const QMap<QString, Sorting> getAvailableSortings();
     QString translateCurrentSorting();
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h
index e4477c929..343c37c32 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.h
@@ -19,7 +19,7 @@ using LogoCallback = std::function<void(QString)>;
 class FilterModel : public QSortFilterProxyModel {
     Q_OBJECT
    public:
-    FilterModel(QObject* parent = Q_NULLPTR);
+    FilterModel(QObject* parent = nullptr);
     enum Sorting { ByName, ByGameVersion };
     const QMap<QString, Sorting> getAvailableSortings();
     QString translateCurrentSorting();
diff --git a/launcher/ui/setupwizard/BaseWizardPage.h b/launcher/ui/setupwizard/BaseWizardPage.h
index b5ea06214..2aed7db5c 100644
--- a/launcher/ui/setupwizard/BaseWizardPage.h
+++ b/launcher/ui/setupwizard/BaseWizardPage.h
@@ -5,7 +5,7 @@
 
 class BaseWizardPage : public QWizardPage {
    public:
-    explicit BaseWizardPage(QWidget* parent = Q_NULLPTR) : QWizardPage(parent) {}
+    explicit BaseWizardPage(QWidget* parent = nullptr) : QWizardPage(parent) {}
     virtual ~BaseWizardPage() {};
 
     virtual bool wantsRefreshButton() { return false; }
diff --git a/launcher/ui/setupwizard/JavaWizardPage.h b/launcher/ui/setupwizard/JavaWizardPage.h
index 914630d0b..702ef1986 100644
--- a/launcher/ui/setupwizard/JavaWizardPage.h
+++ b/launcher/ui/setupwizard/JavaWizardPage.h
@@ -7,7 +7,7 @@ class JavaWizardWidget;
 class JavaWizardPage : public BaseWizardPage {
     Q_OBJECT
    public:
-    explicit JavaWizardPage(QWidget* parent = Q_NULLPTR);
+    explicit JavaWizardPage(QWidget* parent = nullptr);
 
     virtual ~JavaWizardPage() = default;
 
diff --git a/launcher/ui/setupwizard/LanguageWizardPage.h b/launcher/ui/setupwizard/LanguageWizardPage.h
index 44a062399..bbbdbf082 100644
--- a/launcher/ui/setupwizard/LanguageWizardPage.h
+++ b/launcher/ui/setupwizard/LanguageWizardPage.h
@@ -7,7 +7,7 @@ class LanguageSelectionWidget;
 class LanguageWizardPage : public BaseWizardPage {
     Q_OBJECT
    public:
-    explicit LanguageWizardPage(QWidget* parent = Q_NULLPTR);
+    explicit LanguageWizardPage(QWidget* parent = nullptr);
 
     virtual ~LanguageWizardPage();