Skip to content

Commit e55469f

Browse files
committed
Use raw pointer in IEngine::addBroadcastScript()
1 parent 0fef828 commit e55469f

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

include/scratchcpp/iengine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class LIBSCRATCHCPP_EXPORT IEngine
205205
virtual int findBroadcastById(const std::string &broadcastId) const = 0;
206206

207207
/*! Registers the broadcast script. */
208-
virtual void addBroadcastScript(std::shared_ptr<Block> whenReceivedBlock, std::shared_ptr<Broadcast> broadcast) = 0;
208+
virtual void addBroadcastScript(std::shared_ptr<Block> whenReceivedBlock, Broadcast *broadcast) = 0;
209209

210210
/* Registers the given "when I start as clone" script. */
211211
virtual void addCloneInitScript(std::shared_ptr<Block> hatBlock) = 0;

src/blocks/eventblocks.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void EventBlocks::compileWhenBroadcastReceived(Compiler *compiler)
6666
{
6767
auto broadcast = std::static_pointer_cast<Broadcast>(compiler->field(BROADCAST_OPTION)->valuePtr());
6868

69-
compiler->engine()->addBroadcastScript(compiler->block(), broadcast);
69+
compiler->engine()->addBroadcastScript(compiler->block(), broadcast.get());
7070
}
7171

7272
unsigned int EventBlocks::broadcast(VirtualMachine *vm)

src/engine/internal/engine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ int Engine::findBroadcastById(const std::string &broadcastId) const
593593
return -1;
594594
}
595595

596-
void Engine::addBroadcastScript(std::shared_ptr<Block> whenReceivedBlock, std::shared_ptr<Broadcast> broadcast)
596+
void Engine::addBroadcastScript(std::shared_ptr<Block> whenReceivedBlock, Broadcast *broadcast)
597597
{
598598
auto id = findBroadcast(broadcast->name());
599599

src/engine/internal/engine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class Engine : public IEngine
8282
int findBroadcast(const std::string &broadcastName) const override;
8383
int findBroadcastById(const std::string &broadcastId) const override;
8484

85-
void addBroadcastScript(std::shared_ptr<Block> whenReceivedBlock, std::shared_ptr<Broadcast> broadcast) override;
85+
void addBroadcastScript(std::shared_ptr<Block> whenReceivedBlock, Broadcast *broadcast) override;
8686

8787
void addCloneInitScript(std::shared_ptr<Block> hatBlock) override;
8888

test/blocks/event_blocks_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ TEST_F(EventBlocksTest, WhenBroadcastReceived)
221221
auto block1 = createEventBlock("a", "event_whenbroadcastreceived");
222222
addBroadcastField(block1, "BROADCAST_OPTION", EventBlocks::BROADCAST_OPTION, m_broadcast);
223223

224-
EXPECT_CALL(m_engineMock, addBroadcastScript(block1, m_broadcast)).Times(1);
224+
EXPECT_CALL(m_engineMock, addBroadcastScript(block1, m_broadcast.get())).Times(1);
225225

226226
compiler.init();
227227
compiler.setBlock(block1);

test/mocks/enginemock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class EngineMock : public IEngine
6868
MOCK_METHOD(int, findBroadcast, (const std::string &), (const, override));
6969
MOCK_METHOD(int, findBroadcastById, (const std::string &), (const, override));
7070

71-
MOCK_METHOD(void, addBroadcastScript, (std::shared_ptr<Block>, std::shared_ptr<Broadcast>), (override));
71+
MOCK_METHOD(void, addBroadcastScript, (std::shared_ptr<Block>, Broadcast *), (override));
7272

7373
MOCK_METHOD(void, addCloneInitScript, (std::shared_ptr<Block>), (override));
7474

0 commit comments

Comments
 (0)