summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-04-02 18:41:01 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-04-02 18:41:01 +0200
commit8303597a865400a363ae574ccde819302495f498 (patch)
treec83b383b3ec818f610cc6137f2b72ee7b4173b09 /ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
parent8adf6b1650af6027f28db12ca2b4de92a3fac11d (diff)
Just put everything new in. Conflict resolution will be later
Diffstat (limited to 'ftnoir_protocol_mouse/ftnoir_protocol_mouse.h')
-rw-r--r--ftnoir_protocol_mouse/ftnoir_protocol_mouse.h16
1 files changed, 8 insertions, 8 deletions
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 <Windows.h>
-#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 <QMessageBox>
#include <QSettings>
#include <QLibrary>
#include <QProcess>
#include <QDebug>
#include <QFile>
-
-#include "winable.h"
+#include <windows.h>
+#include <winuser.h>
+#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"); };
};