SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

rename override to override_vt

Browse Source
This commit is contained in:
Пелипенко Иван
2026-02-03 20:33:23 +03:00
parent e22630b1bd
commit 4253acb72b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/main/serialization/pivaluetree_conversions.cpp
View File

@@ -348,8 +348,8 @@ PIValueTree PIValueTreeConversions::fromJSONFile(const PIString & path) {
auto ret = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(path)))); auto ret = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(path))));
auto ofp = overrideFile(path); auto ofp = overrideFile(path);
if (PIFile::isExists(ofp)) { if (PIFile::isExists(ofp)) {
auto override = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(ofp)))); auto override_vt = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(ofp))));
ret.merge(override); ret.merge(override_vt);
} }
return ret; return ret;
} }
@@ -361,8 +361,8 @@ PIValueTree PIValueTreeConversions::fromTextFile(const PIString & path) {
auto ofp = overrideFile(path); auto ofp = overrideFile(path);
if (PIFile::isExists(ofp)) { if (PIFile::isExists(ofp)) {
PIFile of(ofp, PIIODevice::ReadOnly); PIFile of(ofp, PIIODevice::ReadOnly);
auto override = PIValueTreeConversions::fromText(&of); auto override_vt = PIValueTreeConversions::fromText(&of);
ret.merge(override); ret.merge(override_vt);
} }
return ret; return ret;
} }