From e2c7db644df5070d273170512bc69c581621d2be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 8 Mar 2019 04:46:53 +0100 Subject: [PATCH 1/4] Mark classes as `final` where applicable (#189) --- src/CalcManager/ExpressionCommand.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CalcManager/ExpressionCommand.h b/src/CalcManager/ExpressionCommand.h index 0953ab26..275c8da3 100644 --- a/src/CalcManager/ExpressionCommand.h +++ b/src/CalcManager/ExpressionCommand.h @@ -6,7 +6,7 @@ #include "Header Files/CalcEngine.h" #include "Header Files/Rational.h" -class CParentheses : public IParenthesisCommand +class CParentheses final : public IParenthesisCommand { public: CParentheses(_In_ int command); @@ -18,7 +18,7 @@ private: int m_command; }; -class CUnaryCommand : public IUnaryCommand +class CUnaryCommand final : public IUnaryCommand { public: CUnaryCommand(int command); @@ -33,7 +33,7 @@ private: std::shared_ptr> m_command; }; -class CBinaryCommand : public IBinaryCommand +class CBinaryCommand final : public IBinaryCommand { public: CBinaryCommand(int command); @@ -46,7 +46,7 @@ private: int m_command; }; -class COpndCommand : public IOpndCommand +class COpndCommand final : public IOpndCommand { public: COpndCommand( From 13ba479a0c15dfec9dfa8cf04ad59eb53f8c9baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 8 Mar 2019 06:38:40 +0100 Subject: [PATCH 2/4] Remove unused variable (#184) --- src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp index 579c627e..3225e01e 100644 --- a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp +++ b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp @@ -30,7 +30,6 @@ CalculatorProgrammerBitFlipPanel::CalculatorProgrammerBitFlipPanel() : { InitializeComponent(); auto booleanToVisibilityConverter = ref new Converters::BooleanToVisibilityConverter; - auto booleanToVisibilityNegationConverter = ref new Converters::BooleanToVisibilityNegationConverter; SetVisibilityBinding(BitFlipPanel, L"IsBinaryBitFlippingEnabled", booleanToVisibilityConverter); AssignFlipButtons(); From c325cb1b3a752dc4454b3168c9591a319b62cf4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 8 Mar 2019 07:09:37 +0100 Subject: [PATCH 3/4] Remove duplicated condition checks (#187) --- src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp | 1 - src/CalcViewModel/StandardCalculatorViewModel.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp index b00cf799..dea93bbb 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp @@ -158,7 +158,6 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map= Command::CommandBINEDITSTART) && (cmdenum <= Command::CommandBINEDITEND))) { From c6b770eec8ed3638d66e8cc58ab071e86e11f371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 8 Mar 2019 07:10:20 +0100 Subject: [PATCH 4/4] Fix usage of temporary string (#185) --- src/CalcViewModel/StandardCalculatorViewModel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp index d98a91f0..6782acf0 100644 --- a/src/CalcViewModel/StandardCalculatorViewModel.cpp +++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp @@ -488,7 +488,7 @@ void StandardCalculatorViewModel::HandleUpdatedOperandData(Command cmdenum) m_selectedExpressionLastData = L""; if (ch == 'x') { - temp = L'\0'; + temp[0] = L'\0'; commandIndex = 0; } else @@ -505,7 +505,7 @@ void StandardCalculatorViewModel::HandleUpdatedOperandData(Command cmdenum) { if (commandIndex == 0) { - delete temp; + delete [] temp; return; }