diff --git a/src/CalcManager/CalcManager.vcxproj b/src/CalcManager/CalcManager.vcxproj index 9a9ea38..868abfe 100644 --- a/src/CalcManager/CalcManager.vcxproj +++ b/src/CalcManager/CalcManager.vcxproj @@ -279,6 +279,7 @@ + diff --git a/src/CalcManager/CalcManager.vcxproj.filters b/src/CalcManager/CalcManager.vcxproj.filters index 7c4ad53..14a28e8 100644 --- a/src/CalcManager/CalcManager.vcxproj.filters +++ b/src/CalcManager/CalcManager.vcxproj.filters @@ -161,5 +161,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/src/CalcManager/Header Files/CalcEngine.h b/src/CalcManager/Header Files/CalcEngine.h index 72e21ac..b552760 100644 --- a/src/CalcManager/Header Files/CalcEngine.h +++ b/src/CalcManager/Header Files/CalcEngine.h @@ -20,6 +20,7 @@ #include "../Command.h" #include "../CalculatorVector.h" #include "../ExpressionCommand.h" +#include "RadixType.h" #include "History.h" // for History Collector #include "CalcInput.h" #include "ICalcDisplay.h" @@ -38,15 +39,6 @@ enum eNUM_WIDTH { typedef enum eNUM_WIDTH NUM_WIDTH; static constexpr size_t NUM_WIDTH_LENGTH = 4; -// This is expected to be in same order as IDM_HEX, IDM_DEC, IDM_OCT, IDM_BIN -enum eRADIX_TYPE { - HEX_RADIX, - DEC_RADIX, - OCT_RADIX, - BIN_RADIX -}; -typedef enum eRADIX_TYPE RADIX_TYPE; - namespace CalculationManager { class IResourceProvider; diff --git a/src/CalcManager/Header Files/Number.h b/src/CalcManager/Header Files/Number.h index 061d619..f832a84 100644 --- a/src/CalcManager/Header Files/Number.h +++ b/src/CalcManager/Header Files/Number.h @@ -2,7 +2,7 @@ #pragma once -#include "RatPack/ratpak.h" +#include "Ratpack/ratpak.h" namespace CalcEngine { diff --git a/src/CalcManager/Header Files/RadixType.h b/src/CalcManager/Header Files/RadixType.h new file mode 100644 index 0000000..3f7f245 --- /dev/null +++ b/src/CalcManager/Header Files/RadixType.h @@ -0,0 +1,13 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +#pragma once + +// This is expected to be in same order as IDM_HEX, IDM_DEC, IDM_OCT, IDM_BIN +enum eRADIX_TYPE { + HEX_RADIX, + DEC_RADIX, + OCT_RADIX, + BIN_RADIX +}; +typedef enum eRADIX_TYPE RADIX_TYPE; diff --git a/src/Calculator/Converters/RadixToStringConverter.cpp b/src/Calculator/Converters/RadixToStringConverter.cpp index 053800e..d8c878d 100644 --- a/src/Calculator/Converters/RadixToStringConverter.cpp +++ b/src/Calculator/Converters/RadixToStringConverter.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include "RadixToStringConverter.h" -#include "CalcManager/Header Files/CalcEngine.h" +#include "CalcManager/Header Files/RadixType.h" #include "CalcViewModel/Common/AppResourceProvider.h" using namespace Platform;