diff options
author | flow <flowlnlnln@gmail.com> | 2022-11-01 19:48:26 -0300 |
---|---|---|
committer | flow <flowlnlnln@gmail.com> | 2022-11-01 19:48:26 -0300 |
commit | 7956e6f04e32448b0043a49ff08873e117ba0a0b (patch) | |
tree | a451fa409e400f3c9cc27715df3be7abc2ca043e /launcher/modplatform/atlauncher/ATLPackInstallTask.h | |
parent | f6a3fa55b1fb4b10780065fd8e1df722cd40efd8 (diff) | |
download | PrismLauncher-7956e6f04e32448b0043a49ff08873e117ba0a0b.tar.gz PrismLauncher-7956e6f04e32448b0043a49ff08873e117ba0a0b.tar.bz2 PrismLauncher-7956e6f04e32448b0043a49ff08873e117ba0a0b.zip |
fix: don't use forward-declared Ptr types in meta/
This would cause ODR violations when those headers were included in
other places that also included stuff like "Version.h" (note the
"meta/Version.h"), which can cause problems, especially in LTO.
Signed-off-by: flow <flowlnlnln@gmail.com>
Diffstat (limited to 'launcher/modplatform/atlauncher/ATLPackInstallTask.h')
-rw-r--r-- | launcher/modplatform/atlauncher/ATLPackInstallTask.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; |