diff options
Diffstat (limited to 'api/logic/meta/VersionList.h')
| -rw-r--r-- | api/logic/meta/VersionList.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/api/logic/meta/VersionList.h b/api/logic/meta/VersionList.h index e8016314..ad8733cc 100644 --- a/api/logic/meta/VersionList.h +++ b/api/logic/meta/VersionList.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 MultiMC Contributors +/* Copyright 2015-2018 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,10 +55,6 @@ public: QString localFilename() const override; - QString parentUid() const - { - return m_parentUid; - } QString uid() const { return m_uid; @@ -78,9 +74,9 @@ public: public: // for usage only by parsers void setName(const QString &name); - void setParentUid(const QString &parentUid); void setVersions(const QVector<VersionPtr> &versions); - void merge(const BaseEntity::Ptr &other) override; + void merge(const VersionListPtr &other); + void mergeFromIndex(const VersionListPtr &other); void parse(const QJsonObject &obj) override; signals: @@ -95,7 +91,6 @@ private: QVector<VersionPtr> m_versions; QHash<QString, VersionPtr> m_lookup; QString m_uid; - QString m_parentUid; QString m_name; VersionPtr m_recommended; |