Fixes C4456: declaration of 'mode' hides previous local declaration (#121)

qjgn · web-flow · commit eceb939060cb · 2025-02-21T12:51:09.000+01:00
diff --git a/SettingsDeserializer.cpp b/SettingsDeserializer.cpp
@@ -770,38 +770,38 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS
             {
                 if (port < 2)
                 {
-                    std::string mode;
-                    if (!syncOutElem.TryReadElementString("Mode", mode))
+                    std::string syncOutMode;
+                    if (!syncOutElem.TryReadElementString("Mode", syncOutMode))
                     {
                         return false;
                     }
 
-                    mode = ToLowerXmlString(mode);
-                    if (mode == "shutter out")
+                    syncOutMode = ToLowerXmlString(syncOutMode);
+                    if (syncOutMode == "shutter out")
                     {
                         cameraSettings.eSyncOutMode[port] = ModeShutterOut;
                     }
-                    else if (mode == "multiplier")
+                    else if (syncOutMode == "multiplier")
                     {
                         cameraSettings.eSyncOutMode[port] = ModeMultiplier;
                     }
-                    else if (mode == "divisor")
+                    else if (syncOutMode == "divisor")
                     {
                         cameraSettings.eSyncOutMode[port] = ModeDivisor;
                     }
-                    else if (mode == "camera independent")
+                    else if (syncOutMode == "camera independent")
                     {
                         cameraSettings.eSyncOutMode[port] = ModeIndependentFreq;
                     }
-                    else if (mode == "measurement time")
+                    else if (syncOutMode == "measurement time")
                     {
                         cameraSettings.eSyncOutMode[port] = ModeMeasurementTime;
                     }
-                    else if (mode == "continuous 100hz")
+                    else if (syncOutMode == "continuous 100hz")
                     {
                         cameraSettings.eSyncOutMode[port] = ModeFixed100Hz;
                     }
-                    else if (mode == "system live time")
+                    else if (syncOutMode == "system live time")
                     {
                         cameraSettings.eSyncOutMode[port] = ModeSystemLiveTime;
                     }

Original file line number	Diff line number	Diff line change
`@@ -770,38 +770,38 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS`
`770`	`770`	`{`
`771`	`771`	`if (port < 2)`
`772`	`772`	`{`
`773`		`- std::string mode;`
`774`		`- if (!syncOutElem.TryReadElementString("Mode", mode))`
	`773`	`+ std::string syncOutMode;`
	`774`	`+ if (!syncOutElem.TryReadElementString("Mode", syncOutMode))`
`775`	`775`	`{`
`776`	`776`	`return false;`
`777`	`777`	`}`
`778`	`778`
`779`		`- mode = ToLowerXmlString(mode);`
`780`		`- if (mode == "shutter out")`
	`779`	`+ syncOutMode = ToLowerXmlString(syncOutMode);`
	`780`	`+ if (syncOutMode == "shutter out")`
`781`	`781`	`{`
`782`	`782`	`cameraSettings.eSyncOutMode[port] = ModeShutterOut;`
`783`	`783`	`}`
`784`		`- else if (mode == "multiplier")`
	`784`	`+ else if (syncOutMode == "multiplier")`
`785`	`785`	`{`
`786`	`786`	`cameraSettings.eSyncOutMode[port] = ModeMultiplier;`
`787`	`787`	`}`
`788`		`- else if (mode == "divisor")`
	`788`	`+ else if (syncOutMode == "divisor")`
`789`	`789`	`{`
`790`	`790`	`cameraSettings.eSyncOutMode[port] = ModeDivisor;`
`791`	`791`	`}`
`792`		`- else if (mode == "camera independent")`
	`792`	`+ else if (syncOutMode == "camera independent")`
`793`	`793`	`{`
`794`	`794`	`cameraSettings.eSyncOutMode[port] = ModeIndependentFreq;`
`795`	`795`	`}`
`796`		`- else if (mode == "measurement time")`
	`796`	`+ else if (syncOutMode == "measurement time")`
`797`	`797`	`{`
`798`	`798`	`cameraSettings.eSyncOutMode[port] = ModeMeasurementTime;`
`799`	`799`	`}`
`800`		`- else if (mode == "continuous 100hz")`
	`800`	`+ else if (syncOutMode == "continuous 100hz")`
`801`	`801`	`{`
`802`	`802`	`cameraSettings.eSyncOutMode[port] = ModeFixed100Hz;`
`803`	`803`	`}`
`804`		`- else if (mode == "system live time")`
	`804`	`+ else if (syncOutMode == "system live time")`
`805`	`805`	`{`
`806`	`806`	`cameraSettings.eSyncOutMode[port] = ModeSystemLiveTime;`
`807`	`807`	`}`