diff options
author | Stefan Radomski <github@mintwerk.de> | 2016-05-19 08:03:50 (GMT) |
---|---|---|
committer | Stefan Radomski <github@mintwerk.de> | 2016-05-19 08:03:50 (GMT) |
commit | 5de792adc6796b0f03d62124765b4af0676dde46 (patch) | |
tree | e700d6b008b21c037aebcc1882fd9286920b2987 /src/uscxml/plugins/invoker/scxml | |
parent | f8e0c96fddfdd5f086e1bd973d6b0a19c39c93da (diff) | |
download | uscxml-5de792adc6796b0f03d62124765b4af0676dde46.zip uscxml-5de792adc6796b0f03d62124765b4af0676dde46.tar.gz uscxml-5de792adc6796b0f03d62124765b4af0676dde46.tar.bz2 |
Refactored for public headers and started documentation
Diffstat (limited to 'src/uscxml/plugins/invoker/scxml')
-rw-r--r-- | src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp | 8 | ||||
-rw-r--r-- | src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h | 13 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp index 4d3c579..f80d427 100644 --- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp +++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp @@ -32,7 +32,7 @@ namespace uscxml { // msxml.h should die in a fire for polluting the global namespace -// using namespace xercesc; +// using namespace XERCESC_NS; #ifdef BUILD_AS_PLUGINS PLUMA_CONNECTOR @@ -136,11 +136,11 @@ void USCXMLInvoker::invoke(const std::string& source, const Event& invokeEvent) if (source.length() > 0) { _invokedInterpreter = Interpreter::fromURL(source); } else if (invokeEvent.data.node) { - xercesc::DOMImplementation* implementation = xercesc::DOMImplementationRegistry::getDOMImplementation(X("core")); - xercesc::DOMDocument* document = implementation->createDocument(); + XERCESC_NS::DOMImplementation* implementation = XERCESC_NS::DOMImplementationRegistry::getDOMImplementation(X("core")); + XERCESC_NS::DOMDocument* document = implementation->createDocument(); // we need to import the parent - to support xpath test150 - xercesc::DOMNode* newNode = document->importNode(invokeEvent.data.node, true); + XERCESC_NS::DOMNode* newNode = document->importNode(invokeEvent.data.node, true); document->appendChild(newNode); // std::cout << *document << std::endl; diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h index dac8d8b..f896bac 100644 --- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h +++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h @@ -20,8 +20,11 @@ #ifndef USCXMLINVOKER_H_OQFA21IO #define USCXMLINVOKER_H_OQFA21IO -#include <uscxml/Interpreter.h> -#include "uscxml/interpreter/EventQueueImpl.h" +#include "uscxml/interpreter/InterpreterImpl.h" +#include "uscxml/interpreter/BasicEventQueue.h" + +#include "uscxml/plugins/Invoker.h" +#include "uscxml/plugins/InvokerImpl.h" #ifdef BUILD_AS_PLUGINS #include "uscxml/plugins/Plugins.h" @@ -31,11 +34,15 @@ namespace uscxml { +/** +* @ingroup invoker + * An invoker for other SCXML instances. + */ class USCXMLInvoker : public InvokerImpl, public std::enable_shared_from_this<USCXMLInvoker> { public: - class ParentQueueImpl : public EventQueueImpl { + class ParentQueueImpl : public BasicEventQueue { public: ParentQueueImpl(USCXMLInvoker* invoker) : _invoker(invoker) {} virtual void enqueue(const Event& event); |