CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE do not override already loaded metadata entities with partial data

Browse Source
This commit is contained in:
Petr Mrázek
2017-12-14 02:22:20 +01:00
parent f18afd3d1e
commit daf9d0eaa7
8 changed files with 55 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/logic/meta/JsonFormat.cpp
View File

@ -29,7 +29,7 @@ namespace Meta
{
// Index
static BaseEntity::Ptr parseIndexInternal(const QJsonObject &obj)
static std::shared_ptr<Index> parseIndexInternal(const QJsonObject &obj)
{
const QVector<QJsonObject> objects = requireIsArrayOf<QJsonObject>(obj, "packages");
QVector<VersionListPtr> lists;
@ -59,7 +59,7 @@ static VersionPtr parseCommonVersion(const QString &uid, const QJsonObject &obj)
return version;
}
static BaseEntity::Ptr parseVersionInternal(const QJsonObject &obj)
static std::shared_ptr<Version> parseVersionInternal(const QJsonObject &obj)
{
VersionPtr version = parseCommonVersion(requireString(obj, "uid"), obj);
@ -70,7 +70,7 @@ static BaseEntity::Ptr parseVersionInternal(const QJsonObject &obj)
}
// Version list / package
static BaseEntity::Ptr parseVersionListInternal(const QJsonObject &obj)
static std::shared_ptr<VersionList> parseVersionListInternal(const QJsonObject &obj)
{
const QString uid = requireString(obj, "uid");