diff --git a/src/CalcManager/ExpressionCommand.h b/src/CalcManager/ExpressionCommand.h index 275c8da..dd94e6d 100644 --- a/src/CalcManager/ExpressionCommand.h +++ b/src/CalcManager/ExpressionCommand.h @@ -10,9 +10,9 @@ class CParentheses final : public IParenthesisCommand { public: CParentheses(_In_ int command); - int GetCommand() const; - CalculationManager::CommandType GetCommandType() const; - void Accept(_In_ ISerializeCommandVisitor &commandVisitor); + int GetCommand() const override; + CalculationManager::CommandType GetCommandType() const override; + void Accept(_In_ ISerializeCommandVisitor &commandVisitor) override; private: int m_command; @@ -23,11 +23,11 @@ class CUnaryCommand final : public IUnaryCommand public: CUnaryCommand(int command); CUnaryCommand(int command1, int command2); - const std::shared_ptr> & GetCommands() const; - CalculationManager::CommandType GetCommandType() const; - void SetCommand(int command); - void SetCommands(int command1, int command2); - void Accept(_In_ ISerializeCommandVisitor &commandVisitor); + const std::shared_ptr> & GetCommands() const override; + CalculationManager::CommandType GetCommandType() const override; + void SetCommand(int command) override; + void SetCommands(int command1, int command2) override; + void Accept(_In_ ISerializeCommandVisitor &commandVisitor) override; private: std::shared_ptr> m_command; @@ -37,10 +37,10 @@ class CBinaryCommand final : public IBinaryCommand { public: CBinaryCommand(int command); - void SetCommand(int command); - int GetCommand() const; - CalculationManager::CommandType GetCommandType() const; - void Accept(_In_ ISerializeCommandVisitor &commandVisitor); + void SetCommand(int command) override; + int GetCommand() const override; + CalculationManager::CommandType GetCommandType() const override; + void Accept(_In_ ISerializeCommandVisitor &commandVisitor) override; private: int m_command; @@ -56,17 +56,17 @@ public: bool fSciFmt); void Initialize(CalcEngine::Rational const& rat); - const std::shared_ptr> & GetCommands() const; - void SetCommands(std::shared_ptr> const& commands); - void AppendCommand(int command); - void ToggleSign(); - void RemoveFromEnd(); - bool IsNegative() const; - bool IsSciFmt() const; - bool IsDecimalPresent() const; - const std::wstring & GetToken(wchar_t decimalSymbol); - CalculationManager::CommandType GetCommandType() const; - void Accept(_In_ ISerializeCommandVisitor &commandVisitor); + const std::shared_ptr> & GetCommands() const override; + void SetCommands(std::shared_ptr> const& commands) override; + void AppendCommand(int command) override; + void ToggleSign() override; + void RemoveFromEnd() override; + bool IsNegative() const override; + bool IsSciFmt() const override; + bool IsDecimalPresent() const override; + const std::wstring & GetToken(wchar_t decimalSymbol) override; + CalculationManager::CommandType GetCommandType() const override; + void Accept(_In_ ISerializeCommandVisitor &commandVisitor) override; std::wstring GetString(uint32_t radix, int32_t precision, wchar_t decimalSymbol); private: diff --git a/src/CalcManager/ExpressionCommandInterface.h b/src/CalcManager/ExpressionCommandInterface.h index bf19bf2..ce89dd8 100644 --- a/src/CalcManager/ExpressionCommandInterface.h +++ b/src/CalcManager/ExpressionCommandInterface.h @@ -30,7 +30,7 @@ public: class IBinaryCommand : public IOperatorCommand { public: - virtual void SetCommand(int command) = 0; + virtual void SetCommand(int command) override = 0; virtual int GetCommand() const = 0; };