From 8303597a865400a363ae574ccde819302495f498 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 2 Apr 2013 18:41:01 +0200 Subject: Just put everything new in. Conflict resolution will be later --- ftnoir_protocol_mouse/ftnoir_protocol_mouse.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ftnoir_protocol_mouse/ftnoir_protocol_mouse.h') diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h index b7765b96..e4bc6256 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h @@ -30,17 +30,17 @@ #ifndef INCLUDED_MOUSESERVER_H #define INCLUDED_MOUSESERVER_H -//#include -#include "..\ftnoir_protocol_base\ftnoir_protocol_base.h" -#include "ui_FTNoIR_MOUSEcontrols.h" +#include "ftnoir_protocol_base/ftnoir_protocol_base.h" +#include "ui_ftnoir_mousecontrols.h" #include #include #include #include #include #include - -#include "winable.h" +#include +#include +#include "facetracknoir/global-settings.h" #define MOUSE_AXIS_MIN 0 #define MOUSE_AXIS_MAX 65535 @@ -69,7 +69,7 @@ public: void Release(); void Initialize(); - bool checkServerInstallationOK( HANDLE handle ); + bool checkServerInstallationOK(); void sendHeadposeToGame( THeadPoseData *headpose, THeadPoseData *rawheadpose ); void getNameFromGame( char *dest ); // Take care dest can handle up to 100 chars... @@ -133,7 +133,7 @@ private slots: //******************************************************************************************************* // FaceTrackNoIR Protocol DLL. Functions used to get general info on the Protocol //******************************************************************************************************* -class FTNoIR_ProtocolDll : public IProtocolDll +class FTNoIR_ProtocolDll : public Metadata { public: FTNoIR_ProtocolDll(); @@ -143,7 +143,7 @@ public: void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }; void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look protocol"); }; - void getIcon(QIcon *icon) { *icon = QIcon(":/images/Mouse.ico"); }; + void getIcon(QIcon *icon) { *icon = QIcon(":/images/mouse.png"); }; }; -- cgit v1.2.3