Merge branch 'develop' into icon-indexing

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

1 files changed, 30 insertions, 67 deletions

diff --git a/launcher/minecraft/WorldList.h b/launcher/minecraft/WorldList.h
index 96b64193..bea24bb9 100644
--- a/launcher/minecraft/WorldList.h
+++ b/launcher/minecraft/WorldList.h
@@ -15,65 +15,34 @@
 
 #pragma once
 
-#include <QList>
-#include <QString>
-#include <QDir>
 #include <QAbstractListModel>
+#include <QDir>
+#include <QList>
 #include <QMimeData>
-#include "minecraft/World.h"
+#include <QString>
 #include "BaseInstance.h"
+#include "minecraft/World.h"
 
 class QFileSystemWatcher;
 
-class WorldList : public QAbstractListModel
-{
+class WorldList : public QAbstractListModel {
     Q_OBJECT
-public:
-    enum Columns
-    {
-        NameColumn,
-        GameModeColumn,
-        LastPlayedColumn,
-        SizeColumn,
-        InfoColumn
-    };
-
-    enum Roles
-    {
-        ObjectRole = Qt::UserRole + 1,
-        FolderRole,
-        SeedRole,
-        NameRole,
-        GameModeRole,
-        LastPlayedRole,
-        SizeRole,
-        IconFileRole
-    };
-
-    WorldList(const QString &dir, BaseInstance* instance);
-
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-
-    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const
-    {
-        return parent.isValid() ? 0 : static_cast<int>(size());
-    };
-    virtual QVariant headerData(int section, Qt::Orientation orientation,
-                                int role = Qt::DisplayRole) const;
-    virtual int columnCount(const QModelIndex &parent) const;
-
-    size_t size() const
-    {
-        return worlds.size();
-    };
-    bool empty() const
-    {
-        return size() == 0;
-    }
-    World &operator[](size_t index)
-    {
-        return worlds[index];
-    }
+   public:
+    enum Columns { NameColumn, GameModeColumn, LastPlayedColumn, SizeColumn, InfoColumn };
+
+    enum Roles { ObjectRole = Qt::UserRole + 1, FolderRole, SeedRole, NameRole, GameModeRole, LastPlayedRole, SizeRole, IconFileRole };
+
+    WorldList(const QString& dir, BaseInstance* instance);
+
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+
+    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const { return parent.isValid() ? 0 : static_cast<int>(size()); };
+    virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    virtual int columnCount(const QModelIndex& parent) const;
+
+    size_t size() const { return worlds.size(); };
+    bool empty() const { return size() == 0; }
+    World& operator[](size_t index) { return worlds[index]; }
 
     /// Reloads the mod list and returns true if the list changed.
     virtual bool update();
@@ -91,13 +60,13 @@ public:
     virtual bool deleteWorlds(int first, int last);
 
     /// flags, mostly to support drag&drop
-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    virtual Qt::ItemFlags flags(const QModelIndex& index) const;
     /// get data for drag action
-    virtual QMimeData *mimeData(const QModelIndexList &indexes) const;
+    virtual QMimeData* mimeData(const QModelIndexList& indexes) const;
     /// get the supported mime types
     virtual QStringList mimeTypes() const;
     /// process data from drop action
-    virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
+    virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
     /// what drag actions do we support?
     virtual Qt::DropActions supportedDragActions() const;
 
@@ -109,27 +78,21 @@ public:
 
     virtual bool isValid();
 
-    QDir dir() const
-    {
-        return m_dir;
-    }
+    QDir dir() const { return m_dir; }
 
     QString instDirPath() const;
 
-    const QList<World> &allWorlds() const
-    {
-        return worlds;
-    }
+    const QList<World>& allWorlds() const { return worlds; }
 
-private slots:
+   private slots:
     void directoryChanged(QString path);
 
-signals:
+   signals:
     void changed();
 
-protected:
+   protected:
     BaseInstance* m_instance;
-    QFileSystemWatcher *m_watcher;
+    QFileSystemWatcher* m_watcher;
     bool is_watching;
     QDir m_dir;
     QList<World> worlds;