modules: make names unique

2 files changed, 9 insertions, 9 deletions

diff --git a/proto-wine/ftnoir_protocol_wine.cpp b/proto-wine/ftnoir_protocol_wine.cpp
index bc49ac8c..ea7fadf2 100644
--- a/proto-wine/ftnoir_protocol_wine.cpp
+++ b/proto-wine/ftnoir_protocol_wine.cpp
@@ -9,7 +9,7 @@
 #include <fcntl.h>           /* For O_* constants */
 #include "csv/csv.h"
 
-FTNoIR_Protocol::FTNoIR_Protocol() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)), shm(NULL), gameid(0)
+wine::wine() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)), shm(NULL), gameid(0)
 {
     if (lck_shm.success()) {
         shm = (WineSHM*) lck_shm.ptr();
@@ -20,7 +20,7 @@ FTNoIR_Protocol::FTNoIR_Protocol() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeo
     wrapper.start("wine", QStringList() << (library_path + "opentrack-wrapper-wine.exe.so"));
 }
 
-FTNoIR_Protocol::~FTNoIR_Protocol()
+wine::~wine()
 {
     if (shm) {
         shm->stop = true;
@@ -31,7 +31,7 @@ FTNoIR_Protocol::~FTNoIR_Protocol()
     //shm_unlink("/" WINE_SHM_NAME);
 }
 
-void FTNoIR_Protocol::pose( const double *headpose )
+void wine::pose( const double *headpose )
 {
     if (shm)
     {
@@ -54,9 +54,9 @@ void FTNoIR_Protocol::pose( const double *headpose )
     }
 }
 
-bool FTNoIR_Protocol::correct()
+bool wine::correct()
 {
     return lck_shm.success();
 }
 
-OPENTRACK_DECLARE_PROTOCOL(FTNoIR_Protocol, FTControls, FTNoIR_ProtocolDll)
+OPENTRACK_DECLARE_PROTOCOL(wine, FTControls, wineDll)
diff --git a/proto-wine/ftnoir_protocol_wine.h b/proto-wine/ftnoir_protocol_wine.h
index 8b41824c..a0a3fa4c 100644
--- a/proto-wine/ftnoir_protocol_wine.h
+++ b/proto-wine/ftnoir_protocol_wine.h
@@ -12,11 +12,11 @@
 #include "compat/shm.h"
 #include "wine-shm.h"
 
-class FTNoIR_Protocol : public IProtocol
+class wine : public IProtocol
 {
 public:
-    FTNoIR_Protocol();
-    ~FTNoIR_Protocol() override;
+    wine();
+    ~wine() override;
 
     bool correct() override;
     void pose(const double* headpose) override;
@@ -49,7 +49,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_ProtocolDll : public Metadata
+class wineDll : public Metadata
 {
 public:
     QString name() override { return QString("Wine -- Windows layer for Unix"); }