From 21ea7198057b5a42d4a8727e7024e5335d38b8ed Mon Sep 17 00:00:00 2001 From: Uwe Date: Mon, 3 Oct 2022 15:05:50 +0200 Subject: [PATCH] [Part] ImportStep: rename enum to fix compilation - because the name "IN" is already defined for the Visual Studio compiler, see https://github.com/FreeCAD/FreeCAD/commit/ed7914fba3c15e81589327fd9918d6e26d1df45f#r85690207 --- src/Mod/Part/App/ImportStep.cpp | 4 ++-- src/Mod/Part/App/ImportStep.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mod/Part/App/ImportStep.cpp b/src/Mod/Part/App/ImportStep.cpp index c0a6bb97ef..fc8e5fcbd3 100644 --- a/src/Mod/Part/App/ImportStep.cpp +++ b/src/Mod/Part/App/ImportStep.cpp @@ -195,10 +195,10 @@ void ImportExportSettings::setUnit(ImportExportSettings::Unit unit) hStepGrp->SetInt("Unit", static_cast(unit)); switch (unit) { - case Unit::M: + case Unit::Meter: Interface_Static::SetCVal("write.step.unit","M"); break; - case Unit::IN: + case Unit::Inch: Interface_Static::SetCVal("write.step.unit","INCH"); break; default: diff --git a/src/Mod/Part/App/ImportStep.h b/src/Mod/Part/App/ImportStep.h index 8560327945..906d09f65f 100644 --- a/src/Mod/Part/App/ImportStep.h +++ b/src/Mod/Part/App/ImportStep.h @@ -45,9 +45,9 @@ public: ObjectPerDirectory = 4, }; enum class Unit { - MM = 0, - M = 1, - IN = 2, + Millimeter = 0, + Meter = 1, + Inch = 2, }; static void initialize();