From 4253acb72b3d8003809976f42da581a56c683d69 Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Tue, 3 Feb 2026 20:33:23 +0300
Subject: [PATCH] rename override to override_vt

---
 libs/main/serialization/pivaluetree_conversions.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/main/serialization/pivaluetree_conversions.cpp b/libs/main/serialization/pivaluetree_conversions.cpp
index 1a84d15c..2b9f0f14 100644
--- a/libs/main/serialization/pivaluetree_conversions.cpp
+++ b/libs/main/serialization/pivaluetree_conversions.cpp
@@ -348,8 +348,8 @@ PIValueTree PIValueTreeConversions::fromJSONFile(const PIString & path) {
 	auto ret = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(path))));
 	auto ofp = overrideFile(path);
 	if (PIFile::isExists(ofp)) {
-		auto override = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(ofp))));
-		ret.merge(override);
+		auto override_vt = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(ofp))));
+		ret.merge(override_vt);
 	}
 	return ret;
 }
@@ -361,8 +361,8 @@ PIValueTree PIValueTreeConversions::fromTextFile(const PIString & path) {
 	auto ofp = overrideFile(path);
 	if (PIFile::isExists(ofp)) {
 		PIFile of(ofp, PIIODevice::ReadOnly);
-		auto override = PIValueTreeConversions::fromText(&of);
-		ret.merge(override);
+		auto override_vt = PIValueTreeConversions::fromText(&of);
+		ret.merge(override_vt);
 	}
 	return ret;
 }