diff options
author | flow <thiagodonato300@gmail.com> | 2022-02-25 13:43:27 -0300 |
---|---|---|
committer | flow <thiagodonato300@gmail.com> | 2022-02-25 13:43:27 -0300 |
commit | c4f4e9e620ee4a7094542190bc18cc167d00a7ff (patch) | |
tree | ddb23a5782c2388eb59c02d72c0478c94dbdf6f9 /launcher/minecraft/PackProfile_p.h | |
parent | 40a9828fbab0e9a8b7f070714bdd87d3f279e18c (diff) | |
parent | f2b850ad200b1b871402c4d4bb2676f1e1288d3d (diff) | |
download | PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.tar.gz PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.tar.bz2 PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.zip |
merge upstream and resolve conflicts
Diffstat (limited to 'launcher/minecraft/PackProfile_p.h')
-rw-r--r-- | launcher/minecraft/PackProfile_p.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/launcher/minecraft/PackProfile_p.h b/launcher/minecraft/PackProfile_p.h index fce921bb..715e0460 100644 --- a/launcher/minecraft/PackProfile_p.h +++ b/launcher/minecraft/PackProfile_p.h @@ -18,18 +18,6 @@ struct PackProfileData // the launch profile (volatile, temporary thing created on demand) std::shared_ptr<LaunchProfile> m_profile; - // version information migrated from instance.cfg file. Single use on migration! - std::map<QString, QString> m_oldConfigVersions; - QString getOldConfigVersion(const QString& uid) const - { - const auto iter = m_oldConfigVersions.find(uid); - if(iter != m_oldConfigVersions.cend()) - { - return (*iter).second; - } - return QString(); - } - // persistent list of components and related machinery ComponentContainer components; ComponentIndex componentIndex; |