Refactored to PIMPL pattern

4 files changed, 11 insertions, 11 deletions

diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
index 3bdf28c..5ab9b3e 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
@@ -23,7 +23,7 @@ V8DataModel::V8DataModel() {
 //  _contexts.push_back(v8::Context::New());
 }
 
-DataModel* V8DataModel::create(Interpreter* interpreter) {
+DataModelImpl* V8DataModel::create(Interpreter* interpreter) {
 	V8DataModel* dm = new V8DataModel();
 	dm->_interpreter = interpreter;
 	v8::Locker locker;
@@ -62,8 +62,8 @@ DataModel* V8DataModel::create(Interpreter* interpreter) {
 	return dm;
 }
 
-void V8DataModel::registerIOProcessor(const std::string& name, IOProcessor* ioprocessor) {
-	assign("_ioprocessors['" + name + "']", ioprocessor->getDataModelVariables());
+void V8DataModel::registerIOProcessor(const std::string& name, const IOProcessor& ioprocessor) {
+	assign("_ioprocessors['" + name + "']", ioprocessor.getDataModelVariables());
 }
 
 void V8DataModel::setSessionId(const std::string& sessionId) {
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
index deee58c..e5c1bc8 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
@@ -17,11 +17,11 @@ class V8SCXMLDOM;
 
 namespace uscxml {
 
-class V8DataModel : public DataModel {
+class V8DataModel : public DataModelImpl {
 public:
 	V8DataModel();
 	virtual ~V8DataModel();
-	virtual DataModel* create(Interpreter* interpreter);
+	virtual DataModelImpl* create(Interpreter* interpreter);
 
 	virtual std::set<std::string> getNames() {
 		std::set<std::string> names;
@@ -34,7 +34,7 @@ public:
 	virtual void setName(const std::string& name);
 	virtual void setEvent(const Event& event);
 
-	virtual void registerIOProcessor(const std::string& name, IOProcessor* ioprocessor);
+	virtual void registerIOProcessor(const std::string& name, const IOProcessor& ioprocessor);
 
 	virtual bool validate(const std::string& location, const std::string& schema);
 
diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp
index 77f0b66..3e20867 100644
--- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp
@@ -20,7 +20,7 @@ bool connect(pluma::Host& host) {
 SWIDataModel::SWIDataModel() {
 }
 
-DataModel* SWIDataModel::create(Interpreter* interpreter) {
+DataModelImpl* SWIDataModel::create(Interpreter* interpreter) {
 	SWIDataModel* dm = new SWIDataModel();
 	dm->_interpreter = interpreter;
 	const char* swiPath = SWI_LIBRARY_PATH;
@@ -28,7 +28,7 @@ DataModel* SWIDataModel::create(Interpreter* interpreter) {
 	return dm;
 }
 
-void SWIDataModel::registerIOProcessor(const std::string& name, IOProcessor* ioprocessor) {
+void SWIDataModel::registerIOProcessor(const std::string& name, const IOProcessor& ioprocessor) {
 	std::cout << "SWIDataModel::registerIOProcessor" << std::endl;
 }
 
diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
index 16dee3c..f5f5247 100644
--- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
+++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
@@ -11,11 +11,11 @@
 
 namespace uscxml {
 
-class SWIDataModel : public DataModel {
+class SWIDataModel : public DataModelImpl {
 public:
 	SWIDataModel();
 	virtual ~SWIDataModel();
-	virtual DataModel* create(Interpreter* interpreter);
+	virtual DataModelImpl* create(Interpreter* interpreter);
 
 	virtual std::set<std::string> getNames() {
 		std::set<std::string> names;
@@ -28,7 +28,7 @@ public:
 	virtual void setName(const std::string& name);
 	virtual void setEvent(const Event& event);
 
-	virtual void registerIOProcessor(const std::string& name, IOProcessor* ioprocessor);
+	virtual void registerIOProcessor(const std::string& name, const IOProcessor& ioprocessor);
 
 	virtual bool validate(const std::string& location, const std::string& schema);