aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/AssetsUtils.h
diff options
context:
space:
mode:
authorAlexandru Ionut Tripon <alexandru.tripon97@gmail.com>2023-08-12 12:42:30 +0300
committerGitHub <noreply@github.com>2023-08-12 12:42:30 +0300
commitb3b2e9df35222209b4920202d86091eeeb87f03f (patch)
treece44c3877ee36c21279d142b2af1c393e7b87780 /launcher/minecraft/AssetsUtils.h
parentca061080c13042642fb3bd49a29a863756f45866 (diff)
parent3aba7f8fec45c7c87be486d8f6b5c96f69facf93 (diff)
downloadPrismLauncher-b3b2e9df35222209b4920202d86091eeeb87f03f.tar.gz
PrismLauncher-b3b2e9df35222209b4920202d86091eeeb87f03f.tar.bz2
PrismLauncher-b3b2e9df35222209b4920202d86091eeeb87f03f.zip
Merge branch 'develop' into feat/acknowledge_release_type
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/minecraft/AssetsUtils.h')
-rw-r--r--launcher/minecraft/AssetsUtils.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/launcher/minecraft/AssetsUtils.h b/launcher/minecraft/AssetsUtils.h
index 3dbf19ed..87956e57 100644
--- a/launcher/minecraft/AssetsUtils.h
+++ b/launcher/minecraft/AssetsUtils.h
@@ -15,13 +15,12 @@
#pragma once
-#include <QString>
#include <QMap>
+#include <QString>
#include "net/NetAction.h"
#include "net/NetJob.h"
-struct AssetObject
-{
+struct AssetObject {
QString getRelPath();
QUrl getUrl();
QString getLocalPath();
@@ -31,8 +30,7 @@ struct AssetObject
qint64 size;
};
-struct AssetsIndex
-{
+struct AssetsIndex {
NetJob::Ptr getDownloadJob();
QString id;
@@ -42,12 +40,11 @@ struct AssetsIndex
};
/// FIXME: this is absolutely horrendous. REDO!!!!
-namespace AssetsUtils
-{
-bool loadAssetsIndexJson(const QString &id, const QString &file, AssetsIndex& index);
+namespace AssetsUtils {
+bool loadAssetsIndexJson(const QString& id, const QString& file, AssetsIndex& index);
-QDir getAssetsDir(const QString &assetsId, const QString &resourcesFolder);
+QDir getAssetsDir(const QString& assetsId, const QString& resourcesFolder);
/// Reconstruct a virtual assets folder for the given assets ID and return the folder
bool reconstructAssets(QString assetsId, QString resourcesFolder);
-}
+} // namespace AssetsUtils