Merge branch 'develop' into icon-indexing

Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>

1 files changed, 7 insertions, 16 deletions

diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.h b/launcher/minecraft/mod/ResourcePackFolderModel.h
index 531d8192..29c2c599 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.h
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.h
@@ -4,28 +4,19 @@
 
 #include "ResourcePack.h"
 
-class ResourcePackFolderModel : public ResourceFolderModel
-{
+class ResourcePackFolderModel : public ResourceFolderModel {
     Q_OBJECT
-public:
-    enum Columns
-    {
-        ActiveColumn = 0,
-        ImageColumn,
-        NameColumn,
-        PackFormatColumn,
-        DateColumn,
-        NUM_COLUMNS
-    };
-
-    explicit ResourcePackFolderModel(const QString &dir, BaseInstance* instance);
+   public:
+    enum Columns { ActiveColumn = 0, ImageColumn, NameColumn, PackFormatColumn, DateColumn, NUM_COLUMNS };
+
+    explicit ResourcePackFolderModel(const QString& dir, BaseInstance* instance);
 
     virtual QString id() const override { return "resourcepacks"; }
 
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    [[nodiscard]] QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
 
     [[nodiscard]] QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-    [[nodiscard]] int columnCount(const QModelIndex &parent) const override;
+    [[nodiscard]] int columnCount(const QModelIndex& parent) const override;
 
     [[nodiscard]] Task* createUpdateTask() override;
     [[nodiscard]] Task* createParseTask(Resource&) override;