diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-12-14 02:22:20 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-12-14 02:22:20 +0100 |
| commit | daf9d0eaa7e762ad8571f91a266098631b1843e6 (patch) | |
| tree | d0a707e4742f787f9769c0bbc2c0e0213bd22b48 /api/logic/meta/Version.h | |
| parent | f18afd3d1e73cc0020bfa1189e0b8fefc0f14e61 (diff) | |
| download | MultiMC-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/Version.h')
| -rw-r--r-- | api/logic/meta/Version.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/api/logic/meta/Version.h b/api/logic/meta/Version.h index 61f253c6..debdf20a 100644 --- a/api/logic/meta/Version.h +++ b/api/logic/meta/Version.h @@ -84,7 +84,8 @@ public: /* con/des */ return m_data != nullptr; } - void merge(const std::shared_ptr<BaseEntity> &other) override; + void merge(const VersionPtr &other); + void mergeFromList(const VersionPtr &other); void parse(const QJsonObject &obj) override; QString localFilename() const override; |