From 8fdbaaa52d1e515fa23821f7c59cb081cd91586c Mon Sep 17 00:00:00 2001 From: David Kekesi Date: Tue, 29 Oct 2024 11:03:21 +0100 Subject: [PATCH] ElementChangedSubscriber renamed to ElementSubscriber --- .../Interface/Browser/Bridge/Send/SendBridge.h | 4 ++-- ...gedSubscriber.cpp => ElementSubscriber.cpp} | 18 +++++++++--------- ...ChangedSubscriber.h => ElementSubscriber.h} | 8 ++++---- SpeckleLib/SpeckleLib17.vcxproj | 4 ++-- SpeckleLib/SpeckleLib17.vcxproj.filters | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) rename SpeckleLib/Speckle/Event/Subscriber/{ElementChangedSubscriber.cpp => ElementSubscriber.cpp} (88%) rename SpeckleLib/Speckle/Event/Subscriber/{ElementChangedSubscriber.h => ElementSubscriber.h} (85%) diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/SendBridge.h b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/SendBridge.h index e4cf6f3..391cb57 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/SendBridge.h +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/SendBridge.h @@ -2,14 +2,14 @@ #define CONNECTOR_INTERFACE_BRIDGE_SEND_BRIDGE #include "Speckle/Interface/Browser/Bridge/BrowserBridge.h" -#include "Speckle/Event/Subscriber/ElementChangedSubscriber.h" +#include "Speckle/Event/Subscriber/ElementSubscriber.h" namespace connector::interfac::browser::bridge { /*! A browser bridge to support sending model data to a Speckle server */ - class SendBridge : public speckle::interfac::browser::bridge::BrowserBridge, public speckle::event::ElementChangedSubscriber { + class SendBridge : public speckle::interfac::browser::bridge::BrowserBridge, public speckle::event::ElementSubscriber { public: // MARK: - Types diff --git a/SpeckleLib/Speckle/Event/Subscriber/ElementChangedSubscriber.cpp b/SpeckleLib/Speckle/Event/Subscriber/ElementSubscriber.cpp similarity index 88% rename from SpeckleLib/Speckle/Event/Subscriber/ElementChangedSubscriber.cpp rename to SpeckleLib/Speckle/Event/Subscriber/ElementSubscriber.cpp index c5e03e2..1767bcd 100644 --- a/SpeckleLib/Speckle/Event/Subscriber/ElementChangedSubscriber.cpp +++ b/SpeckleLib/Speckle/Event/Subscriber/ElementSubscriber.cpp @@ -1,4 +1,4 @@ -#include "Speckle/Event/Subscriber/ElementChangedSubscriber.h" +#include "Speckle/Event/Subscriber/ElementSubscriber.h" #include "Speckle/Environment/Addon.h" #include "Speckle/Database/Identity/BIMLink.h" #include "Speckle/Database/Storage/ArchicadDBase/Element/ArchicadElementDBaseEngine.h" @@ -62,9 +62,9 @@ namespace { return: The subscription list (an empty list will put the subscriber into a suspended state) --------------------------------------------------------------------*/ -Subscriber::Subscription ElementChangedSubscriber::subscription() const { +Subscriber::Subscription ElementSubscriber::subscription() const { return { {ElementEvent::ID} }; -} //ElementChangedSubscriber::subscription +} //ElementSubscriber::subscription /*-------------------------------------------------------------------- @@ -74,12 +74,12 @@ Subscriber::Subscription ElementChangedSubscriber::subscription() const { return: True if the event should be closed --------------------------------------------------------------------*/ -bool ElementChangedSubscriber::receive(const Event& event) { +bool ElementSubscriber::receive(const Event& event) { //Pass a menu event to the specified handler function if (auto changeEvent = dynamic_cast(&event); changeEvent != nullptr) return handle(*changeEvent); return false; -} //ElementChangedSubscriber::receive +} //ElementSubscriber::receive /*-------------------------------------------------------------------- @@ -87,7 +87,7 @@ bool ElementChangedSubscriber::receive(const Event& event) { return: True if the participant is able to continue --------------------------------------------------------------------*/ -bool ElementChangedSubscriber::start() { +bool ElementSubscriber::start() { #ifdef ARCHICAD GSErrCode err = ACAPI_Element_InstallElementObserver(elementChangedCallback); if (err != NoError) @@ -97,14 +97,14 @@ bool ElementChangedSubscriber::start() { #else return false; #endif -} //ElementChangedSubscriber::start +} //ElementSubscriber::start /*-------------------------------------------------------------------- Stop participation (release resources etc) --------------------------------------------------------------------*/ -void ElementChangedSubscriber::stop() { +void ElementSubscriber::stop() { #ifdef ARCHICAD ACAPI_Notification_CatchSelectionChange(nullptr); #endif -} //ElementChangedSubscriber::stop +} //ElementSubscriber::stop diff --git a/SpeckleLib/Speckle/Event/Subscriber/ElementChangedSubscriber.h b/SpeckleLib/Speckle/Event/Subscriber/ElementSubscriber.h similarity index 85% rename from SpeckleLib/Speckle/Event/Subscriber/ElementChangedSubscriber.h rename to SpeckleLib/Speckle/Event/Subscriber/ElementSubscriber.h index 41eda4a..680c53a 100644 --- a/SpeckleLib/Speckle/Event/Subscriber/ElementChangedSubscriber.h +++ b/SpeckleLib/Speckle/Event/Subscriber/ElementSubscriber.h @@ -11,7 +11,7 @@ namespace speckle::event { /*! Base class for subscribers responding to element changes */ - class ElementChangedSubscriber : public virtual active::event::Subscriber { + class ElementSubscriber : public virtual active::event::Subscriber { public: // MARK: - Constructors @@ -19,16 +19,16 @@ namespace speckle::event { /*! Default constructor */ - ElementChangedSubscriber() = default; + ElementSubscriber() = default; /*! Copy constructor @param source The object to copy */ - ElementChangedSubscriber(const ElementChangedSubscriber& source) = default; + ElementSubscriber(const ElementSubscriber& source) = default; /*! Destructor */ - ~ElementChangedSubscriber() = default; + ~ElementSubscriber() = default; // MARK: - Functions (const) diff --git a/SpeckleLib/SpeckleLib17.vcxproj b/SpeckleLib/SpeckleLib17.vcxproj index 29da144..cec9db2 100644 --- a/SpeckleLib/SpeckleLib17.vcxproj +++ b/SpeckleLib/SpeckleLib17.vcxproj @@ -42,7 +42,7 @@ - + @@ -140,7 +140,7 @@ - + diff --git a/SpeckleLib/SpeckleLib17.vcxproj.filters b/SpeckleLib/SpeckleLib17.vcxproj.filters index d6993b5..67e4902 100644 --- a/SpeckleLib/SpeckleLib17.vcxproj.filters +++ b/SpeckleLib/SpeckleLib17.vcxproj.filters @@ -415,7 +415,7 @@ Speckle\Record\Element - + Speckle\Event\Subscriber @@ -634,7 +634,7 @@ Speckle\Record\Element - + Speckle\Event\Subscriber