rename

43 files changed, 0 insertions, 3606 deletions

diff --git a/Tobii EyeX/include/eyex-cpp/APIException.hpp b/Tobii EyeX/include/eyex-cpp/APIException.hpp
deleted file mode 100755
index d270c04..0000000
--- a/Tobii EyeX/include/eyex-cpp/APIException.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * APIException.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_APIEXCEPTION__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_APIEXCEPTION__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-class APIException 

-{

-public:

-	APIException(TX_RESULT result, const std::string& message = "")

-		: _result(result), _message(message)

-	{ }

-	

-	TX_RESULT  GetResult() const

-	{

-		return _result;

-	}

-

-	std::string GetMessage() const

-	{

-		return _message;

-	}

-

-private:

-	TX_RESULT _result;

-	std::string _message;

-};

-

-/*********************************************************************************************************************/

-

-inline bool TX_VALIDATE(TX_RESULT result)

-{

-	if(result == TX_RESULT_OK)

-		return true;

-

-	throw EyeX::APIException(result, "Error"); 

-}

-

-/*********************************************************************************************************************/

-

-inline bool TX_VALIDATE(TX_RESULT result, TX_RESULT falseResult)

-{

-	if(result == falseResult)

-		return false;

-

-	return TX_VALIDATE(result);

-}

-

-/*********************************************************************************************************************/

-

-inline bool TX_VALIDATE(TX_RESULT result, TX_RESULT falseResult1, TX_RESULT falseResult2)

-{

-	if(result == falseResult2)

-		return false;

-

-	return TX_VALIDATE(result, falseResult1);

-}

-

-template <typename THandle1, typename THandle2>

-inline std::string GetString(TX_RESULT (*pFn)(THandle1, TX_STRING, TX_SIZE*), THandle2 handle, TX_SIZE estimatedLength = 0)

