Remove obsolete key name parameter from IEngine::addKeyPressScript()

Author: adazem009

include/scratchcpp/iengine.h

@@ -258,7 +258,7 @@ class LIBSCRATCHCPP_EXPORT IEngine
         virtual void addCloneInitScript(std::shared_ptr<Block> hatBlock) = 0;
 
         /* Registers the given "when key pressed" script. */
-        virtual void addKeyPressScript(std::shared_ptr<Block> hatBlock, std::string keyName) = 0;
+        virtual void addKeyPressScript(std::shared_ptr<Block> hatBlock) = 0;
 
         /*! Returns the list of targets. */
         virtual const std::vector<std::shared_ptr<Target>> &targets() const = 0;

src/blocks/eventblocks.cpp

@@ -88,7 +88,7 @@ void EventBlocks::compileWhenBackdropSwitchesTo(Compiler *compiler)
 void EventBlocks::compileWhenKeyPressed(Compiler *compiler)
 {
     // NOTE: Field values don't have to be registered because keys are referenced by their names
-    compiler->engine()->addKeyPressScript(compiler->block(), compiler->field(KEY_OPTION)->value().toString());
+    compiler->engine()->addKeyPressScript(compiler->block());
 }
 
 unsigned int EventBlocks::broadcast(VirtualMachine *vm)

src/engine/internal/engine.cpp

@@ -772,9 +772,8 @@ void Engine::addCloneInitScript(std::shared_ptr<Block> hatBlock)
     addHatToMap(m_cloneInitHats, m_scripts[hatBlock].get());
 }
 
-void Engine::addKeyPressScript(std::shared_ptr<Block> hatBlock, std::string keyName)
+void Engine::addKeyPressScript(std::shared_ptr<Block> hatBlock)
 {
-    std::transform(keyName.begin(), keyName.end(), keyName.begin(), ::tolower);
     addHatToMap(m_whenKeyPressedHats, m_scripts[hatBlock].get());
 }
 

src/engine/internal/engine.h

@@ -113,7 +113,7 @@ class Engine : public IEngine
         void addBroadcastScript(std::shared_ptr<Block> whenReceivedBlock, Broadcast *broadcast) override;
         void addBackdropChangeScript(std::shared_ptr<Block> hatBlock) override;
         void addCloneInitScript(std::shared_ptr<Block> hatBlock) override;
-        void addKeyPressScript(std::shared_ptr<Block> hatBlock, std::string keyName) override;
+        void addKeyPressScript(std::shared_ptr<Block> hatBlock) override;
 
         const std::vector<std::shared_ptr<Target>> &targets() const override;
         void setTargets(const std::vector<std::shared_ptr<Target>> &newTargets) override;

test/blocks/event_blocks_test.cpp

@@ -337,11 +337,11 @@ TEST_F(EventBlocksTest, WhenKeyPressed)
 
     compiler.init();
 
-    EXPECT_CALL(m_engineMock, addKeyPressScript(block1, "a"));
+    EXPECT_CALL(m_engineMock, addKeyPressScript(block1));
     compiler.setBlock(block1);
     EventBlocks::compileWhenKeyPressed(&compiler);
 
-    EXPECT_CALL(m_engineMock, addKeyPressScript(block2, "left arrow"));
+    EXPECT_CALL(m_engineMock, addKeyPressScript(block2));
     compiler.setBlock(block2);
     EventBlocks::compileWhenKeyPressed(&compiler);
 

test/mocks/enginemock.h

@@ -95,7 +95,7 @@ class EngineMock : public IEngine
         MOCK_METHOD(void, addBroadcastScript, (std::shared_ptr<Block>, Broadcast *), (override));
         MOCK_METHOD(void, addBackdropChangeScript, (std::shared_ptr<Block>), (override));
         MOCK_METHOD(void, addCloneInitScript, (std::shared_ptr<Block>), (override));
-        MOCK_METHOD(void, addKeyPressScript, (std::shared_ptr<Block>, std::string), (override));
+        MOCK_METHOD(void, addKeyPressScript, (std::shared_ptr<Block>), (override));
 
         MOCK_METHOD(const std::vector<std::shared_ptr<Target>> &, targets, (), (const, override));
         MOCK_METHOD(void, setTargets, (const std::vector<std::shared_ptr<Target>> &), (override));