diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-11-04 18:30:42 +0100 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-11-04 18:30:42 +0100 |
| commit | 21a7af535c8b5b9d231aa3c41f7a990689fde560 (patch) | |
| tree | af106527454f91335ec02b17bd36746bf2c3af60 /launcher/meta/Version.cpp | |
| parent | a241d3f187f07cd3049c0d17f711c674fd6e7ccd (diff) | |
| parent | 8f045af8679e9ae1da120eb56e4cec452284ac56 (diff) | |
| download | PrismLauncher-21a7af535c8b5b9d231aa3c41f7a990689fde560.tar.gz PrismLauncher-21a7af535c8b5b9d231aa3c41f7a990689fde560.tar.bz2 PrismLauncher-21a7af535c8b5b9d231aa3c41f7a990689fde560.zip | |
Merge branch 'develop' into macos-drag-n-drop
Diffstat (limited to 'launcher/meta/Version.cpp')
| -rw-r--r-- | launcher/meta/Version.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/launcher/meta/Version.cpp b/launcher/meta/Version.cpp index a8dc3169..68cfa55c 100644 --- a/launcher/meta/Version.cpp +++ b/launcher/meta/Version.cpp @@ -54,7 +54,7 @@ void Meta::Version::parse(const QJsonObject& obj) parseVersion(obj, this); } -void Meta::Version::mergeFromList(const Meta::VersionPtr& other) +void Meta::Version::mergeFromList(const Meta::Version::Ptr& other) { if(other->m_providesRecommendations) { @@ -85,7 +85,7 @@ void Meta::Version::mergeFromList(const Meta::VersionPtr& other) } } -void Meta::Version::merge(const VersionPtr &other) +void Meta::Version::merge(const Version::Ptr &other) { mergeFromList(other); if(other->m_data) |