-{

-    std::string str;

-    TX_VALIDATE(GetString(&str, pFn, handle, estimatedLength));

-    return str;

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-	

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_APIEXCEPTION__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/AsyncData.hpp b/Tobii EyeX/include/eyex-cpp/AsyncData.hpp
deleted file mode 100755
index 6ce342f..0000000
--- a/Tobii EyeX/include/eyex-cpp/AsyncData.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * CommandResult.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_ASYNCDATA__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_ASYNCDATA__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-	

-/*********************************************************************************************************************/

-

-class AsyncData :

-	public InteractionObjectBase<TX_CONSTHANDLE>

-{

-public:	

-	AsyncData(const std::shared_ptr<const Context>& spContext, TX_CONSTHANDLE hAsyncData);

-	   

-    bool TryGetResultCode(TX_RESULT* pResultCode) const;

-    std::shared_ptr<InteractionObject> GetData() const;

-

-	template <typename TInteractionObject>

-	std::shared_ptr<TInteractionObject> GetDataAs() const;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_ASYNCDATA__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/AsyncData.inl b/Tobii EyeX/include/eyex-cpp/AsyncData.inl
deleted file mode 100755
index 55f42f5..0000000
--- a/Tobii EyeX/include/eyex-cpp/AsyncData.inl
+++ /dev/null
@@ -1,54 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * AsyncData.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_ASYNCDATA__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_ASYNC__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline AsyncData::AsyncData(const std::shared_ptr<const Context>& spContext, TX_CONSTHANDLE hAsyncData)

-: InteractionObjectBase(spContext, hAsyncData)

-{ }

-

-/*********************************************************************************************************************/

-

-inline bool AsyncData::TryGetResultCode(TX_RESULT* pResultCode) const

-{

-	return TX_VALIDATE(txGetAsyncDataResultCode(_hObject, pResultCode), TX_RESULT_NOTFOUND);

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<InteractionObject> AsyncData::GetData() const

-{

-	Tx::Utils::ScopedHandle hData;

-	if(!TX_VALIDATE(txGetAsyncDataContent(_hObject, &hData), TX_RESULT_NOTFOUND))

-		return nullptr;

-

-	auto spData = _spContext->CreateObject(hData);	

-	return spData;

-}

-

-/*********************************************************************************************************************/

-

-template <typename TInteractionObject>

-std::shared_ptr<TInteractionObject> AsyncData::GetDataAs() const

-{

-	return std::dynamic_pointer_cast<TInteractionObject>(GetData());

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_ASYNCDATA__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Behavior.hpp b/Tobii EyeX/include/eyex-cpp/Behavior.hpp
deleted file mode 100755
index c40d7bc..0000000
--- a/Tobii EyeX/include/eyex-cpp/Behavior.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Behavior.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Behavior__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Behavior__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-class Behavior :

-	public InteractionObject

-{

-public:

-    Behavior(const std::shared_ptr<const Context>& spContext, TX_HANDLE hBehavior);

-

-    TX_BEHAVIORTYPE GetType() const;

-	

-public:

-    void SetData(const std::shared_ptr<InteractionObject>& spData);

-    std::shared_ptr<InteractionObject> GetData() const;

-

-    void SetGazePointDataBehaviorParams(const TX_GAZEPOINTDATAPARAMS& pParams);

-    bool TryGetGazePointDataBehaviorParams(TX_GAZEPOINTDATAPARAMS* pParams) const;

-    bool TryGetGazePointDataEventParams(TX_GAZEPOINTDATAEVENTPARAMS* pEventParams) const;

-

-    void SetActivatableBehaviorParams(const TX_ACTIVATABLEPARAMS& pParams);

-    bool TryGetActivatableBehaviorParams(TX_ACTIVATABLEPARAMS* pParams) const;

-

-    void SetPannableBehaviorParams(const TX_PANNABLEPARAMS& pParams);

-    bool TryGetPannableBehaviorParams(TX_PANNABLEPARAMS* pParams) const;

-    bool TryGetPannableEventType(TX_PANNABLEEVENTTYPE* pEventType) const;

-    bool TryGetPannablePanEvent(TX_PANNABLEPANEVENTPARAMS* pEventParams) const;

-    bool TryGetPannableStepEvent(TX_PANNABLESTEPEVENTPARAMS* pEventParams) const;

-    bool TryGetPannableHandsFreeEvent(TX_PANNABLEHANDSFREEEVENTPARAMS* pEventParams) const;

-

-    bool TryGetActivatableEventType(TX_ACTIVATABLEEVENTTYPE* pEventType) const;

-    bool TryGetActivationFocusChangedEventParams(TX_ACTIVATIONFOCUSCHANGEDEVENTPARAMS* pEventParams) const;

-	    

-    void SetGazeAwareBehaviorParams(const TX_GAZEAWAREPARAMS& pParams);

-    bool TryGetGazeAwareBehaviorParams(TX_GAZEAWAREPARAMS* pParams) const;

-    bool TryGetGazeAwareEventParams(TX_GAZEAWAREEVENTPARAMS* pEventParams) const;

-

-    void SetFixationDataBehaviorParams(const TX_FIXATIONDATAPARAMS& params); 

-    bool TryGetFixationDataBehaviorParams(TX_FIXATIONDATAPARAMS* pParams) const;

-    bool TryGetFixationDataEventParams(TX_FIXATIONDATAEVENTPARAMS* pEventParams) const;

-

-    bool TryGetEyePositionDataEventParams(TX_EYEPOSITIONDATAEVENTPARAMS* pEventParams) const;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Behavior__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Behavior.inl b/Tobii EyeX/include/eyex-cpp/Behavior.inl
deleted file mode 100755
index 5e4f71b..0000000
--- a/Tobii EyeX/include/eyex-cpp/Behavior.inl
+++ /dev/null
@@ -1,198 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Behavior.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Behavior__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Behavior__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline Behavior::Behavior(const std::shared_ptr<const Context>& spContext, TX_HANDLE hBehavior)

-: InteractionObject(spContext, hBehavior)

-{}

-

-/*********************************************************************************************************************/

-

-inline TX_BEHAVIORTYPE Behavior::GetType() const

-{

-	TX_BEHAVIORTYPE behaviorType;

-	TX_VALIDATE(txGetBehaviorType(_hObject, &behaviorType));

-	return behaviorType;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<InteractionObject> Behavior::GetData() const

-{

-	auto spProperty = GetProperty(TX_LITERAL_DATA);

-

-	std::shared_ptr<InteractionObject> spData;

-	if(spProperty->TryGetValue(&spData))

-		return spData;

-

-	return nullptr;

-}

-

-/*********************************************************************************************************************/

-	

-inline void Behavior::SetData(const std::shared_ptr<InteractionObject>& spData)

-{

-	auto spProperty = GetProperty(TX_LITERAL_DATA);

-	spProperty->SetValue(spData);

-}

-

-/*********************************************************************************************************************/

-

-inline void Behavior::SetGazePointDataBehaviorParams(const TX_GAZEPOINTDATAPARAMS& params)

-{

-    TX_VALIDATE(txSetGazePointDataBehaviorParams(_hObject, &params));

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetGazePointDataBehaviorParams(TX_GAZEPOINTDATAPARAMS* pParams) const

-{

-    return TX_VALIDATE(txGetGazePointDataBehaviorParams(_hObject, pParams), TX_RESULT_INVALIDBEHAVIORTYPE);

-}

-

-/*********************************************************************************************************************/

-

-inline void Behavior::SetActivatableBehaviorParams(const TX_ACTIVATABLEPARAMS& params)

-{

-    TX_VALIDATE(txSetActivatableBehaviorParams(_hObject, &params));

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetActivatableBehaviorParams(TX_ACTIVATABLEPARAMS* pParams) const

-{

-    return TX_VALIDATE(txGetActivatableBehaviorParams(_hObject, pParams), TX_RESULT_INVALIDBEHAVIORTYPE);

-}

-

-/*********************************************************************************************************************/

-

-inline void Behavior::SetPannableBehaviorParams(const TX_PANNABLEPARAMS& params)

-{

-    TX_VALIDATE(txSetPannableBehaviorParams(_hObject, &params));

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetPannableBehaviorParams(TX_PANNABLEPARAMS* pParams) const

-{

-    return TX_VALIDATE(txGetPannableBehaviorParams(_hObject, pParams), TX_RESULT_INVALIDBEHAVIORTYPE);

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetPannableEventType(TX_PANNABLEEVENTTYPE* pEventType) const

-{

-	return TX_VALIDATE(txGetPannableEventType(_hObject, pEventType), TX_RESULT_INVALIDBEHAVIORTYPE);

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetPannablePanEvent(TX_PANNABLEPANEVENTPARAMS* pEventParams) const

-{

-	return TX_VALIDATE(txGetPannablePanEventParams(_hObject, pEventParams), TX_RESULT_INVALIDBEHAVIORTYPE, TX_RESULT_NOTFOUND);

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetPannableStepEvent(TX_PANNABLESTEPEVENTPARAMS* pEventParams) const

-{

-	return TX_VALIDATE(txGetPannableStepEventParams(_hObject, pEventParams), TX_RESULT_INVALIDBEHAVIORTYPE, TX_RESULT_NOTFOUND);

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetPannableHandsFreeEvent(TX_PANNABLEHANDSFREEEVENTPARAMS* pEventParams) const

-{

-	return TX_VALIDATE(txGetPannableHandsFreeEventParams(_hObject, pEventParams), TX_RESULT_INVALIDBEHAVIORTYPE, TX_RESULT_NOTFOUND);

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetActivatableEventType(TX_ACTIVATABLEEVENTTYPE* pEventType) const

-{

-	return TX_VALIDATE(txGetActivatableEventType(_hObject, pEventType), TX_RESULT_INVALIDBEHAVIORTYPE);

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetActivationFocusChangedEventParams(TX_ACTIVATIONFOCUSCHANGEDEVENTPARAMS* pEventParams) const

-{

-	return TX_VALIDATE(txGetActivationFocusChangedEventParams(_hObject, pEventParams), TX_RESULT_INVALIDBEHAVIORTYPE, TX_RESULT_NOTFOUND);

-}

-

-/*********************************************************************************************************************/

-

-inline void Behavior::SetGazeAwareBehaviorParams(const TX_GAZEAWAREPARAMS& params)

-{

-    TX_VALIDATE(txSetGazeAwareBehaviorParams(_hObject, &params));

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetGazeAwareBehaviorParams(TX_GAZEAWAREPARAMS* pParams) const

-{    

-	return TX_VALIDATE(txGetGazeAwareBehaviorParams(_hObject, pParams), TX_RESULT_INVALIDBEHAVIORTYPE, TX_RESULT_NOTFOUND);

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetGazeAwareEventParams(TX_GAZEAWAREEVENTPARAMS* pEventParams) const

-{

-	return TX_VALIDATE(txGetGazeAwareBehaviorEventParams(_hObject, pEventParams), TX_RESULT_INVALIDBEHAVIORTYPE);

-}

-

-/*********************************************************************************************************************/

-

-inline void Behavior::SetFixationDataBehaviorParams(const TX_FIXATIONDATAPARAMS& params) 

-{

-	TX_VALIDATE(txSetFixationDataBehaviorParams(_hObject, &params));

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetFixationDataBehaviorParams(TX_FIXATIONDATAPARAMS* pParams) const

-{

-    return TX_VALIDATE(txGetFixationDataBehaviorParams(_hObject, pParams), TX_RESULT_INVALIDBEHAVIORTYPE);

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetFixationDataEventParams(TX_FIXATIONDATAEVENTPARAMS* pEventParams) const

-{

-	return TX_VALIDATE(txGetFixationDataEventParams(_hObject, pEventParams), TX_RESULT_INVALIDBEHAVIORTYPE, TX_RESULT_NOTFOUND);

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetGazePointDataEventParams(TX_GAZEPOINTDATAEVENTPARAMS* pEventParams) const

-{

-	return TX_VALIDATE(txGetGazePointDataEventParams(_hObject, pEventParams), TX_RESULT_INVALIDBEHAVIORTYPE, TX_RESULT_NOTFOUND);

-}

-

-/*********************************************************************************************************************/

-

-inline bool Behavior::TryGetEyePositionDataEventParams(TX_EYEPOSITIONDATAEVENTPARAMS* pEventParams) const

-{

-	return TX_VALIDATE(txGetEyePositionDataEventParams(_hObject, pEventParams), TX_RESULT_INVALIDBEHAVIORTYPE, TX_RESULT_NOTFOUND);

-}

-

-/*********************************************************************************************************************/

-

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Behavior__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Bounds.hpp b/Tobii EyeX/include/eyex-cpp/Bounds.hpp
deleted file mode 100755
index f355ac4..0000000
--- a/Tobii EyeX/include/eyex-cpp/Bounds.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Bounds.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Bounds__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Bounds__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-class Bounds :

-	public InteractionObject

-{	

-public:

-	Bounds(const std::shared_ptr<const Context>& spContext, TX_HANDLE hBounds);

-

-	TX_BOUNDSTYPE GetType() const;

-

-public:

-	bool TryGetRectangularData(TX_REAL* pX, TX_REAL* pY, TX_REAL* pWidth, TX_REAL* pHeight) const;

-	void SetRectangularData(TX_REAL x, TX_REAL y, TX_REAL width, TX_REAL height);

-	

-	bool TryGetRectangularData(TX_RECT* pData) const;

-	void SetRectangularData(const TX_RECT& data);

-

-	std::shared_ptr<InteractionObject> GetData() const;

-	void SetData(const std::shared_ptr<InteractionObject>& spData);

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Bounds__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Bounds.inl b/Tobii EyeX/include/eyex-cpp/Bounds.inl
deleted file mode 100755
index 495e779..0000000
--- a/Tobii EyeX/include/eyex-cpp/Bounds.inl
+++ /dev/null
@@ -1,86 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Bounds.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Bounds__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Bounds__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline Bounds::Bounds(const std::shared_ptr<const Context>& spContext, TX_HANDLE hBounds)

-: InteractionObject(spContext, hBounds)

-{}

-

-/*********************************************************************************************************************/

-

-inline TX_BOUNDSTYPE Bounds::GetType() const

-{

-	TX_BOUNDSTYPE boundsType;

-	TX_VALIDATE(txGetBoundsType(_hObject, &boundsType));

-	return boundsType;

-}

-

-/*********************************************************************************************************************/

-

-

-inline bool Bounds::TryGetRectangularData(TX_REAL* pX, TX_REAL* pY, TX_REAL* pWidth, TX_REAL* pHeight) const

-{

-	return txGetRectangularBoundsData(_hObject, pX, pY, pWidth, pHeight) == TX_RESULT_OK;

-}

-

-/*********************************************************************************************************************/

-

-inline void Bounds::SetRectangularData(TX_REAL x, TX_REAL y, TX_REAL width, TX_REAL height)

-{	

-	txSetRectangularBoundsData(_hObject, x, y, width, height);

-}

-

-/*********************************************************************************************************************/

-

-inline bool Bounds::TryGetRectangularData(TX_RECT* pData) const

-{

-	return TryGetRectangularData(&pData->X, &pData->Y, &pData->Width, &pData->Height);

-}

-

-/*********************************************************************************************************************/

-

-inline void Bounds::SetRectangularData(const TX_RECT& data)

-{

-	SetRectangularData(data.X, data.Y, data.Width, data.Height);

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<InteractionObject> Bounds::GetData() const

-{		

-	auto spProperty = GetProperty(TX_LITERAL_DATA);

-

-	std::shared_ptr<InteractionObject> spData;

-	if(spProperty->TryGetValue(&spData))

-		return spData;

-

-	return nullptr;

-}

-

-/*********************************************************************************************************************/

-

-inline void Bounds::SetData(const std::shared_ptr<InteractionObject>& spData)

-{

-	auto spProperty = GetProperty(TX_LITERAL_DATA);

-	spProperty->SetValue(spData);

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Bounds__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Callbacks.hpp b/Tobii EyeX/include/eyex-cpp/Callbacks.hpp
deleted file mode 100755
index 84bd702..0000000
--- a/Tobii EyeX/include/eyex-cpp/Callbacks.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Callbacks.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_CALLBACKS__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_CALLBACKS__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-	

-/*********************************************************************************************************************/

-

-typedef std::function<void (TX_CONNECTIONSTATE)> ConnectionStateChangedHandler;

-typedef std::function<void (const std::unique_ptr<AsyncData>&)> AsyncDataHandler;

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_CALLBACKS__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Command.hpp b/Tobii EyeX/include/eyex-cpp/Command.hpp
deleted file mode 100755
index ef1f189..0000000
--- a/Tobii EyeX/include/eyex-cpp/Command.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Command.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Command__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Command__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-class Command :

-	public InteractionObject

-{

-public:

-	Command(const std::shared_ptr<const Context>& spContext, TX_HANDLE hCommand);

-

-	TX_COMMANDTYPE GetType() const;

-	void ExecuteAsync(AsyncDataHandler fnHandler);

-	

-public:

-	std::shared_ptr<InteractionObject> GetData() const;

-	void SetData(const std::shared_ptr<InteractionObject>& spData);

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Command__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Command.inl b/Tobii EyeX/include/eyex-cpp/Command.inl
deleted file mode 100755
index 953687f..0000000
--- a/Tobii EyeX/include/eyex-cpp/Command.inl
+++ /dev/null
@@ -1,70 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Command.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Command__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Command__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline Command::Command(const std::shared_ptr<const Context>& spContext, TX_HANDLE hCommand)

-: InteractionObject(spContext, hCommand)

-{}

-

-/*********************************************************************************************************************/

-

-inline TX_COMMANDTYPE Command::GetType() const

-{

-	TX_COMMANDTYPE commandType;

-	TX_VALIDATE(txGetCommandType(_hObject, &commandType));

-	return commandType;

-}

-

-/*********************************************************************************************************************/

-

-inline void Command::ExecuteAsync(AsyncDataHandler fnHandler)

-{	

-    auto spThis = shared_from_this();

-	auto fnProxy = [&, spThis, fnHandler](TX_CONSTHANDLE hAsyncData) 

-	{			

-		GetContext()->InvokeAsyncDataHandler(hAsyncData, fnHandler);

-	};

-

-    TX_VALIDATE(Tx::ExecuteCommandAsync(_hObject, fnProxy));

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<InteractionObject> Command::GetData() const

-{

-	auto spProperty = GetProperty(TX_LITERAL_DATA);

-

-	std::shared_ptr<InteractionObject> spData;

-	if(spProperty->TryGetValue(&spData))

-		return spData;

-

-	return nullptr;

-}

-

-/*********************************************************************************************************************/

-	

-inline void Command::SetData(const std::shared_ptr<InteractionObject>& spData)

-{

-	auto spProperty = GetProperty(TX_LITERAL_DATA);

-	spProperty->SetValue(spData);

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Command__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Context.hpp b/Tobii EyeX/include/eyex-cpp/Context.hpp
deleted file mode 100755
index c6cefa0..0000000
--- a/Tobii EyeX/include/eyex-cpp/Context.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Context.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Context__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Context__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-class Context : 

-    public std::enable_shared_from_this<Context>

-{

-    Context(bool trackObjects);

-

-public:

-    static std::shared_ptr<Context> Create(bool trackObjects);

-    virtual ~Context();

-

-	TX_CONTEXTHANDLE GetHandle() const;

-	void SetName(const std::string& name);

-	std::string GetName() const;

-

-    TX_TICKET RegisterConnectionStateChangedHandler(ConnectionStateChangedHandler fnConnectionStateChangedHandler);

-    void UnregisterConnectionStateChangedHandler(TX_TICKET ticket);

-

-    void EnableConnection();

-    void DisableConnection();

-    void Shutdown();

-

-

-    TX_TICKET RegisterMessageHandler(TX_MESSAGETYPE messageType, std::shared_ptr<const InteractionObject> spOptions, AsyncDataHandler fnAsyncDataHandler);

-    void UnregisterMessageHandler(TX_TICKET ticket);

-		

-	void RegisterStateObserver(const std::string& statePath);

-	void UnregisterStateObserver(const std::string& statePath);

-	void GetStateAsync(const std::string& statePath, AsyncDataHandler fnCompletion) const;

-    std::shared_ptr<StateBag> GetState(const std::string& statePath) const;

-

-	TX_TICKET RegisterStateChangedHandler(const std::string& statePath, AsyncDataHandler fnHandler);

-	void UnregisterStateChangedHandler(TX_TICKET ticket);

-    

-    template <typename TValue>

-    void SetStateAsync(const std::string& statePath, const TValue& value, AsyncDataHandler fnCompletion = nullptr);

-

-    std::vector<std::shared_ptr<InteractionObject>> GetTrackedObjects() const;

-

-    std::shared_ptr<InteractionObject> CreateObject(TX_HANDLE hObject) const;

-	std::shared_ptr<InteractionObject> CreateObject(Tx::Utils::ScopedHandle& hObject) const;

-    std::shared_ptr<Property> CreateProperty(TX_PROPERTYHANDLE hProperty) const;

-

-    std::shared_ptr<PropertyBag> CreateBag(TX_PROPERTYBAGTYPE bagType = TX_PROPERTYBAGTYPE_OBJECT) const;	

-	std::shared_ptr<StateBag> CreateStateBag(const std::string& statePath) const;

-    std::shared_ptr<Snapshot> CreateSnapshot() const;    

-    std::shared_ptr<Snapshot> CreateGlobalInteractorSnapshot(TX_CONSTSTRING globalInteractorId, std::shared_ptr<Interactor>* pspInteractor) const;

-    std::shared_ptr<Command> CreateCommand(TX_COMMANDTYPE commandType) const;

-	std::shared_ptr<Command> CreateActionCommand(TX_ACTIONTYPE actionType) const;

-

-    void DisableBuiltinKeys(const std::string& windowId, AsyncDataHandler fnCompletion = nullptr) const;

-    void EnableBuiltinKeys(const std::string& windowId, AsyncDataHandler fnCompletion = nullptr) const;

-

-	void LaunchConfigurationTool(TX_CONFIGURATIONTOOL configurationTool, AsyncDataHandler fnCompletion = nullptr) const;

-

-    template <typename TInteractionObject>

-    std::shared_ptr<TInteractionObject> CreateObject(TX_HANDLE hObject) const;

-	

-    template <typename TInteractionObject>

-	std::shared_ptr<TInteractionObject> CreateObject(Tx::Utils::ScopedHandle& hObject) const;

-

-    void WriteLogMessage(TX_LOGLEVEL level, const std::string& scope, const std::string& message);

-	void PerformScheduledJobs();

-

-	void InvokeAsyncDataHandler(TX_CONSTHANDLE hAsyncData, AsyncDataHandler fnHandler) const;

-

-private:

-    TX_CONTEXTHANDLE _hContext;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-	

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Context__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Context.inl b/Tobii EyeX/include/eyex-cpp/Context.inl
deleted file mode 100755
index 1e9089a..0000000
--- a/Tobii EyeX/include/eyex-cpp/Context.inl
+++ /dev/null
@@ -1,427 +0,0 @@
-/*********************************************************************************************************************

-* Copyright 2013-2014 Tobii Technology AB. All rights reserved.

-* Context.inl

-*********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Context__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Context__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Context> Context::Create(bool trackObjects)

-{

-    return std::shared_ptr<Context>(new Context(trackObjects));

-}

-

-/*********************************************************************************************************************/

-

-inline Context::Context(bool trackObjects)

-	: _hContext(TX_EMPTY_HANDLE)

-{

-	TX_VALIDATE(txCreateContext(&_hContext, trackObjects ? TX_TRUE : TX_FALSE));

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::Shutdown()

-{

-	txShutdownContext(_hContext, 1000, TX_TRUE);

-}

-

-/*********************************************************************************************************************/

-

-inline Context::~Context()

-{

-	txReleaseContext(&_hContext);

-}

-

-/*********************************************************************************************************************/

-

-inline TX_CONTEXTHANDLE Context::GetHandle() const

-{

-	return _hContext;

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::SetName(const std::string& name)

-{

-	TX_VALIDATE(txSetContextName(_hContext, name.c_str()));

-}

-

-/*********************************************************************************************************************/

-

-inline std::string Context::GetName() const

-{

-	std::string name;

-	TX_VALIDATE(Tx::Utils::GetString(&name, txGetContextName, _hContext));

-	return name;

-}

-

-/*********************************************************************************************************************/

-

-inline TX_TICKET Context::RegisterConnectionStateChangedHandler(ConnectionStateChangedHandler fnConnectionStateChangedHandler)

-{	

-	TX_TICKET ticket;

-	TX_VALIDATE(Tx::RegisterConnectionStateChangedHandler(_hContext, &ticket, fnConnectionStateChangedHandler));

-	return ticket;

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::UnregisterConnectionStateChangedHandler(TX_TICKET ticket)

-{

-	TX_VALIDATE(txUnregisterConnectionStateChangedHandler(_hContext, ticket));

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::EnableConnection()

-{

-	TX_VALIDATE(txEnableConnection(_hContext));

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::DisableConnection()

-{

-	TX_VALIDATE(txDisableConnection(_hContext));

-}

-

-/*********************************************************************************************************************/

-

-inline TX_TICKET Context::RegisterMessageHandler(TX_MESSAGETYPE messageType, std::shared_ptr<const InteractionObject> spOptions, AsyncDataHandler fnMessageHandler)

-{    

-	auto fnProxy = [&, fnMessageHandler](TX_CONSTHANDLE hAsyncData) 

-	{	        

-		InvokeAsyncDataHandler(hAsyncData, fnMessageHandler);

-	};

-

-	auto hOptions = spOptions ? spOptions->GetHandle() : nullptr;

-

-	TX_TICKET ticket = 0;

-	Tx::RegisterMessageHandler(_hContext, &ticket, messageType, hOptions, fnProxy);

-	return ticket;

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::UnregisterMessageHandler(TX_TICKET ticket)

-{	

-	TX_VALIDATE(txUnregisterMessageHandler(_hContext, ticket));

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::RegisterStateObserver(const std::string& statePath)

-{

-	TX_VALIDATE(txRegisterStateObserver(_hContext, statePath.c_str()));

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::UnregisterStateObserver(const std::string& statePath)

-{	

-	TX_VALIDATE(txUnregisterStateObserver(_hContext, statePath.c_str()));

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::GetStateAsync(const std::string& statePath, AsyncDataHandler fnCompletion) const

-{

-	auto callback = [&, fnCompletion](TX_CONSTHANDLE hAsyncData)

-	{   		

-		InvokeAsyncDataHandler(hAsyncData, fnCompletion);

-	};

-

-	TX_VALIDATE(Tx::GetStateAsync(_hContext, statePath.c_str(), callback));

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<StateBag> Context::GetState(const std::string& statePath) const

-{

-	Tx::Utils::ScopedHandle hStateBag;

-	TX_VALIDATE(txGetState(_hContext, statePath.c_str(), &hStateBag));

-

-	std::shared_ptr<StateBag> spStateBag;

-	if(hStateBag)

-		spStateBag = CreateObject<StateBag>(hStateBag);

-

-	return spStateBag;

-}

-

-/*********************************************************************************************************************/

-

-inline TX_TICKET Context::RegisterStateChangedHandler(const std::string& statePath, AsyncDataHandler fnHandler)

-{

-	auto callback = [&, fnHandler](TX_CONSTHANDLE hAsyncData)

-	{           

-		InvokeAsyncDataHandler(hAsyncData, fnHandler);

-	};

-	

-	TX_TICKET ticket;

-	TX_VALIDATE(Tx::RegisterStateChangedHandler(_hContext, &ticket, statePath.c_str(), callback));

-	

-	return ticket;        

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::UnregisterStateChangedHandler(TX_TICKET ticket)

-{

-	TX_VALIDATE(txUnregisterStateChangedHandler(_hContext, ticket));

-}

-

-/*********************************************************************************************************************/

-

-template <typename TValue>

-inline void Context::SetStateAsync(const std::string& statePath, const TValue& value, AsyncDataHandler fnCompletion)

-{

-	auto stateBag = CreateStateBag(statePath);

-	stateBag->SetStateValue(statePath, value);

-	stateBag->SetAsync(fnCompletion);

-}

-

-/*********************************************************************************************************************/

-

-inline std::vector<std::shared_ptr<InteractionObject>> Context::GetTrackedObjects() const

-{

-	std::vector<Tx::Utils::ScopedHandle> objectHandles;

-	TX_VALIDATE(Tx::Utils::GetBufferData(objectHandles, txGetTrackedObjects, _hContext));

-

-	std::vector<std::shared_ptr<InteractionObject>> objects;

-

-	for(auto& hObject : objectHandles)

-	{

-		auto spObject = CreateObject<InteractionObject>(hObject);

-		objects.push_back(spObject);

-	}

-

-	return objects;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<InteractionObject> Context::CreateObject(TX_HANDLE hObject) const

-{

-	TX_INTERACTIONOBJECTTYPE objectType;

-	TX_VALIDATE(txGetObjectType(hObject, &objectType));

-

-	switch(objectType)

-	{

-	case TX_INTERACTIONOBJECTTYPE_BEHAVIOR:

-		return CreateObject<Behavior>(hObject);

-

-	case TX_INTERACTIONOBJECTTYPE_BOUNDS:

-		return CreateObject<Bounds>(hObject);

-

-	case TX_INTERACTIONOBJECTTYPE_COMMAND:

-		return CreateObject<Command>(hObject);

-		

-	case TX_INTERACTIONOBJECTTYPE_QUERY:

-		return CreateObject<Query>(hObject);

-

-	case TX_INTERACTIONOBJECTTYPE_EVENT:

-		return CreateObject<InteractionEvent>(hObject);

-

-	case TX_INTERACTIONOBJECTTYPE_INTERACTOR:

-		return CreateObject<Interactor>(hObject);

-

-	case TX_INTERACTIONOBJECTTYPE_SNAPSHOT:

-		return CreateObject<Snapshot>(hObject);

-

-	case TX_INTERACTIONOBJECTTYPE_PROPERTYBAG:

-		return CreateObject<PropertyBag>(hObject);

-

-	case TX_INTERACTIONOBJECTTYPE_STATEBAG:

-		return CreateObject<StateBag>(hObject);

-

-	case TX_INTERACTIONOBJECTTYPE_NOTIFICATION:

-		return CreateObject<Notification>(hObject);

-	}

-

-	throw APIException(TX_RESULT_UNKNOWN, "Unknown interaction object type");

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<InteractionObject> Context::CreateObject(Tx::Utils::ScopedHandle& hObject) const

-{

-	auto spObject = CreateObject((TX_HANDLE)hObject);

-

-	if(spObject)

-		hObject.Detach();

-

-	return spObject;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Property> Context::CreateProperty(TX_PROPERTYHANDLE hProperty) const

-{

-	auto spProperty = std::make_shared<Property>(shared_from_this(), hProperty);

-	return spProperty;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<PropertyBag> Context::CreateBag(TX_PROPERTYBAGTYPE bagType) const

-{

-	Tx::Utils::ScopedHandle hBag;

-	TX_VALIDATE(txCreatePropertyBag(_hContext, &hBag, bagType));

-	auto spBag = CreateObject<PropertyBag>(hBag);

-	return spBag;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<StateBag> Context::CreateStateBag(const std::string& statePath) const

-{

-	Tx::Utils::ScopedHandle hStateBag;

-	TX_VALIDATE(txCreateStateBag(_hContext, &hStateBag, statePath.c_str()));	

-	auto spStateBag = CreateObject<StateBag>(hStateBag);

-	return spStateBag;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Snapshot> Context::CreateSnapshot() const

-{

-	Tx::Utils::ScopedHandle hSnapshot;

-	TX_VALIDATE(txCreateSnapshot(_hContext, &hSnapshot));

-	auto spSnapshot = CreateObject<Snapshot>(hSnapshot);

-	return spSnapshot;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Snapshot> Context::CreateGlobalInteractorSnapshot(TX_CONSTSTRING globalInteractorId, std::shared_ptr<Interactor>* pspInteractor) const

-{

-	Tx::Utils::ScopedHandle hSnapshot, hInteractor;

-	TX_VALIDATE(txCreateGlobalInteractorSnapshot(_hContext, globalInteractorId, &hSnapshot, &hInteractor));

-	*pspInteractor = CreateObject<Interactor>(hInteractor);

-	auto spSnapshot = CreateObject<Snapshot>(hSnapshot);

-	return spSnapshot;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Command> Context::CreateCommand(TX_COMMANDTYPE commandType) const

-{

-	Tx::Utils::ScopedHandle hCommand;

-	TX_VALIDATE(txCreateCommand(_hContext, &hCommand, commandType));

-	auto spCommand = CreateObject<Command>(hCommand);

-	return spCommand;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Command> Context::CreateActionCommand(TX_ACTIONTYPE actionType) const

-{

-    Tx::Utils::ScopedHandle hCommand;

-    TX_VALIDATE(txCreateActionCommand(_hContext, &hCommand, actionType));

-    auto spCommand = CreateObject<Command>(hCommand);

-    return spCommand;

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::DisableBuiltinKeys(const std::string& windowId, AsyncDataHandler fnCompletion) const

-{

-    auto callback = [&, fnCompletion](TX_CONSTHANDLE hAsyncData)

-	{   		

-		InvokeAsyncDataHandler(hAsyncData, fnCompletion);

-	};

-

-    TX_VALIDATE(Tx::DisableBuiltinKeys(_hContext, windowId.c_str(), callback));

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::EnableBuiltinKeys(const std::string& windowId, AsyncDataHandler fnCompletion) const

-{

-    auto callback = [&, fnCompletion](TX_CONSTHANDLE hAsyncData)

-	{   		

-		InvokeAsyncDataHandler(hAsyncData, fnCompletion);

-	};

-

-    TX_VALIDATE(Tx::EnableBuiltinKeys(_hContext, windowId.c_str(), callback));

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::LaunchConfigurationTool(TX_CONFIGURATIONTOOL configurationTool, AsyncDataHandler fnCompletion) const

-{

-	auto callback = [&, fnCompletion](TX_CONSTHANDLE hAsyncData)

-	{

-		InvokeAsyncDataHandler(hAsyncData, fnCompletion);

-	};

-

-	TX_VALIDATE(Tx::LaunchConfigurationTool(_hContext, configurationTool, callback));

-}

-

-/*********************************************************************************************************************/

-

-template <typename TInteractionObject>

-inline std::shared_ptr<TInteractionObject> Context::CreateObject(TX_HANDLE hObject) const

-{

-	return std::make_shared<TInteractionObject>(shared_from_this(), hObject);

-}

-

-/*********************************************************************************************************************/

-

-template <typename TInteractionObject>

-inline std::shared_ptr<TInteractionObject> Context::CreateObject(Tx::Utils::ScopedHandle& hObject) const

-{

-	auto spObject = CreateObject<TInteractionObject>((TX_HANDLE)hObject);

-

-	if(spObject)

-		hObject.Detach();

-

-	return spObject;

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::WriteLogMessage(TX_LOGLEVEL level, const std::string& scope, const std::string& message)

-{

-	TX_VALIDATE(txWriteLogMessage(level, scope.c_str(), message.c_str()));

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::PerformScheduledJobs()

-{

-	TX_VALIDATE(txPerformScheduledJobs(_hContext));

-}

-

-/*********************************************************************************************************************/

-

-inline void Context::InvokeAsyncDataHandler(TX_CONSTHANDLE hAsyncData, AsyncDataHandler fnHandler) const

-{ 

-	if(!fnHandler)

-		return;

-

-	try

-	{		

-		auto upAsyncData = std::unique_ptr<AsyncData>(new AsyncData(shared_from_this(), hAsyncData));

-		fnHandler(upAsyncData);

-	}

-	catch(...)

-	{ }

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Context__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Environment.hpp b/Tobii EyeX/include/eyex-cpp/Environment.hpp
deleted file mode 100755
index 5a4a8c8..0000000
--- a/Tobii EyeX/include/eyex-cpp/Environment.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Environment.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_ENVIRONMENT__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_ENVIRONMENT__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-class Environment 

-{	

-	Environment(

-		TX_EYEXCOMPONENTOVERRIDEFLAGS flags,

-		TX_LOGGINGMODEL* pLoggingModel,

-		TX_THREADINGMODEL* pThreadingModel,

-		TX_SCHEDULINGMODEL* pSchedulingModel,

-        void* pMemoryModel);

-public:

-	virtual ~Environment();

-

-	static std::shared_ptr<Environment> Initialize(

-		TX_EYEXCOMPONENTOVERRIDEFLAGS flags,

-		TX_LOGGINGMODEL* pLoggingModel,

-		TX_THREADINGMODEL* pThreadingModel,

-		TX_SCHEDULINGMODEL* pSchedulingModel,

-        void* pMemoryModel);

-

-	TX_EYEXAVAILABILITY GetEyeXAvailability();

-    static bool IsInitialized();

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_ENVIRONMENT__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Environment.inl b/Tobii EyeX/include/eyex-cpp/Environment.inl
deleted file mode 100755
index fa83b1f..0000000
--- a/Tobii EyeX/include/eyex-cpp/Environment.inl
+++ /dev/null
@@ -1,70 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Environment.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_ENVIRONMENT__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_ENVIRONMENT__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline Environment::Environment(

-	TX_EYEXCOMPONENTOVERRIDEFLAGS flags,

-	TX_LOGGINGMODEL* pLoggingModel,

-	TX_THREADINGMODEL* pThreadingModel,

-	TX_SCHEDULINGMODEL* pSchedulingModel,

-    void* pMemoryModel)

-{

-    TX_VALIDATE(txInitializeEyeX(flags, pLoggingModel, pThreadingModel, pSchedulingModel, pMemoryModel));

-}

-

-/*********************************************************************************************************************/

-

-inline Environment::~Environment()

-{

-	TX_VALIDATE(txUninitializeEyeX());

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Environment> Environment::Initialize(

-	TX_EYEXCOMPONENTOVERRIDEFLAGS flags,

-	TX_LOGGINGMODEL* pLoggingModel,

-	TX_THREADINGMODEL* pThreadingModel,

-	TX_SCHEDULINGMODEL* pSchedulingModel,

-    void* pMemoryModel)

-{

-    return std::shared_ptr<Environment>(new Environment(flags, pLoggingModel, pThreadingModel, pSchedulingModel, pMemoryModel));

-}

-

-/*********************************************************************************************************************/

-

-inline TX_EYEXAVAILABILITY Environment::GetEyeXAvailability()

-{

-	TX_EYEXAVAILABILITY availability;

-	TX_VALIDATE(txGetEyeXAvailability(&availability));

-	return availability;

-}

-

-/*********************************************************************************************************************/

-

-inline bool Environment::IsInitialized()

-{

-    TX_BOOL res;

-    txIsEyeXInitialized(&res);

-    return res != TX_FALSE;

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_ENVIRONMENT__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/EyeX.hpp b/Tobii EyeX/include/eyex-cpp/EyeX.hpp
deleted file mode 100755
index b0c8123..0000000
--- a/Tobii EyeX/include/eyex-cpp/EyeX.hpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * EyeX.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_TX__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_TX__HPP__

-

-/*********************************************************************************************************************/

-

-#define TX_NAMESPACE_BEGIN namespace EyeX {

-#define TX_NAMESPACE_END }

-

-/*********************************************************************************************************************/

-

-#include <vector>

-#include <memory>

-#include <functional>

-#include <fstream>

-#include <map>

-#include <algorithm>

-#include <sstream>

-#include <cassert>

-

-/*********************************************************************************************************************/

-

-#define TOBII_TX_DETAIL

-

-#include "eyex/EyeX.h"

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN 

-	

-class Environment;

-class InteractionObject;

-class Property;

-class PropertyBag;

-class Bounds;

-class Behavior;

-class Interactor;

-class Snapshot;

-class SnapshotResult;

-class Command;

-class CommandResult;

-class Query;

-class InteractionEvent;

-class Notification;

-class AsyncData;

-class StateBag;

-class Mask;

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#include "APIException.hpp"

-#include "Callbacks.hpp"

-#include "Environment.hpp"

-#include "PropertyValueResolver.hpp"

-#include "Context.hpp"

-#include "HandleWrapper.hpp"

-#include "InteractionObject.hpp"

-#include "Behavior.hpp"

-#include "Bounds.hpp"

-#include "Command.hpp"

-#include "AsyncData.hpp"

-#include "InteractionEvent.hpp"

-#include "Query.hpp"

-#include "Snapshot.hpp"

-#include "Interactor.hpp"

-#include "Property.hpp"

-#include "PropertyBag.hpp"

-#include "Notification.hpp"

-#include "StateBag.hpp"

-#include "Mask.hpp"

-#include "InteractionAgentBase.hpp"

-

-/*********************************************************************************************************************/

-

-#include "PropertyValueResolver.inl"

-#include "Environment.inl"

-#include "Context.inl"

-#include "HandleWrapper.inl"

-#include "InteractionObject.inl"

-#include "Behavior.inl"

-#include "Bounds.inl"

-#include "Command.inl"

-#include "AsyncData.inl"

-#include "InteractionEvent.inl"

-#include "Query.inl"

-#include "Snapshot.inl"

-#include "Interactor.inl"

-#include "Property.inl"

-#include "PropertyBag.inl"

-#include "Notification.inl"

-#include "StateBag.inl"

-#include "Mask.inl"

-#include "InteractionAgentBase.inl"

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_TX__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/HandleWrapper.hpp b/Tobii EyeX/include/eyex-cpp/HandleWrapper.hpp
deleted file mode 100755
index d32b83c..0000000
--- a/Tobii EyeX/include/eyex-cpp/HandleWrapper.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * HandleWrapper.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_HANDLEWRAPPER__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_HANDLEWRAPPER__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-class HandleWrapper :

-	public std::enable_shared_from_this<HandleWrapper<THandle>>

-{

-public:

-    HandleWrapper(const std::shared_ptr<const Context>& spContext, THandle hObject);

-	virtual ~HandleWrapper();

-	

-    std::shared_ptr<const Context> GetContext() const;

-	THandle GetHandle() const;

-

-protected:

-    template <typename THandle1, typename THandle2>

-    inline static std::string GetString(TX_RESULT (*pFn)(THandle1, TX_STRING, TX_SIZE*), THandle2 handle, TX_SIZE estimatedLength = 0);

-

-protected:

-	std::shared_ptr<const Context> _spContext;

-	THandle _hObject;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_HANDLEWRAPPER__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/HandleWrapper.inl b/Tobii EyeX/include/eyex-cpp/HandleWrapper.inl
deleted file mode 100755
index eae842e..0000000
--- a/Tobii EyeX/include/eyex-cpp/HandleWrapper.inl
+++ /dev/null
@@ -1,61 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * InteractionObject.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_HANDLEWRAPPER__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_HANDLEWRAPPER__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-inline HandleWrapper<THandle>::HandleWrapper(const std::shared_ptr<const Context>& spContext, THandle hObject)

-: _spContext(spContext), _hObject(hObject)

-{}

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-inline HandleWrapper<THandle>::~HandleWrapper()

-{ }

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-inline std::shared_ptr<const Context> HandleWrapper<THandle>::GetContext() const

-{

-	return _spContext;

-}

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-inline THandle HandleWrapper<THandle>::GetHandle() const

-{

-	return _hObject;

-}

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-template <typename THandle1, typename THandle2>

-inline static std::string HandleWrapper<THandle>::GetString(TX_RESULT (*pFn)(THandle1, TX_STRING, TX_SIZE*), THandle2 handle, TX_SIZE estimatedLength)

-{

-    std::string str;

-    TX_VALIDATE(Tx::Utils::GetString(&str, pFn, handle, estimatedLength));

-    return str;

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_HANDLEWRAPPER__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/InteractionAgentBase.hpp b/Tobii EyeX/include/eyex-cpp/InteractionAgentBase.hpp
deleted file mode 100755
index 3ca22d4..0000000
--- a/Tobii EyeX/include/eyex-cpp/InteractionAgentBase.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * InteractionAgentBase.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONAGENTBASE__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONAGENTBASE__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-class InteractionAgentBase 

-{	

-public:

-	void Initialize();

-	void Uninitialize();

-

-	std::shared_ptr<Context> GetContext() const;

-

-protected:

-	InteractionAgentBase(bool trackObjects = true);

-

-	virtual void OnInitialize() {}

-	virtual void OnUninitialize() {}

-	virtual void OnRegisterQueryHandlers();

-	

-	virtual void OnConnectionStateChanged(TX_CONNECTIONSTATE state) {}

-	virtual void OnNotification(const std::shared_ptr<Notification>& spNotification) {}

-	virtual void OnQuery(const std::shared_ptr<Query>& spQuery) {}

-	virtual void OnEvent(const std::shared_ptr<InteractionEvent>& spEvent) {}

-

-	virtual std::shared_ptr<Environment> InitializeEyeX();	

-	virtual TX_LOGGINGMODEL* GetLoggingModel();

-	virtual TX_THREADINGMODEL* GetThreadingModel() { return nullptr; }

-	virtual TX_SCHEDULINGMODEL* GetSchedulingModel() { return nullptr; }

-    

-	void RegisterQueryHandler(const std::string& processId);

-

-    bool IsRunning() const;

-		

-private:

-    bool _isRunning;

-

-	std::shared_ptr<Context> _spContext;

-	TX_TICKET _connectionStateChangedHandlerTicket;

-	std::vector<TX_TICKET> _messageHandlerTickets;

-	std::shared_ptr<Environment> _spSystem;

-    bool _trackObjects;

-

-	TX_LOGGINGMODEL _defaultLoggingModel;

-};

-

-/*********************************************************************************************************************/

-

-class AutoRespondingInteractionAgentBase : 

-	public InteractionAgentBase

-{

-public:

-	AutoRespondingInteractionAgentBase(bool trackObjects = true);

-

-protected:

-	void OnQuery(const std::shared_ptr<Query>& spQuery) override;

-

-	virtual bool PrepareSnapshot(const std::shared_ptr<Snapshot>& spSnapshot) { return false; }

-	virtual void OnSnapshotResult(const std::unique_ptr<AsyncData>& upAsyncData) {}

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-	

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONAGENTBASE__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/InteractionAgentBase.inl b/Tobii EyeX/include/eyex-cpp/InteractionAgentBase.inl
deleted file mode 100755
index c949822..0000000
--- a/Tobii EyeX/include/eyex-cpp/InteractionAgentBase.inl
+++ /dev/null
@@ -1,183 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * InteractionAgentBase.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONAGENTBASE__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONAGENTBASE__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline InteractionAgentBase::InteractionAgentBase(bool trackObjects) :

-_trackObjects(trackObjects)

-{ 

-    memset(&_defaultLoggingModel, 0, sizeof(_defaultLoggingModel));

-	_defaultLoggingModel.Targets = TX_LOGTARGET_CONSOLE;

-

-#if _DEBUG

-	_defaultLoggingModel.Targets = (TX_LOGTARGET)(_defaultLoggingModel.Targets | TX_LOGTARGET_TRACE);

-#endif

-}

-

-/*********************************************************************************************************************/

-

-inline void InteractionAgentBase::Initialize()

-{

-    _isRunning = true;

-	_spSystem = InitializeEyeX();

-	_spContext = Context::Create(_trackObjects);

-

-	_connectionStateChangedHandlerTicket = _spContext->RegisterConnectionStateChangedHandler([this] (TX_CONNECTIONSTATE state) {

-		OnConnectionStateChanged(state);

-	});

-

-	auto eventHandlerTicket = _spContext->RegisterMessageHandler(TX_MESSAGETYPE_EVENT, nullptr, [this] (const std::unique_ptr<AsyncData>& upAsyncData) {

-		auto spEvent = upAsyncData->GetDataAs<InteractionEvent>();

-		OnEvent(spEvent);

-	});

-

-	auto notificationHandlerTicket = _spContext->RegisterMessageHandler(TX_MESSAGETYPE_NOTIFICATION, nullptr, [this] (const std::unique_ptr<AsyncData>& upAsyncData) {

-		auto spNotification = upAsyncData->GetDataAs<Notification>();

-		OnNotification(spNotification);

-	});

-

-	_messageHandlerTickets.push_back(eventHandlerTicket);

-	_messageHandlerTickets.push_back(notificationHandlerTicket);

-

-	OnRegisterQueryHandlers();

-	OnInitialize();

-

-	_spContext->EnableConnection();    

-}

-

-/*********************************************************************************************************************/

-

-inline void InteractionAgentBase::Uninitialize()

-{

-    _isRunning = false;

-

-	OnUninitialize();

-	_spContext->DisableConnection();

-

-	for(auto messageHandlerTicket : _messageHandlerTickets)

-		_spContext->UnregisterMessageHandler(messageHandlerTicket);

-

-	_spContext->Shutdown();

-    _spContext->UnregisterConnectionStateChangedHandler(_connectionStateChangedHandlerTicket);

-

-	_spContext.reset();

-	_spSystem.reset();

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Context> InteractionAgentBase::GetContext() const

-{

-	return _spContext;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Environment> InteractionAgentBase::InitializeEyeX()

-{

-	auto pLoggingModel = GetLoggingModel();

-	auto pThreadingModel = GetThreadingModel();

-	auto pSchedulingModel = GetSchedulingModel();

-   

-	auto overrideFlags = TX_EYEXCOMPONENTOVERRIDEFLAG_NONE;

-

-	if(pLoggingModel)

-		overrideFlags = (TX_EYEXCOMPONENTOVERRIDEFLAGS)(overrideFlags | TX_EYEXCOMPONENTOVERRIDEFLAG_LOGGINGMODEL);

-		

-	if(pThreadingModel)

-		overrideFlags = (TX_EYEXCOMPONENTOVERRIDEFLAGS)(overrideFlags | TX_EYEXCOMPONENTOVERRIDEFLAG_INTERNAL_THREADINGMODEL);

-

-	if(pSchedulingModel)

-		overrideFlags = (TX_EYEXCOMPONENTOVERRIDEFLAGS)(overrideFlags | TX_EYEXCOMPONENTOVERRIDEFLAG_INTERNAL_SCHEDULINGMODEL);

-

-	return Environment::Initialize(overrideFlags, pLoggingModel, pThreadingModel, pSchedulingModel, nullptr);

-}

-

-/*********************************************************************************************************************/

-

-inline void InteractionAgentBase::OnRegisterQueryHandlers()

-{

-	auto currentProcessId = GetCurrentProcessId();

-	auto currentProcessIdStr = std::to_string(currentProcessId);

-	RegisterQueryHandler(currentProcessIdStr);

-}

-

-/*********************************************************************************************************************/

-

-inline void InteractionAgentBase::RegisterQueryHandler(const std::string& processId)

-{

-	auto spOptions = _spContext->CreateBag();

-	auto spProcessIdProeprty = spOptions->CreateProperty(TX_LITERAL_TARGETPROCESSID);

-	spProcessIdProeprty->SetValue(processId);

-

-	auto fnQueryHandler = [this](const std::unique_ptr<AsyncData>& upAsyncData) 

-	{

-		auto spQuery = upAsyncData->GetDataAs<Query>();       

-		OnQuery(spQuery);       

-	};

-

-	auto ticket = _spContext->RegisterMessageHandler(TX_MESSAGETYPE_QUERY, spOptions, fnQueryHandler);

-	_messageHandlerTickets.push_back(ticket);

-}

-

-/*********************************************************************************************************************/

-

-inline TX_LOGGINGMODEL* InteractionAgentBase::GetLoggingModel()

-{

-	return &_defaultLoggingModel;	

-}

-

-/*********************************************************************************************************************/

-

-inline bool InteractionAgentBase::IsRunning() const

-{

-    return _isRunning;

-}

-

-/*********************************************************************************************************************/

-

-inline AutoRespondingInteractionAgentBase::AutoRespondingInteractionAgentBase(bool trackObjects)

-	: InteractionAgentBase(trackObjects)

-{ }

-

-/*********************************************************************************************************************/

-

-inline void AutoRespondingInteractionAgentBase::OnQuery(const std::shared_ptr<Query>& spQuery)

-{	    

-    auto spSnapshot = Snapshot::CreateSnapshotForQuery(spQuery);

-

-    try

-    {

-	    if(!PrepareSnapshot(spSnapshot))

-		    return;

-    }

-    catch(...)

-    {         

-        GetContext()->WriteLogMessage(TX_LOGLEVEL_ERROR, "AutoRespondingInteractionAgentBase", "Custom snapshot preparation throw an exception");

-		return;

-    }

-

-	spSnapshot->CommitAsync([this](const std::unique_ptr<AsyncData>& upAsyncData)

-	{

-		OnSnapshotResult(upAsyncData);	

-	});

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONAGENTBASE__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/InteractionContext.cpp b/Tobii EyeX/include/eyex-cpp/InteractionContext.cpp
deleted file mode 100755
index ac08a78..0000000
--- a/Tobii EyeX/include/eyex-cpp/InteractionContext.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-//---------------------------------------------------------------------------------------------------------------------

-// InteractionContext.cpp

-//---------------------------------------------------------------------------------------------------------------------

-

-#include "Precompiled.hpp"

-#include "InteractionContext.hpp"

-#include "InteractionObject.hpp"

-#include "InteractionCommand.hpp"

-#include "InteractionBehavior.hpp"

-#include "InteractionBounds.hpp"

-#include "Interactor.hpp"

-#include "InteractionQuery.hpp"

-#include "InteractionEvent.hpp"

-#include "InteractionSnapshot.hpp"

-#include "Property.hpp"

-#include "PropertyBag.hpp"

-

-//---------------------------------------------------------------------------------------------------------------------

-

-TOBIIGAZE_NAMESPACE_BEGIN

-

-//---------------------------------------------------------------------------------------------------------------------

-

-//---------------------------------------------------------------------------------------------------------------------

-

-TOBIIGAZE_NAMESPACE_END

-

-//---------------------------------------------------------------------------------------------------------------------

diff --git a/Tobii EyeX/include/eyex-cpp/InteractionEvent.hpp b/Tobii EyeX/include/eyex-cpp/InteractionEvent.hpp
deleted file mode 100755
index 2e6839f..0000000
--- a/Tobii EyeX/include/eyex-cpp/InteractionEvent.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * InteractionEvent.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONEVENT__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONEVENT__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-	

-/*********************************************************************************************************************/

-

-class InteractionEvent :

-	public InteractionObject

-{

-public:

-	InteractionEvent(const std::shared_ptr<const Context>& spContext, TX_HANDLE hEvent);

-	   

-    std::string GetInteractorId() const;        

-    std::vector<std::shared_ptr<Behavior>> GetBehaviors() const;

-	bool TryGetBehavior(std::shared_ptr<Behavior>* pspBehavior, TX_BEHAVIORTYPE behaviorType) const;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONEVENT__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/InteractionEvent.inl b/Tobii EyeX/include/eyex-cpp/InteractionEvent.inl
deleted file mode 100755
index b650bef..0000000
--- a/Tobii EyeX/include/eyex-cpp/InteractionEvent.inl
+++ /dev/null
@@ -1,63 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * InteractionEvent.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONEVENT__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONEVENT__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline InteractionEvent::InteractionEvent(const std::shared_ptr<const Context>& spContext, TX_HANDLE hEvent)

-: InteractionObject(spContext, hEvent)

-{}

-

-/*********************************************************************************************************************/

-	   

-inline std::string InteractionEvent::GetInteractorId() const        

-{	

-    return GetString(txGetEventInteractorId, _hObject);

-}

-

-/*********************************************************************************************************************/

-

-inline std::vector<std::shared_ptr<Behavior>> InteractionEvent::GetBehaviors() const

-{	   

-	std::vector<Tx::Utils::ScopedHandle> behaviorHandles;

-    TX_VALIDATE(Tx::Utils::GetBufferData(behaviorHandles, txGetEventBehaviors, _hObject));

-	

-    std::vector<std::shared_ptr<Behavior>> behaviors;

-	for(auto& hBehavior : behaviorHandles)

-	{

-		auto spBehavior = _spContext->CreateObject<Behavior>(hBehavior);

-		behaviors.push_back(spBehavior);

-	}

-

-	return behaviors;

-}

-

-/*********************************************************************************************************************/

-

-inline bool InteractionEvent::TryGetBehavior(std::shared_ptr<Behavior>* pspBehavior, TX_BEHAVIORTYPE behaviorType) const

-{

-	Tx::Utils::ScopedHandle hBehavior;

-	if(!TX_VALIDATE(txGetEventBehavior(_hObject, &hBehavior, behaviorType), TX_RESULT_NOTFOUND))

-		return false;

-

-	*pspBehavior = _spContext->CreateObject<Behavior>(hBehavior);

-	return true;

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONEVENT__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/InteractionObject.hpp b/Tobii EyeX/include/eyex-cpp/InteractionObject.hpp
deleted file mode 100755
index 75d4171..0000000
--- a/Tobii EyeX/include/eyex-cpp/InteractionObject.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * InteractionObject.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONOBJECT__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONOBJECT__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-class InteractionObjectBase :

-    public HandleWrapper<THandle>

-{

-public:

-	InteractionObjectBase(const std::shared_ptr<const Context>& spContext, THandle hObject);

-		

-	TX_INTERACTIONOBJECTTYPE GetObjectType() const;

-

-	bool TryGetProperty(std::shared_ptr<Property>* pspProperty, const std::string& propertyName) const;

-	std::shared_ptr<Property> GetProperty(const std::string& propertyName) const;

-	std::vector<std::shared_ptr<Property>> GetProperties() const;

-	void CopyPropertiesTo(const std::shared_ptr<InteractionObject>& spObject) const;

-	std::string FormatAsText() const;

-			

-public:

-	template <typename TValue>

-	typename PropertyValueResolver<TValue>::ValueType GetPropertyValue(const std::string& propertyName) const;

-

-    template <typename TValue>

-    bool TryGetPropertyValue(TValue* pValue, const std::string& propertyName) const;

-};

-

-/*********************************************************************************************************************/

-

-class InteractionObject :

-    public InteractionObjectBase<TX_HANDLE>

-{

-public:

-	InteractionObject(const std::shared_ptr<const Context>& spContext, TX_HANDLE hObject);

-	virtual ~InteractionObject();

-		

-	std::shared_ptr<Property> CreateProperty(const std::string& propertyName);

-				

-public:

-	template <typename TValue>

-	void SetPropertyValue(const std::string& propertyName, const TValue& value);

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONOBJECT__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/InteractionObject.inl b/Tobii EyeX/include/eyex-cpp/InteractionObject.inl
deleted file mode 100755
index 5722ce6..0000000
--- a/Tobii EyeX/include/eyex-cpp/InteractionObject.inl
+++ /dev/null
@@ -1,162 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * InteractionObject.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONOBJECT__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONOBJECT__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-inline InteractionObjectBase<THandle>::InteractionObjectBase(const std::shared_ptr<const Context>& spContext, THandle hObject)

-: HandleWrapper(spContext, hObject)

-{ }

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-inline TX_INTERACTIONOBJECTTYPE InteractionObjectBase<THandle>::GetObjectType() const

-{

-	TX_INTERACTIONOBJECTTYPE objectType;

-	TX_VALIDATE(txGetObjectType(_hObject, &objectType));

-	return objectType;

-}

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-inline bool InteractionObjectBase<THandle>::TryGetProperty(std::shared_ptr<Property>* pspProperty, const std::string& propertyName) const

-{

-	TX_PROPERTYHANDLE hProperty;

-	auto result = txGetProperty(_hObject, &hProperty, propertyName.c_str());

-	if(result == TX_RESULT_NOTFOUND)

-		return false;

-

-	*pspProperty = _spContext->CreateProperty(hProperty);

-	return true;

-}

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-inline std::shared_ptr<Property> InteractionObjectBase<THandle>::GetProperty(const std::string& propertyName) const

-{

-	std::shared_ptr<Property> spProperty;

-	if(TryGetProperty(&spProperty, propertyName))

-		return spProperty;

-	

-	throw APIException(TX_RESULT_NOTFOUND, "Property not found");

-}

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-inline std::vector<std::shared_ptr<Property>> InteractionObjectBase<THandle>::GetProperties() const 

-{

-	std::vector<TX_PROPERTYHANDLE> propertyHandles;

-    TX_VALIDATE(Tx::Utils::GetBufferData(propertyHandles, txGetProperties, _hObject));

-    

-	std::vector<std::shared_ptr<Property>> properties;	

-	for(auto& hProperty : propertyHandles)

-	{

-		auto spProperty = _spContext->CreateProperty(hProperty);

-		properties.push_back(spProperty);

-	}

-

-	return properties;

-}

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-inline void InteractionObjectBase<THandle>::CopyPropertiesTo(const std::shared_ptr<InteractionObject>& spObject) const

-{

-	TX_VALIDATE(txCopyProperties(_hObject, spObject->GetHandle()));

-}

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-inline std::string InteractionObjectBase<THandle>::FormatAsText() const

-{

-    return GetString(txFormatObjectAsText, _hObject, 512);

-}

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-template <typename TValue>

-inline typename PropertyValueResolver<TValue>::ValueType InteractionObjectBase<THandle>::GetPropertyValue(const std::string& propertyName) const

-{

-	auto spProperty = GetProperty(propertyName);

-	return spProperty->GetValue<TValue>();

-}

-

-/*********************************************************************************************************************/

-

-template <typename THandle>

-template <typename TValue>

-inline bool InteractionObjectBase<THandle>::TryGetPropertyValue(TValue* pValue, const std::string& propertyName) const

-{

-    std::shared_ptr<Property> spProperty;

-	if(!TryGetProperty(&spProperty, propertyName))

-		return false;

-

-    if(!spProperty->TryGetValue(pValue))

-        return false;

-

-    return true;

-}

-

-/*********************************************************************************************************************/

-

-

-/*********************************************************************************************************************/

-

-inline InteractionObject::InteractionObject(const std::shared_ptr<const Context>& spContext, TX_HANDLE hObject)

-: InteractionObjectBase<TX_HANDLE>(spContext, hObject)

-{ }

-

-/*********************************************************************************************************************/

-

-inline InteractionObject::~InteractionObject()

-{

-	txReleaseObject(&_hObject);

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Property> InteractionObject::CreateProperty(const std::string& propertyName)

-{

-	TX_PROPERTYHANDLE hProperty;

-	TX_VALIDATE(txCreateProperty(_hObject, &hProperty, propertyName.c_str()));

-	auto spProperty = _spContext->CreateProperty(hProperty);

-	return spProperty;

-}

-

-/*********************************************************************************************************************/

-

-template <typename TValue>

-inline void InteractionObject::SetPropertyValue(const std::string& propertyName, const TValue& value)

-{

-	std::shared_ptr<Property> spProperty;

-	if(!TryGetProperty(&spProperty, propertyName))

-		spProperty = CreateProperty(propertyName);

-

-	spProperty->SetValue(value);

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTIONOBJECT__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Interactor.hpp b/Tobii EyeX/include/eyex-cpp/Interactor.hpp
deleted file mode 100755
index 046adb0..0000000
--- a/Tobii EyeX/include/eyex-cpp/Interactor.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Interactor.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTOR__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_INTERACTOR__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-class Interactor :

-	public InteractionObject

-{

-public:	

-	Interactor(const std::shared_ptr<const Context>& spContext, TX_HANDLE hInteractor);

-		

-	std::string GetId() const;

-	std::string GetParentId() const;

-    std::string GetWindowId() const;

-

-    bool GetEnabled() const;

-    void SetEnabled(bool enabled);    

-

-    bool GetDeleted() const;

-    void SetDeleted(bool deleted);

-

-    double GetZ() const;

-    void SetZ(double z);

-    

-    void CreateGazePointDataBehavior(const TX_GAZEPOINTDATAPARAMS& params);

-    void CreateActivatableBehavior(const TX_ACTIVATABLEPARAMS& params);

-    void CreatePannableBehavior(const TX_PANNABLEPARAMS& params);    

-    void CreateGazeAwareBehavior(const TX_GAZEAWAREPARAMS& params);    

-    void CreateFixationDataBehaviorParams(const TX_FIXATIONDATAPARAMS& params); 

-

-    std::shared_ptr<Bounds> GetBounds() const;

-    std::vector<std::shared_ptr<Behavior>> GetBehaviors() const;

-    std::shared_ptr<Bounds> CreateBounds(TX_BOUNDSTYPE boundsType);

-    void DeleteBounds();

-

-    std::shared_ptr<Behavior> CreateBehavior(TX_BEHAVIORTYPE behaviorType);

-    void DeleteBehavior(TX_BEHAVIORTYPE behaviorType);

-	bool TryGetBehavior(std::shared_ptr<Behavior> *pspBehavior, TX_BEHAVIORTYPE behaviorType) const;

-

-    std::shared_ptr<Mask> CreateMask(TX_MASKTYPE maskType, int columnCount, int rowCount, const TX_BYTE* pData);

-    void RemoveMask();

-    std::shared_ptr<Mask> GetMask() const;

-    

-    void SetMaskBounds(const TX_RECT& bounds);

-    void ClearMaskBounds();

-    bool TryGetMaskBounds(TX_RECT* pBounds) const;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTOR__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Interactor.inl b/Tobii EyeX/include/eyex-cpp/Interactor.inl
deleted file mode 100755
index 5246609..0000000
--- a/Tobii EyeX/include/eyex-cpp/Interactor.inl
+++ /dev/null
@@ -1,257 +0,0 @@
-/*********************************************************************************************************************

-* Copyright 2013-2014 Tobii Technology AB. All rights reserved.

-* Interactor.inl

-*********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTOR__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_INTERACTOR__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline Interactor::Interactor(const std::shared_ptr<const Context>& spContext, TX_HANDLE hInteractor)

-: InteractionObject(spContext, hInteractor)

-{}

-

-/*********************************************************************************************************************/

-

-inline bool Interactor::GetEnabled() const

-{

-    int isEnabled;

-    TX_VALIDATE(txGetInteractorEnabled(_hObject, &isEnabled));

-    return isEnabled != 0;

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::SetEnabled(bool enabled)

-{

-    TX_VALIDATE(txSetInteractorEnabled(_hObject, enabled ? 1 : 0));

-}

-

-/*********************************************************************************************************************/

-

-inline bool Interactor::GetDeleted() const

-{

-    int isDeleted;

-    TX_VALIDATE(txGetInteractorDeleted(_hObject, &isDeleted));

-    return isDeleted != 0;

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::SetDeleted(bool deleted)

-{

-    TX_VALIDATE(txSetInteractorDeleted(_hObject, deleted ? 1 : 0));

-}

-

-/*********************************************************************************************************************/

-

-inline std::string Interactor::GetId() const

-{

-    return GetString(txGetInteractorId, _hObject);

-}

-

-/*********************************************************************************************************************/

-

-inline std::string Interactor::GetParentId() const

-{    

-    return GetString(txGetInteractorParentId, _hObject);

-}

-

-/*********************************************************************************************************************/

-

-inline std::string Interactor::GetWindowId() const

-{

-    return GetString(txGetInteractorWindowId, _hObject);

-}

-

-/*********************************************************************************************************************/

-

-inline double Interactor::GetZ() const

-{

-    double z;

-    TX_VALIDATE(txGetInteractorZ(_hObject, &z));

-    return z;

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::SetZ(double z)

-{

-    TX_VALIDATE(txSetInteractorZ(_hObject, z));

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::CreateGazePointDataBehavior(const TX_GAZEPOINTDATAPARAMS& params)

-{

-

-    TX_VALIDATE(txCreateGazePointDataBehavior(_hObject, &params));

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::CreateActivatableBehavior(const TX_ACTIVATABLEPARAMS& params)

-{    

-    TX_VALIDATE(txCreateActivatableBehavior(_hObject, &params));

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::CreatePannableBehavior(const TX_PANNABLEPARAMS& params)

-{

-    TX_VALIDATE(txCreatePannableBehavior(_hObject, &params));

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::CreateGazeAwareBehavior(const TX_GAZEAWAREPARAMS& params)

-{

-    TX_VALIDATE(txCreateGazeAwareBehavior(_hObject, &params));

-}  

-

-/*********************************************************************************************************************/

-

-inline void Interactor::CreateFixationDataBehaviorParams(const TX_FIXATIONDATAPARAMS& params)

-{    

-    TX_VALIDATE(txCreateFixationDataBehavior(_hObject, &params));

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Bounds> Interactor::GetBounds() const

-{

-    TX_HANDLE hBounds;

-    if (!TX_VALIDATE(txGetInteractorBounds(_hObject, &hBounds), TX_RESULT_NOTFOUND))

-        return nullptr;

-

-    return _spContext->CreateObject<Bounds>(hBounds);

-}

-

-/*********************************************************************************************************************/

-

-inline std::vector<std::shared_ptr<Behavior>> Interactor::GetBehaviors() const

-{

-    std::vector<Tx::Utils::ScopedHandle> behaviorHandles;

-    TX_VALIDATE(Tx::Utils::GetBufferData(behaviorHandles, txGetInteractorBehaviors, _hObject));

-        

-    std::vector<std::shared_ptr<Behavior>> behaviors;   

-    for(auto& hBehavior : behaviorHandles)

-    {

-        auto spBehavior = _spContext->CreateObject<Behavior>(hBehavior);

-        behaviors.push_back(spBehavior);

-    }

-

-    return behaviors;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Bounds> Interactor::CreateBounds(TX_BOUNDSTYPE boundsType)

-{

-    Tx::Utils::ScopedHandle hBounds;

-    TX_VALIDATE(txCreateInteractorBounds(_hObject, &hBounds, boundsType));

-    auto spBounds = _spContext->CreateObject<Bounds>(hBounds);

-    return spBounds;

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::DeleteBounds()

-{

-    TX_VALIDATE(txDeleteInteractorBounds(_hObject));

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Behavior> Interactor::CreateBehavior(TX_BEHAVIORTYPE behaviorType)

-{

-    Tx::Utils::ScopedHandle hBehavior;

-    TX_VALIDATE(txCreateInteractorBehavior(_hObject, &hBehavior, behaviorType));

-    auto spBehavior = _spContext->CreateObject<Behavior>(hBehavior);

-    return spBehavior;

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::DeleteBehavior(TX_BEHAVIORTYPE behaviorType)

-{

-    TX_VALIDATE(txRemoveInteractorBehavior(_hObject, behaviorType));

-}

-

-/*********************************************************************************************************************/

-

-inline bool Interactor::TryGetBehavior(std::shared_ptr<Behavior> *pspBehavior, TX_BEHAVIORTYPE behaviorType) const

-{

-    Tx::Utils::ScopedHandle hBehavior;

-    if (!TX_VALIDATE(txGetInteractorBehavior(_hObject, &hBehavior, behaviorType), TX_RESULT_NOTFOUND))

-        return false;

-

-    *pspBehavior = _spContext->CreateObject<Behavior>(hBehavior);

-    return true;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Mask> Interactor::CreateMask(TX_MASKTYPE maskType, int columnCount, int rowCount, const TX_BYTE* pData)

-{

-    Tx::Utils::ScopedHandle hMask;

-    TX_VALIDATE(txCreateMask(_hObject, &hMask, maskType, columnCount, rowCount, pData));

-    auto spMask = _spContext->CreateObject<Mask>(hMask);

-    return spMask;

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::RemoveMask()

-{

-    TX_VALIDATE(txRemoveMask(_hObject));

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Mask> Interactor::GetMask() const

-{

-    Tx::Utils::ScopedHandle hMask;

-    TX_VALIDATE(txGetMask(_hObject, &hMask));

-    auto spMask = _spContext->CreateObject<Mask>(hMask);

-    return spMask;

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::SetMaskBounds(const TX_RECT& bounds)

-{

-    TX_VALIDATE(txSetMaskBounds(_hObject, &bounds));

-}

-

-/*********************************************************************************************************************/

-

-inline void Interactor::ClearMaskBounds() 

-{

-    TX_VALIDATE(txClearMaskBounds(_hObject));

-}

-

-/*********************************************************************************************************************/

-

-inline bool Interactor::TryGetMaskBounds(TX_RECT* pBounds) const

-{    

-    if(!TX_VALIDATE(txGetMaskBounds(_hObject, pBounds), TX_RESULT_NOTFOUND))

-        return false;

-

-    return true;

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-    /*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_INTERACTOR__INL__)

-

-    /*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Mask.hpp b/Tobii EyeX/include/eyex-cpp/Mask.hpp
deleted file mode 100755
index a2b9458..0000000
--- a/Tobii EyeX/include/eyex-cpp/Mask.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Mask.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_MASK__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_MASK__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-	

-/*********************************************************************************************************************/

-

-class Mask :

-	public InteractionObject

-{

-public:

-	Mask(const std::shared_ptr<const Context>& spContext, TX_HANDLE hMask);

-	int GetColumnCount() const;

-    int GetRowCount() const;

-    void GetData(std::vector<TX_BYTE>& data) const;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_MASK__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Mask.inl b/Tobii EyeX/include/eyex-cpp/Mask.inl
deleted file mode 100755
index 3e7ed2d..0000000
--- a/Tobii EyeX/include/eyex-cpp/Mask.inl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Mask.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_MASK__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_MASK__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline Mask::Mask(const std::shared_ptr<const Context>& spContext, TX_HANDLE hMask) 

-: InteractionObject(spContext, hMask)

-{ }

-

-/*********************************************************************************************************************/

-

-inline int Mask::GetColumnCount() const

-{

-    int columnCount, rowCount;

-    TX_VALIDATE(txGetMaskData(_hObject, &columnCount, &rowCount, nullptr, nullptr));

-    return columnCount;

-}

-

-/*********************************************************************************************************************/

-

-inline int Mask::GetRowCount() const

-{    

-    int columnCount, rowCount;

-    TX_VALIDATE(txGetMaskData(_hObject, &columnCount, &rowCount, nullptr, nullptr));

-    return rowCount;

-}

-

-/*********************************************************************************************************************/

-

-inline void Mask::GetData(std::vector<TX_BYTE>& data) const

-{

-    int columnCount, rowCount, dataSize = 0;

-    if(TX_VALIDATE(txGetMaskData(_hObject, &columnCount, &rowCount, nullptr, &dataSize)))

-        return;

-

-    data.resize(dataSize);

-    TX_VALIDATE(txGetMaskData(_hObject, &columnCount, &rowCount, &data[0], &dataSize));

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_MASK__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Notification.hpp b/Tobii EyeX/include/eyex-cpp/Notification.hpp
deleted file mode 100755
index 6d342da..0000000
--- a/Tobii EyeX/include/eyex-cpp/Notification.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Notification.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Notification__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Notification__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-	

-/*********************************************************************************************************************/

-

-class Notification :

-	public InteractionObject

-{

-public:

-	Notification(const std::shared_ptr<const Context>& spContext, TX_HANDLE hNotification);

-	              

-    TX_NOTIFICATIONTYPE GetNotificationType() const;

-    std::shared_ptr<InteractionObject> GetData() const;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Notification__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Notification.inl b/Tobii EyeX/include/eyex-cpp/Notification.inl
deleted file mode 100755
index 180fcd2..0000000
--- a/Tobii EyeX/include/eyex-cpp/Notification.inl
+++ /dev/null
@@ -1,49 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Notification.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Notification__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Notification__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-	

-/*********************************************************************************************************************/

-

-inline Notification::Notification(const std::shared_ptr<const Context>& spContext, TX_HANDLE hNotification) 

-: InteractionObject(spContext, hNotification)

-{ }

-

-/*********************************************************************************************************************/

-	              

-inline TX_NOTIFICATIONTYPE Notification::GetNotificationType() const

-{

-    TX_NOTIFICATIONTYPE notificationType;

-    TX_VALIDATE(txGetNotificationType(_hObject, &notificationType));

-    return notificationType;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<InteractionObject> Notification::GetData() const

-{

-    Tx::Utils::ScopedHandle hData;

-    if(!TX_VALIDATE(txGetNotificationData(_hObject, &hData), TX_RESULT_NOTFOUND))

-        return nullptr;

-

-    auto spData = _spContext->CreateObject(hData);

-	return spData;

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Notification__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Property.cpp b/Tobii EyeX/include/eyex-cpp/Property.cpp
deleted file mode 100755
index b5da8af..0000000
--- a/Tobii EyeX/include/eyex-cpp/Property.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-//---------------------------------------------------------------------------------------------------------------------

-// Property.cpp

-//---------------------------------------------------------------------------------------------------------------------

-

-#include "Precompiled.hpp"

-#include "Property.hpp"

-#include "InteractionContext.hpp"

-

-//---------------------------------------------------------------------------------------------------------------------

-

-TOBIIGAZE_NAMESPACE_BEGIN

-

-//---------------------------------------------------------------------------------------------------------------------

-

-//---------------------------------------------------------------------------------------------------------------------

-

-TOBIIGAZE_NAMESPACE_END

-

-//---------------------------------------------------------------------------------------------------------------------

diff --git a/Tobii EyeX/include/eyex-cpp/Property.hpp b/Tobii EyeX/include/eyex-cpp/Property.hpp
deleted file mode 100755
index 2ff87c0..0000000
--- a/Tobii EyeX/include/eyex-cpp/Property.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Property.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTY__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_PROPERTY__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-class Property :

-	public HandleWrapper<TX_PROPERTYHANDLE>	

-{

-public:

-	Property(const std::shared_ptr<const Context>& spContext, TX_PROPERTYHANDLE hProperty);

-

-	TX_PROPERTYVALUETYPE GetValueType() const;

-	std::string GetName() const;

-	TX_PROPERTYFLAGS GetFlags() const;

-

-	void Clear();

-

-	template <typename TValue>

-	bool TryGetValue(TValue* pValue) const;

-

-	template <typename TValue>

-	typename PropertyValueResolver<TValue>::ValueType GetValue() const;

-

-    template <typename TValue>

-    void SetValue(const TValue& value);

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-	

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTY__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Property.inl b/Tobii EyeX/include/eyex-cpp/Property.inl
deleted file mode 100755
index 9469af4..0000000
--- a/Tobii EyeX/include/eyex-cpp/Property.inl
+++ /dev/null
@@ -1,90 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Property.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTY__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_PROPERTY__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-template <typename TValue>

-bool Property::TryGetValue(TValue* pValue) const

-{

-    if(PropertyValueResolver<TValue>().GetValue(this, pValue) == TX_RESULT_OK)

-        return true;

-

-    return false;

-}

-

-/*********************************************************************************************************************/

-

-template <typename TValue>

-typename PropertyValueResolver<TValue>::ValueType Property::GetValue() const

-{

-    TValue value;

-    if(TryGetValue(&value))

-        return value;

-

-    throw APIException(TX_RESULT_INVALIDPROPERTYTYPE, "Invalid property type");

-}

-

-/*********************************************************************************************************************/

-    

-template <typename TValue>

-void Property::SetValue(const TValue& value)

-{

-    TX_VALIDATE(PropertyValueResolver<TValue>().SetValue(this, value));

-}

-

-/*********************************************************************************************************************/

-

-inline Property::Property(const std::shared_ptr<const Context>& spContext, TX_PROPERTYHANDLE hProperty)

-: HandleWrapper<TX_PROPERTYHANDLE>(spContext, hProperty)

-{}

-

-/*********************************************************************************************************************/

-

-inline TX_PROPERTYVALUETYPE Property::GetValueType() const

-{

-	TX_PROPERTYVALUETYPE valueType;

-	TX_VALIDATE(txGetPropertyValueType(_hObject, &valueType));

-	return valueType;

-}

-

-/*********************************************************************************************************************/

-

-inline std::string Property::GetName() const

-{    

-    return GetString(txGetPropertyName, _hObject);

-}

-

-/*********************************************************************************************************************/

-

-inline TX_PROPERTYFLAGS Property::GetFlags() const

-{

-	TX_PROPERTYFLAGS flags;

-	TX_VALIDATE(txGetPropertyFlags(_hObject, &flags));

-	return flags;

-}

-

-/*********************************************************************************************************************/

-

-inline void Property::Clear()

-{

-	TX_VALIDATE(txClearPropertyValue(_hObject));

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTY__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/PropertyBag.hpp b/Tobii EyeX/include/eyex-cpp/PropertyBag.hpp
deleted file mode 100755
index 045c939..0000000
--- a/Tobii EyeX/include/eyex-cpp/PropertyBag.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * PropertyBag.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYBAG__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYBAG__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-class PropertyBag :

-	public InteractionObject

-{

-public:

-	PropertyBag(const std::shared_ptr<const Context>& spContext, TX_HANDLE hBag);

-

-	TX_PROPERTYBAGTYPE GetType() const;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYBAG__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/PropertyBag.inl b/Tobii EyeX/include/eyex-cpp/PropertyBag.inl
deleted file mode 100755
index 7b508f2..0000000
--- a/Tobii EyeX/include/eyex-cpp/PropertyBag.inl
+++ /dev/null
@@ -1,36 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * PropertyBag.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYBAG__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYBAG__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline PropertyBag::PropertyBag(const std::shared_ptr<const Context>& spContext, TX_HANDLE hBag)

-: InteractionObject(spContext, hBag)

-{}

-

-/*********************************************************************************************************************/

-

-inline TX_PROPERTYBAGTYPE PropertyBag::GetType() const

-{

-	TX_PROPERTYBAGTYPE bagType;

-	TX_VALIDATE(txGetPropertyBagType(_hObject, &bagType));

-	return bagType;

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYBAG__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/PropertyValueResolver.hpp b/Tobii EyeX/include/eyex-cpp/PropertyValueResolver.hpp
deleted file mode 100755
index 87018a7..0000000
--- a/Tobii EyeX/include/eyex-cpp/PropertyValueResolver.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * PropertyValueResolver.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYVALUERESOLVER__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYVALUERESOLVER__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-template <typename TValue>

-struct PropertyValueResolverBase

-{

-	typedef TValue ValueType;

-};

-

-/*********************************************************************************************************************/

-

-template <typename TValue>

-struct PropertyValueResolver;

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYVALUERESOLVER__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/PropertyValueResolver.inl b/Tobii EyeX/include/eyex-cpp/PropertyValueResolver.inl
deleted file mode 100755
index 0bd2a28..0000000
--- a/Tobii EyeX/include/eyex-cpp/PropertyValueResolver.inl
+++ /dev/null
@@ -1,266 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * PropertyValueResolver.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYVALUERESOLVER__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYVALUERESOLVER__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-template <typename TValue>

-struct PropertyValueResolver :

-    public PropertyValueResolverBase<TValue>

-{

-    TX_RESULT GetValue(const Property* pProperty, TValue* pValue) const

-    {

-        return txGetPropertyValueAsInteger(pProperty->GetHandle(), (int*)pValue);

-    }

-

-    TX_RESULT SetValue(Property* pProperty, TValue value) const

-    {

-        return txSetPropertyValueAsInteger(pProperty->GetHandle(), (int)value);

-    }

-};

-

-/*********************************************************************************************************************/

-

-template <>

-struct PropertyValueResolver<bool> :

-    public PropertyValueResolverBase<bool>

-{

-    TX_RESULT GetValue(const Property* pProperty, bool* pValue) const

-    {

-        int intValue;

-        auto result = txGetPropertyValueAsInteger(pProperty->GetHandle(), &intValue);

-        if(result != TX_RESULT_OK)

-            return result;

-

-        *pValue = intValue != 0;

-        return TX_RESULT_OK;

-    }

-

-    TX_RESULT SetValue(Property* pProperty, bool value) const

-    {

-        auto intValue = value ? 1 : 0;

-        return txSetPropertyValueAsInteger(pProperty->GetHandle(), intValue);

-    }

-};

-

-/*********************************************************************************************************************/

-

-template <>

-struct PropertyValueResolver<double> :

-    public PropertyValueResolverBase<double>

-{

-    TX_RESULT GetValue(const Property* pProperty, double* pValue) const

-    {

-        return txGetPropertyValueAsReal(pProperty->GetHandle(), pValue);

-    }

-    

-    TX_RESULT SetValue(Property* pProperty, double value) const

-    {

-        return txSetPropertyValueAsReal(pProperty->GetHandle(), value);

-    }

-};

-

-/*********************************************************************************************************************/

-

-template <>

-struct PropertyValueResolver<float> :

-    public PropertyValueResolverBase<float>

-{

-    TX_RESULT GetValue(const Property* pProperty, float* pValue) const

-    {

-        double doubleValue;

-        auto result = txGetPropertyValueAsReal(pProperty->GetHandle(), &doubleValue);

-        if(result != TX_RESULT_OK)

-            return result;

-

-        *pValue = (float)doubleValue;

-        return TX_RESULT_OK;

-    }

-    

-    TX_RESULT SetValue(Property* pProperty, float value) const

-    {

-        return txSetPropertyValueAsReal(pProperty->GetHandle(), value);

-    }

-};

-

-/*********************************************************************************************************************/

-

-template <>

-struct PropertyValueResolver<std::string> :

-    public PropertyValueResolverBase<std::string>

-{

-    TX_RESULT GetValue(const Property* pProperty, std::string* pValue) const

-    {

-        return Tx::Utils::GetString(pValue, txGetPropertyValueAsString, pProperty->GetHandle());

-    }

-

-    TX_RESULT SetValue(Property* pProperty, const std::string& value) const

-    {

-        return txSetPropertyValueAsString(pProperty->GetHandle(), value.c_str());

-    }

-};

-

-/*********************************************************************************************************************/

-

-template <typename TInteractionObject>

-struct PropertyValueResolver<std::shared_ptr<TInteractionObject>> :

-    public PropertyValueResolverBase<std::shared_ptr<TInteractionObject>>

-{

-    TX_RESULT GetValue(const Property* pProperty, std::shared_ptr<TInteractionObject>* pspValue) const

-    {

-        Tx::Utils::ScopedHandle hObject;

-        auto result = txGetPropertyValueAsObject(pProperty->GetHandle(), &hObject);

-        if(result != TX_RESULT_OK)

-            return result;

-

-        // CreateObject will detach scoped handle.

-        *pspValue = pProperty->GetContext()->CreateObject(hObject);

-        return TX_RESULT_OK;

-    }

-    

-    TX_RESULT SetValue(Property* pProperty, const std::shared_ptr<TInteractionObject>& spValue) const

-    {

-        return txSetPropertyValueAsObject(pProperty->GetHandle(), spValue->GetHandle());

-    }

-};

-

-/*********************************************************************************************************************/

-

-template <typename TValue>

-struct CompositePropertyValueResolver :

-    public PropertyValueResolverBase<TValue>

-{

-    TX_RESULT GetValue(const Property* pProperty, TValue* pValue) const

-    {

-        std::shared_ptr<InteractionObject> spObject;

-        if(!pProperty->TryGetValue(&spObject))

-            return TX_RESULT_NOTFOUND;

-

-        try

-        {

-            return GetContent(spObject, pValue);

-        }

-        catch(...)

-        {

-            return TX_RESULT_NOTFOUND;

-        }

-

-        return TX_RESULT_OK;

-    }

-

-    TX_RESULT SetValue(Property* pProperty, const TX_RECT& value) const

-    {        

-        try

-        {

-            auto spObject = pProperty->GetContext()->CreateBag();

-            auto result = SetContent(spObject, value);

-            if(result != TX_RESULT_OK)

-                return result;

-            

-            pProperty->SetValue(spObject);

-        }

-        catch(...)

-        {

-            return TX_RESULT_NOTFOUND;

-        }

-

-        return TX_RESULT_OK;

-    }

-

-    virtual TX_RESULT GetContent(const std::shared_ptr<const InteractionObject>& spObject, TValue* pValue) const = 0;

-    virtual TX_RESULT SetContent(const std::shared_ptr<InteractionObject>& spObject, const TValue& Value) const = 0;

-};

-

-/*********************************************************************************************************************/

-

-template <>

-struct PropertyValueResolver<TX_RECT> :

-    public CompositePropertyValueResolver<TX_RECT>

-{

-   TX_RESULT GetContent(const std::shared_ptr<const InteractionObject>& spObject, ValueType* pValue) const

-   {

-        if(spObject->TryGetPropertyValue(&pValue->X, TX_LITERAL_X) &&

-           spObject->TryGetPropertyValue(&pValue->Y, TX_LITERAL_Y) &&

-           spObject->TryGetPropertyValue(&pValue->Width, TX_LITERAL_WIDTH) &&

-           spObject->TryGetPropertyValue(&pValue->Height, TX_LITERAL_HEIGHT))

-           return TX_RESULT_OK;

-

-        return TX_RESULT_NOTFOUND;

-   }

-

-   TX_RESULT SetContent(const std::shared_ptr<InteractionObject>& spObject, const ValueType& value) const

-   {

-        spObject->SetPropertyValue(TX_LITERAL_X, value.X);

-        spObject->SetPropertyValue(TX_LITERAL_Y, value.Y);

-        spObject->SetPropertyValue(TX_LITERAL_WIDTH, value.Width);

-        spObject->SetPropertyValue(TX_LITERAL_HEIGHT, value.Height);

-

-        return TX_RESULT_OK;

-   }

-};

-

-/*********************************************************************************************************************/

-

-template <>

-struct PropertyValueResolver<TX_VECTOR2> :

-    public CompositePropertyValueResolver<TX_VECTOR2>

-{

-   TX_RESULT GetContent(const std::shared_ptr<const InteractionObject>& spObject, ValueType* pValue) const

-   {

-        if(spObject->TryGetPropertyValue(&pValue->X, TX_LITERAL_X) &&

-           spObject->TryGetPropertyValue(&pValue->Y, TX_LITERAL_Y))

-           return TX_RESULT_OK;

-

-        return TX_RESULT_NOTFOUND;

-   }

-

-   TX_RESULT SetContent(const std::shared_ptr<InteractionObject>& spObject, const ValueType& value) const

-   {

-        spObject->SetPropertyValue(TX_LITERAL_X, value.X);

-        spObject->SetPropertyValue(TX_LITERAL_Y, value.Y);

-

-        return TX_RESULT_OK;

-   }

-};

-

-/*********************************************************************************************************************/

-

-template <>

-struct PropertyValueResolver<TX_SIZE2> :

-    public CompositePropertyValueResolver<TX_SIZE2>

-{

-   TX_RESULT GetContent(const std::shared_ptr<const InteractionObject>& spObject, ValueType* pValue) const

-   {

-        if(spObject->TryGetPropertyValue(&pValue->Width, TX_LITERAL_WIDTH) &&

-           spObject->TryGetPropertyValue(&pValue->Height, TX_LITERAL_HEIGHT))

-           return TX_RESULT_OK;

-

-        return TX_RESULT_NOTFOUND;

-   }

-

-   TX_RESULT SetContent(const std::shared_ptr<InteractionObject>& spObject, const ValueType& value) const

-   {

-        spObject->SetPropertyValue(TX_LITERAL_WIDTH, value.Width);

-        spObject->SetPropertyValue(TX_LITERAL_HEIGHT, value.Height);

-

-        return TX_RESULT_OK;

-   }

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_PROPERTYVALUERESOLVER__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Query.hpp b/Tobii EyeX/include/eyex-cpp/Query.hpp
deleted file mode 100755
index 6420fd2..0000000
--- a/Tobii EyeX/include/eyex-cpp/Query.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Query.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Query__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Query__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-	

-/*********************************************************************************************************************/

-

-class Query :

-	public InteractionObject

-{

-public:	

-	Query(const std::shared_ptr<const Context>& spContext, TX_HANDLE hQuery);

-	   

-    std::shared_ptr<Bounds> GetBounds() const;

-    std::vector<std::string> GetWindowIds() const;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Query__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Query.inl b/Tobii EyeX/include/eyex-cpp/Query.inl
deleted file mode 100755
index 9b6c2e7..0000000
--- a/Tobii EyeX/include/eyex-cpp/Query.inl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Query.inl

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Query__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Query__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline Query::Query(const std::shared_ptr<const Context>& spContext, TX_HANDLE hQuery)

-: InteractionObject(spContext, hQuery)

-{}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Bounds> Query::GetBounds() const

-{

-	Tx::Utils::ScopedHandle hBounds;

-	TX_VALIDATE(txGetQueryBounds(_hObject, &hBounds));

-	auto spBounds = _spContext->CreateObject<Bounds>(hBounds);

-	return spBounds;

-}

-

-/*********************************************************************************************************************/

-

-inline std::vector<std::string> Query::GetWindowIds() const

-{

-    TX_SIZE windowIdCount;

-    TX_VALIDATE(txGetQueryWindowIdCount(_hObject, &windowIdCount));

-

-    std::vector<std::string> windowIds;

-    for (int i = 0; i < windowIdCount; i++)

-    {

-        std::string windowId;

-        TX_VALIDATE(Tx::Utils::GetString(&windowId, [i, this](TX_CHAR* pBuf, TX_SIZE* pSize) 

-        {

-            return txGetQueryWindowId(_hObject, i, pBuf, pSize);

-        }));

-

-        windowIds.push_back(windowId);

-    }

-    return windowIds;

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Query__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Snapshot.hpp b/Tobii EyeX/include/eyex-cpp/Snapshot.hpp
deleted file mode 100755
index 1b1befb..0000000
--- a/Tobii EyeX/include/eyex-cpp/Snapshot.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * Snapshot.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Snapshot__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Snapshot__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-class Snapshot :

-	public InteractionObject

-{

-public:

-	Snapshot(const std::shared_ptr<const Context>& spContext, TX_HANDLE hSnapshot);

-	static std::shared_ptr<Snapshot> CreateSnapshotForQuery(const std::shared_ptr<Query>& spQuery);  

-	static std::shared_ptr<Snapshot> CreateSnapshotWithQueryBounds(const std::shared_ptr<Query>& spQuery);  

-

-		

-    std::shared_ptr<Bounds> GetBounds() const;

-    std::shared_ptr<Bounds> CreateBounds(TX_BOUNDSTYPE boundsType);

-    void SetBoundsFromQuery();

-    void DeleteBounds();

-	

-	std::vector<std::shared_ptr<Interactor>> GetInteractors() const;

-

-    std::shared_ptr<Interactor> CreateInteractor(

-		const std::string& interactorId,

-		const std::string& parentId,

-		const std::string& windowId);

-

-	void RemoveInteractor(const std::string& interactorId);

-

-	std::vector<std::string> GetWindowIds();

-	void AddWindowId(const std::string& windowId);

-

-    void CommitAsync(AsyncDataHandler fnHandler) const;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Snapshot__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/Snapshot.inl b/Tobii EyeX/include/eyex-cpp/Snapshot.inl
deleted file mode 100755
index 553d00e..0000000
--- a/Tobii EyeX/include/eyex-cpp/Snapshot.inl
+++ /dev/null
@@ -1,159 +0,0 @@
-/*********************************************************************************************************************

-* Copyright 2013-2014 Tobii Technology AB. All rights reserved.

-* Snapshot.inl

-*********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Snapshot__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_Snapshot__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-	inline Snapshot::Snapshot(const std::shared_ptr<const Context>& spContext, TX_HANDLE hSnapshot)

-	: InteractionObject(spContext, hSnapshot)

-{}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Snapshot> Snapshot::CreateSnapshotForQuery(const std::shared_ptr<Query>& spQuery)

-{

-	Tx::Utils::ScopedHandle hSnapshot;

-	TX_VALIDATE(txCreateSnapshotForQuery(spQuery->GetHandle(), &hSnapshot));

-

-	auto spContext = spQuery->GetContext();

-	auto spSnapshot = spContext->CreateObject<Snapshot>(hSnapshot);

-	return spSnapshot;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Snapshot> Snapshot::CreateSnapshotWithQueryBounds(const std::shared_ptr<Query>& spQuery)

-{

-	Tx::Utils::ScopedHandle hSnapshot;

-    TX_VALIDATE(txCreateSnapshotWithQueryBounds(spQuery->GetHandle(), &hSnapshot));

-

-	auto spContext = spQuery->GetContext();

-	auto spSnapshot = spContext->CreateObject<Snapshot>(hSnapshot);

-	return spSnapshot;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Bounds> Snapshot::GetBounds() const

-{

-	Tx::Utils::ScopedHandle hBounds;

-	if (!TX_VALIDATE(txGetSnapshotBounds(_hObject, &hBounds), TX_RESULT_NOTFOUND))

-		return nullptr;

-

-	auto spBounds = _spContext->CreateObject<Bounds>(hBounds);

-	return spBounds;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Bounds> Snapshot::CreateBounds(TX_BOUNDSTYPE boundsType)

-{

-	Tx::Utils::ScopedHandle hBounds;

-	TX_VALIDATE(txCreateSnapshotBounds(_hObject, &hBounds, boundsType));    

-	auto spBounds = _spContext->CreateObject<Bounds>(hBounds);

-	return spBounds;

-}

-

-/*********************************************************************************************************************/

-

-inline void Snapshot::DeleteBounds()

-{

-	TX_VALIDATE(txDeleteSnapshotBounds(_hObject));

-}

-

-/*********************************************************************************************************************/

-

-inline std::vector<std::shared_ptr<Interactor>> Snapshot::GetInteractors() const

-{

-	std::vector<Tx::Utils::ScopedHandle> interactorHandles;

-	TX_VALIDATE(Tx::Utils::GetBufferData(interactorHandles, txGetInteractors, _hObject));

-

-	std::vector<std::shared_ptr<Interactor>> interactors;

-	for(auto& hInteractor : interactorHandles)

-	{

-		auto spInteractor = _spContext->CreateObject<Interactor>(hInteractor);

-		interactors.push_back(spInteractor);

-	}

-

-	return interactors;

-}

-

-/*********************************************************************************************************************/

-

-inline std::shared_ptr<Interactor> Snapshot::CreateInteractor(

-	const std::string& interactorId,

-	const std::string& parentId,

-	const std::string& windowId)

-{

-	Tx::Utils::ScopedHandle hInteractor;

-	TX_VALIDATE(txCreateInteractor(_hObject, &hInteractor, interactorId.c_str(), parentId.c_str(), windowId.c_str()));

-	auto spInteractor = _spContext->CreateObject<Interactor>(hInteractor);

-	return spInteractor;

-}

-

-/*********************************************************************************************************************/

-

-inline void Snapshot::RemoveInteractor(const std::string& interactorId)

-{

-	TX_VALIDATE(txRemoveInteractor(_hObject, interactorId.c_str()));

-}

-

-/*********************************************************************************************************************/

-

-inline std::vector<std::string> Snapshot::GetWindowIds()

-{

-	int windowIdCount = 0;

-	TX_VALIDATE(txGetSnapshotWindowIdCount(_hObject, &windowIdCount));

-

-	std::vector<std::string> windowIds;

-	for (int i = 0; i < windowIdCount; i++)

-	{

-		std::string windowId;

-		TX_VALIDATE(Tx::Utils::GetString(&windowId, [i, this](TX_CHAR* pBuf, TX_SIZE* pSize) 

-		{

-			return txGetSnapshotWindowId(_hObject, i, pBuf, pSize);

-		}));

-

-		windowIds.push_back(windowId);

-	}

-

-	return windowIds;

-}

-

-/*********************************************************************************************************************/

-

-inline void Snapshot::AddWindowId(const std::string& windowId)

-{

-	TX_VALIDATE(txAddSnapshotWindowId(_hObject, windowId.c_str()));

-}

-

-/*********************************************************************************************************************/

-

-inline void Snapshot::CommitAsync(AsyncDataHandler fnHandler) const

-{    

-	auto spThis = shared_from_this();

-	auto fnProxy = [&, spThis, fnHandler](TX_CONSTHANDLE hAsyncData) 

-	{			

-		GetContext()->InvokeAsyncDataHandler(hAsyncData, fnHandler);

-	};

-

-	TX_VALIDATE(Tx::CommitSnapshotAsync(_hObject, fnProxy));

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_Snapshot__INL__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/StateBag.hpp b/Tobii EyeX/include/eyex-cpp/StateBag.hpp
deleted file mode 100755
index 3b663ba..0000000
--- a/Tobii EyeX/include/eyex-cpp/StateBag.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*********************************************************************************************************************

- * Copyright 2013-2014 Tobii Technology AB. All rights reserved.

- * StateBag.hpp

- *********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_STATEBAG__HPP__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_STATEBAG__HPP__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-	

-/*********************************************************************************************************************/

-

-class StateBag :

-	public InteractionObject

-{

-public:

-	StateBag(const std::shared_ptr<const Context>& spContext, TX_HANDLE hBag);

-		

-    std::string GetStatePath() const;

-    

-    template <typename TValue>

-    bool TryGetStateValue(TValue* pValue, const std::string& valuePath) const;

-

-    template <typename TValue>

-    void SetStateValue(const std::string& valuePath, const TValue& value);

-        

-	void SetAsync(AsyncDataHandler fnCompletion = nullptr);

-

-private:

-    bool TryGetPropertyForStateValue(std::shared_ptr<Property>* pspProperty, const std::string& valuePath, bool createIfNotExists) const;

-};

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_STATEBAG__HPP__)

-

-/*********************************************************************************************************************/

diff --git a/Tobii EyeX/include/eyex-cpp/StateBag.inl b/Tobii EyeX/include/eyex-cpp/StateBag.inl
deleted file mode 100755
index 83e054a..0000000
--- a/Tobii EyeX/include/eyex-cpp/StateBag.inl
+++ /dev/null
@@ -1,82 +0,0 @@
-/*********************************************************************************************************************

-* Copyright 2013-2014 Tobii Technology AB. All rights reserved.

-* StateBag.inl

-*********************************************************************************************************************/

-

-#if !defined(__TOBII_TX_CLIENT_CPPBINDINGS_STATEBAG__INL__)

-#define __TOBII_TX_CLIENT_CPPBINDINGS_STATEBAG__INL__

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_BEGIN

-

-/*********************************************************************************************************************/

-

-inline StateBag::StateBag(const std::shared_ptr<const Context>& spContext, TX_HANDLE hBag)

-    : InteractionObject(spContext, hBag)

-{}

-

-/*********************************************************************************************************************/

-

-inline std::string StateBag::GetStatePath() const

-{

-    return GetString(txGetStateBagPath, _hObject);

-}

-

-/*********************************************************************************************************************/

-

-template <typename TValue>

-inline bool StateBag::TryGetStateValue(TValue* pValue, const std::string& valuePath) const

-{    

-    std::shared_ptr<Property> spProperty;

-    if(!TryGetPropertyForStateValue(&spProperty, valuePath, false))

-        return false;

-

-    return spProperty->TryGetValue(pValue);

-}

-

-/*********************************************************************************************************************/

-

-template <typename TValue>

-inline void StateBag::SetStateValue(const std::string& valuePath, const TValue& value)

-{

-    std::shared_ptr<Property> spProperty;

-    TryGetPropertyForStateValue(&spProperty, valuePath, true);

-    spProperty->SetValue(value);

-}

-

-/*********************************************************************************************************************/

-

-inline void StateBag::SetAsync(AsyncDataHandler fnCompletion)	

-{

-    auto spThis = shared_from_this();

-

-    auto callback = [&, spThis, fnCompletion](TX_CONSTHANDLE hAsyncData)

-    {                

-		GetContext()->InvokeAsyncDataHandler(hAsyncData, fnCompletion);

-    };

-    

-    TX_VALIDATE(Tx::SetStateAsync(GetHandle(), callback));    

-}

-

-/*********************************************************************************************************************/

-

-inline bool StateBag::TryGetPropertyForStateValue(std::shared_ptr<Property>* pspProperty, const std::string& valuePath, bool createIfNotExists) const

-{

-    TX_PROPERTYHANDLE hProperty;

-    if (!TX_VALIDATE(txGetPropertyForStateValue(_hObject, &hProperty, valuePath.c_str(), createIfNotExists ? TX_TRUE : TX_FALSE), TX_RESULT_NOTFOUND))

-        return false;

-

-    *pspProperty = _spContext->CreateProperty(hProperty);

-    return true;

-}

-

-/*********************************************************************************************************************/

-

-TX_NAMESPACE_END

-

-/*********************************************************************************************************************/

-

-#endif // !defined(__TOBII_TX_CLIENT_CPPBINDINGS_STATEBAG__INL__)

-

-/*********************************************************************************************************************/