From eda4592f191427ed6650139847f30fc7cf930de0 Mon Sep 17 00:00:00 2001
From: Octol1ttle <l1ttleofficial@outlook.com>
Date: Wed, 25 Feb 2026 16:22:49 +0500
Subject: [PATCH] Fix implicit fallthrough

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
---
 launcher/GZip.cpp                             |  3 ++-
 launcher/VersionProxyModel.cpp                |  3 +--
 .../minecraft/mod/ResourcePackFolderModel.cpp | 26 +++++++++----------
 .../modplatform/legacy_ftb/ListModel.cpp      |  1 +
 launcher/ui/widgets/JavaWizardWidget.cpp      |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/launcher/GZip.cpp b/launcher/GZip.cpp
index dc786e10e..201dcd572 100644
--- a/launcher/GZip.cpp
+++ b/launcher/GZip.cpp
@@ -172,7 +172,8 @@ int inf(QFile* source, std::function<bool(const QByteArray&)> handleBlock)
             assert(ret != Z_STREAM_ERROR); /* state not clobbered */
             switch (ret) {
                 case Z_NEED_DICT:
-                    ret = Z_DATA_ERROR; /* and fall through */
+                    ret = Z_DATA_ERROR;
+                    [[fallthrough]];
                 case Z_DATA_ERROR:
                 case Z_MEM_ERROR:
                     (void)inflateEnd(&strm);
diff --git a/launcher/VersionProxyModel.cpp b/launcher/VersionProxyModel.cpp
index 32048db8e..aaab7e8e0 100644
--- a/launcher/VersionProxyModel.cpp
+++ b/launcher/VersionProxyModel.cpp
@@ -198,9 +198,8 @@ QVariant VersionProxyModel::data(const QModelIndex& index, int role) const
                         return tr("Latest");
                     }
                 }
-            } else {
-                return sourceModel()->data(parentIndex, BaseVersionList::VersionIdRole);
             }
+            return sourceModel()->data(parentIndex, BaseVersionList::VersionIdRole);
         }
         case Qt::DecorationRole: {
             if (column == Name && hasRecommended) {
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
index fd59d5765..68533945f 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
@@ -67,22 +67,22 @@ QVariant ResourcePackFolderModel::data(const QModelIndex& index, int role) const
     switch (role) {
         case Qt::BackgroundRole:
             return rowBackground(row);
-        case Qt::DisplayRole:
-            switch (column) {
-                case PackFormatColumn: {
-                    auto& resource = at(row);
-                    auto pack_format = resource.packFormat();
-                    if (pack_format == 0)
-                        return tr("Unrecognized");
+        case Qt::DisplayRole: {
+            if (column == PackFormatColumn) {
+                auto& resource = at(row);
+                auto pack_format = resource.packFormat();
+                if (pack_format == 0)
+                    return tr("Unrecognized");
 
-                    auto version_bounds = resource.compatibleVersions();
-                    if (version_bounds.first.toString().isEmpty())
-                        return QString::number(pack_format);
+                auto version_bounds = resource.compatibleVersions();
+                if (version_bounds.first.toString().isEmpty())
+                    return QString::number(pack_format);
 
-                    return QString("%1 (%2 - %3)")
-                        .arg(QString::number(pack_format), version_bounds.first.toString(), version_bounds.second.toString());
-                }
+                return QString("%1 (%2 - %3)")
+                    .arg(QString::number(pack_format), version_bounds.first.toString(), version_bounds.second.toString());
             }
+            break;
+        }
         case Qt::DecorationRole: {
             if (column == ImageColumn) {
                 return at(row).image({ 32, 32 }, Qt::AspectRatioMode::KeepAspectRatioByExpanding);
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
index a11d87507..ab2bc6a67 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
@@ -192,6 +192,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
                 // bugged pack, currently only indicates bugged xml
                 return QColor(244, 229, 66);
             }
+            return {};
         }
         case Qt::DisplayRole:
             return pack.name;
diff --git a/launcher/ui/widgets/JavaWizardWidget.cpp b/launcher/ui/widgets/JavaWizardWidget.cpp
index 3192c22ec..086ca9481 100644
--- a/launcher/ui/widgets/JavaWizardWidget.cpp
+++ b/launcher/ui/widgets/JavaWizardWidget.cpp
@@ -255,7 +255,7 @@ JavaWizardWidget::ValidationStatus JavaWizardWidget::validate()
                         return ValidationStatus::JavaBad;
                     case QMessageBox::Help:
                         DesktopServices::openUrl(QUrl(BuildConfig.HELP_URL.arg("java-wizard")));
-                    /* fallthrough */
+                        [[fallthrough]];
                     case QMessageBox::No:
                     /* fallthrough */
                     default: