summaryrefslogtreecommitdiffstats
path: root/api/logic/meta/VersionList.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-12-14 02:22:20 +0100
committerPetr Mrázek <peterix@gmail.com>2017-12-14 02:22:20 +0100
commitdaf9d0eaa7e762ad8571f91a266098631b1843e6 (patch)
treed0a707e4742f787f9769c0bbc2c0e0213bd22b48 /api/logic/meta/VersionList.h
parentf18afd3d1e73cc0020bfa1189e0b8fefc0f14e61 (diff)
downloadMultiMC-daf9d0eaa7e762ad8571f91a266098631b1843e6.tar
MultiMC-daf9d0eaa7e762ad8571f91a266098631b1843e6.tar.gz
MultiMC-daf9d0eaa7e762ad8571f91a266098631b1843e6.tar.lz
MultiMC-daf9d0eaa7e762ad8571f91a266098631b1843e6.tar.xz
MultiMC-daf9d0eaa7e762ad8571f91a266098631b1843e6.zip
NOISSUE do not override already loaded metadata entities with partial data
Diffstat (limited to 'api/logic/meta/VersionList.h')
-rw-r--r--api/logic/meta/VersionList.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/api/logic/meta/VersionList.h b/api/logic/meta/VersionList.h
index e8016314..c4a2b757 100644
--- a/api/logic/meta/VersionList.h
+++ b/api/logic/meta/VersionList.h
@@ -80,7 +80,8 @@ 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: