aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/AssetsUtils.h
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-15 12:16:00 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-15 12:16:00 +0300
commitc94ee67077076fdfb3ad04e93a0de2ae32b6a4e5 (patch)
tree437dec3be224cae5e229eeaa4ac9ebeedffd03e3 /launcher/minecraft/AssetsUtils.h
parent019e5ca3e819f5daf9933bc0fb091784b0ca561f (diff)
parent8f5bb982cd27dd9158b63d826769c168455a139b (diff)
downloadPrismLauncher-c94ee67077076fdfb3ad04e93a0de2ae32b6a4e5.tar.gz
PrismLauncher-c94ee67077076fdfb3ad04e93a0de2ae32b6a4e5.tar.bz2
PrismLauncher-c94ee67077076fdfb3ad04e93a0de2ae32b6a4e5.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3
Signed-off-by: Trial97 <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