Replace question asked/answered handlers with signals

Author: adazem009

include/scratchcpp/iengine.h

@@ -352,17 +352,11 @@ class LIBSCRATCHCPP_EXPORT IEngine
         /*! Emits when a monitor is removed. */
         virtual sigslot::signal<Monitor *, IMonitorHandler *> &monitorRemoved() = 0;
 
-        /*! Returns the function which is called when a question is asked, for example using the 'ask and wait' block. */
-        virtual const std::function<void(const std::string &)> &questionAsked() const = 0;
+        /*! Emits when a question is asked, for example using the 'ask and wait' block. */
+        virtual sigslot::signal<const std::string &> &questionAsked() = 0;
 
-        /*! Sets the function which is called when a question is asked, for example using the 'ask and wait' block. */
-        virtual void setQuestionAsked(const std::function<void(const std::string &)> &f) = 0;
-
-        /*! Returns the function which should be called when a question is answered. */
-        virtual const std::function<void(const std::string &)> &questionAnswered() const = 0;
-
-        /*! Sets the function which should be called when a question is answered. */
-        virtual void setQuestionAnswered(const std::function<void(const std::string &)> &f) = 0;
+        /*! Emits when a question is answered. */
+        virtual sigslot::signal<const std::string &> &questionAnswered() = 0;
 
         /*! Returns the list of extension names. */
         virtual const std::vector<std::string> &extensions() const = 0;

src/engine/internal/engine.cpp

@@ -1239,26 +1239,16 @@ sigslot::signal<Monitor *, IMonitorHandler *> &Engine::monitorRemoved()
     return m_monitorRemoved;
 }
 
-const std::function<void(const std::string &)> &Engine::questionAsked() const
+sigslot::signal<const std::string &> &Engine::questionAsked()
 {
     return m_questionAsked;
 }
 
-void Engine::setQuestionAsked(const std::function<void(const std::string &)> &f)
-{
-    m_questionAsked = f;
-}
-
-const std::function<void(const std::string &)> &Engine::questionAnswered() const
+sigslot::signal<const std::string &> &Engine::questionAnswered()
 {
     return m_questionAnswered;
 }
 
-void Engine::setQuestionAnswered(const std::function<void(const std::string &)> &f)
-{
-    m_questionAnswered = f;
-}
-
 const std::vector<std::string> &Engine::extensions() const
 {
     return m_extensions;

src/engine/internal/engine.h

@@ -146,11 +146,8 @@ class Engine : public IEngine
         sigslot::signal<Monitor *> &monitorAdded() override;
         sigslot::signal<Monitor *, IMonitorHandler *> &monitorRemoved() override;
 
-        const std::function<void(const std::string &)> &questionAsked() const override;
-        void setQuestionAsked(const std::function<void(const std::string &)> &f) override;
-
-        const std::function<void(const std::string &)> &questionAnswered() const override;
-        void setQuestionAnswered(const std::function<void(const std::string &)> &f) override;
+        sigslot::signal<const std::string &> &questionAsked() override;
+        sigslot::signal<const std::string &> &questionAnswered() override;
 
         const std::vector<std::string> &extensions() const override;
         void setExtensions(const std::vector<std::string> &newExtensions) override;
@@ -274,8 +271,8 @@ class Engine : public IEngine
 
         sigslot::signal<Monitor *> m_monitorAdded;
         sigslot::signal<Monitor *, IMonitorHandler *> m_monitorRemoved;
-        std::function<void(const std::string &)> m_questionAsked = nullptr;
-        std::function<void(const std::string &)> m_questionAnswered = nullptr;
+        sigslot::signal<const std::string &> m_questionAsked;
+        sigslot::signal<const std::string &> m_questionAnswered;
 };
 
 } // namespace libscratchcpp

test/engine/engine_test.cpp

@@ -54,14 +54,6 @@ class AddRemoveMonitorMock
         MOCK_METHOD(void, monitorRemoved, (Monitor *, IMonitorHandler *));
 };
 
-template<typename T, typename... U>
-size_t getAddress(std::function<T(U...)> f)
-{
-    typedef T(fnType)(U...);
-    fnType **fnPointer = f.template target<fnType *>();
-    return (size_t)*fnPointer;
-}
-
 TEST(EngineTest, Clock)
 {
     Engine engine;
@@ -1715,26 +1707,6 @@ void questionFunction(const std::string &)
 {
 }
 
-TEST(EngineTest, QuestionAsked)
-{
-    Engine engine;
-    ASSERT_EQ(engine.questionAsked(), nullptr);
-
-    static const std::function<void(const std::string &)> f = &questionFunction;
-    engine.setQuestionAsked(&questionFunction);
-    ASSERT_EQ(getAddress(engine.questionAsked()), getAddress(f));
-}
-
-TEST(EngineTest, QuestionAnswered)
-{
-    Engine engine;
-    ASSERT_EQ(engine.questionAnswered(), nullptr);
-
-    static const std::function<void(const std::string &)> f = &questionFunction;
-    engine.setQuestionAnswered(f);
-    ASSERT_EQ(getAddress(engine.questionAnswered()), getAddress(f));
-}
-
 TEST(EngineTest, Clones)
 {
     Project p("clones.sb3");

test/mocks/enginemock.h

@@ -127,11 +127,8 @@ class EngineMock : public IEngine
         MOCK_METHOD(sigslot::signal<Monitor *> &, monitorAdded, (), (override));
         MOCK_METHOD((sigslot::signal<Monitor *, IMonitorHandler *> &), monitorRemoved, (), (override));
 
-        MOCK_METHOD(const std::function<void(const std::string &)> &, questionAsked, (), (const, override));
-        MOCK_METHOD(void, setQuestionAsked, (const std::function<void(const std::string &)> &), (override));
-
-        MOCK_METHOD(const std::function<void(const std::string &)> &, questionAnswered, (), (const, override));
-        MOCK_METHOD(void, setQuestionAnswered, (const std::function<void(const std::string &)> &), (override));
+        MOCK_METHOD(sigslot::signal<const std::string &> &, questionAsked, (), (override));
+        MOCK_METHOD(sigslot::signal<const std::string &> &, questionAnswered, (), (override));
 
         MOCK_METHOD(std::vector<std::string> &, extensions, (), (const, override));
         MOCK_METHOD(void, setExtensions, (const std::vector<std::string> &), (override));