diff options
| author | txtsd <code@ihavea.quest> | 2022-11-04 15:39:41 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 15:39:41 +0530 |
| commit | 8f045af8679e9ae1da120eb56e4cec452284ac56 (patch) | |
| tree | 494945886ba7070b23b4256c72896705ad47e04a /launcher/modplatform | |
| parent | 2cf4d5f8ecd4afb1179b5a4e3bf694bcd359b628 (diff) | |
| parent | 7956e6f04e32448b0043a49ff08873e117ba0a0b (diff) | |
| download | PrismLauncher-8f045af8679e9ae1da120eb56e4cec452284ac56.tar.gz PrismLauncher-8f045af8679e9ae1da120eb56e4cec452284ac56.tar.bz2 PrismLauncher-8f045af8679e9ae1da120eb56e4cec452284ac56.zip | |
Merge pull request #374 from flowln/fix_lto
Diffstat (limited to 'launcher/modplatform')
| -rw-r--r-- | launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | 4 | ||||
| -rw-r--r-- | launcher/modplatform/atlauncher/ATLPackInstallTask.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp index 68d75943..291ad916 100644 --- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp @@ -58,7 +58,7 @@ namespace ATLauncher { -static Meta::VersionPtr getComponentVersion(const QString& uid, const QString& version); +static Meta::Version::Ptr getComponentVersion(const QString& uid, const QString& version); PackInstallTask::PackInstallTask(UserInteractionSupport *support, QString packName, QString version, InstallMode installMode) { @@ -1037,7 +1037,7 @@ void PackInstallTask::install() emitSucceeded(); } -static Meta::VersionPtr getComponentVersion(const QString& uid, const QString& version) +static Meta::Version::Ptr getComponentVersion(const QString& uid, const QString& version) { auto vlist = APPLICATION->metadataIndex()->get(uid); if (!vlist) diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.h b/launcher/modplatform/atlauncher/ATLPackInstallTask.h index 78cd87fb..90e25ae2 100644 --- a/launcher/modplatform/atlauncher/ATLPackInstallTask.h +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.h @@ -68,7 +68,7 @@ public: * Requests a user interaction to select a component version from a given version list * and constrained to a given Minecraft version. */ - virtual QString chooseVersion(Meta::VersionListPtr vlist, QString minecraftVersion) = 0; + virtual QString chooseVersion(Meta::VersionList::Ptr vlist, QString minecraftVersion) = 0; /** * Requests a user interaction to display a message. @@ -137,8 +137,8 @@ private: QString archivePath; QStringList jarmods; - Meta::VersionPtr minecraftVersion; - QMap<QString, Meta::VersionPtr> componentsToInstall; + Meta::Version::Ptr minecraftVersion; + QMap<QString, Meta::Version::Ptr> componentsToInstall; QFuture<std::optional<QStringList>> m_extractFuture; QFutureWatcher<std::optional<QStringList>> m_extractFutureWatcher; |