fsuipc: decruft, use settings framework

5 files changed, 177 insertions, 415 deletions

diff --git a/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui b/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui
index 9ccfa119..1ce77862 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui
+++ b/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui
@@ -9,8 +9,8 @@
    <rect>

     <x>0</x>

     <y>0</y>

-    <width>541</width>

-    <height>139</height>

+    <width>512</width>

+    <height>100</height>

    </rect>

   </property>

   <property name="windowTitle">

@@ -26,198 +26,101 @@
   <property name="autoFillBackground">

    <bool>false</bool>

   </property>

-  <layout class="QVBoxLayout" name="_vertical_layout">

-   <item>

-    <layout class="QHBoxLayout">

-     <item>

-      <widget class="QLabel" name="textLabel2">

-       <property name="sizePolicy">

-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

-         <horstretch>0</horstretch>

-         <verstretch>0</verstretch>

-        </sizepolicy>

-       </property>

-       <property name="text">

-        <string>Location of FSUIPC.dll:</string>

-       </property>

-       <property name="alignment">

-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-       </property>

-       <property name="wordWrap">

-        <bool>false</bool>

-       </property>

-      </widget>

-     </item>

-     <item>

-      <spacer name="horizontalSpacer_3">

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-       <property name="sizeHint" stdset="0">

-        <size>

-         <width>40</width>

-         <height>20</height>

-        </size>

-       </property>

-      </spacer>

-     </item>

-    </layout>

+  <layout class="QGridLayout" name="gridLayout">

+   <item row="2" column="1">

+    <widget class="QPushButton" name="btnCancel">

+     <property name="sizePolicy">

+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

+     </property>

+     <property name="minimumSize">

+      <size>

+       <width>100</width>

+       <height>0</height>

+      </size>

+     </property>

+     <property name="maximumSize">

+      <size>

+       <width>100</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>Cancel</string>

+     </property>

+    </widget>

    </item>

-   <item>

-    <layout class="QHBoxLayout" name="horizontalLayout_3">

-     <item>

-      <widget class="QLabel" name="txtLocationOfDLL">

-       <property name="minimumSize">

-        <size>

-         <width>230</width>

-         <height>0</height>

-        </size>

-       </property>

-       <property name="toolTip">

-        <string>Location of FSUIPC.dll</string>

-       </property>

-       <property name="frameShape">

-        <enum>QFrame::Box</enum>

-       </property>

-       <property name="frameShadow">

-        <enum>QFrame::Sunken</enum>

-       </property>

-       <property name="lineWidth">

-        <number>1</number>

-       </property>

-       <property name="text">

-        <string>Location of FSUIPC.dll</string>

-       </property>

-      </widget>

-     </item>

-     <item>

-      <widget class="QPushButton" name="btnFindDLL">

-       <property name="maximumSize">

-        <size>

-         <width>35</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="text">

-        <string>...</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

+   <item row="0" column="0">

+    <widget class="QLabel" name="txtLocationOfDLL">

+     <property name="minimumSize">

+      <size>

+       <width>230</width>

+       <height>0</height>

+      </size>

+     </property>

+     <property name="toolTip">

+      <string>Location of FSUIPC.dll</string>

+     </property>

+     <property name="frameShape">

+      <enum>QFrame::Box</enum>

+     </property>

+     <property name="frameShadow">

+      <enum>QFrame::Sunken</enum>

+     </property>

+     <property name="lineWidth">

+      <number>1</number>

+     </property>

+     <property name="text">

+      <string>Location of FSUIPC.dll</string>

+     </property>

+    </widget>

+   </item>

+   <item row="1" column="0" colspan="2">

+    <widget class="QLabel" name="label">

+     <property name="text">

+      <string>The DLL should be located in the Modules/ directory of MS FS 2004</string>

+     </property>

+    </widget>

    </item>

-   <item>

-    <spacer name="verticalSpacer">

-     <property name="orientation">

-      <enum>Qt::Vertical</enum>

+   <item row="2" column="0">

+    <widget class="QPushButton" name="btnOK">

+     <property name="sizePolicy">

+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

      </property>

-     <property name="sizeHint" stdset="0">

+     <property name="minimumSize">

       <size>

-       <width>20</width>

-       <height>40</height>

+       <width>100</width>

+       <height>0</height>

       </size>

      </property>

-    </spacer>

-   </item>

-   <item>

-    <layout class="QVBoxLayout" name="verticalLayout">

-     <item>

-      <widget class="QLabel" name="label">

-       <property name="text">

-        <string>The DLL should be placed in the Modules folder of MS Flight Simulator</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

+     <property name="maximumSize">

+      <size>

+       <width>100</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>OK</string>

+     </property>

+    </widget>

    </item>

-   <item>

-    <layout class="QHBoxLayout" name="horizontalLayout">

-     <item>

-      <spacer name="horizontalSpacer_2">

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-       <property name="sizeHint" stdset="0">

-        <size>

-         <width>40</width>

-         <height>20</height>

-        </size>

-       </property>

-      </spacer>

-     </item>

-     <item>

-      <layout class="QHBoxLayout" name="horizontalLayout_2">

-       <property name="sizeConstraint">

-        <enum>QLayout::SetDefaultConstraint</enum>

-       </property>

-       <item>

-        <widget class="QPushButton" name="btnOK">

-         <property name="sizePolicy">

-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

-           <horstretch>0</horstretch>

-           <verstretch>0</verstretch>

-          </sizepolicy>

-         </property>

-         <property name="minimumSize">

-          <size>

-           <width>100</width>

-           <height>0</height>

-          </size>

-         </property>

-         <property name="maximumSize">

-          <size>

-           <width>100</width>

-           <height>16777215</height>

-          </size>

-         </property>

-         <property name="text">

-          <string>OK</string>

-         </property>

-        </widget>

-       </item>

-       <item>

-        <widget class="QPushButton" name="btnCancel">

-         <property name="sizePolicy">

-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

-           <horstretch>0</horstretch>

-           <verstretch>0</verstretch>

-          </sizepolicy>

-         </property>

-         <property name="minimumSize">

-          <size>

-           <width>100</width>

-           <height>0</height>

-          </size>

-         </property>

-         <property name="maximumSize">

-          <size>

-           <width>100</width>

-           <height>16777215</height>

-          </size>

-         </property>

-         <property name="text">

-          <string>Cancel</string>

-         </property>

-        </widget>

-       </item>

-      </layout>

-     </item>

-     <item>

-      <spacer name="horizontalSpacer">

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-       <property name="sizeType">

-        <enum>QSizePolicy::Fixed</enum>

-       </property>

-       <property name="sizeHint" stdset="0">

-        <size>

-         <width>10</width>

-         <height>20</height>

-        </size>

-       </property>

-      </spacer>

-     </item>

-    </layout>

+   <item row="0" column="1">

+    <widget class="QPushButton" name="btnFindDLL">

+     <property name="maximumSize">

+      <size>

+       <width>35</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>...</string>

+     </property>

+    </widget>

    </item>

   </layout>

  </widget>

diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
index 986ccc65..7ca990af 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
@@ -30,32 +30,22 @@
 /** constructor **/
 FTNoIR_Protocol::FTNoIR_Protocol()
 {
-	loadSettings();
-	ProgramName = "Microsoft FS2004";
-
-	prevPosX = 0.0f;
-	prevPosY = 0.0f;
-	prevPosZ = 0.0f;
-	prevRotX = 0.0f;
-	prevRotY = 0.0f;
-	prevRotZ = 0.0f;
+    prevPosX = 0.0;
+    prevPosY = 0.0;
+    prevPosZ = 0.0;
+    prevRotX = 0.0;
+    prevRotY = 0.0;
+    prevRotZ = 0.0;
 }
 
-/** destructor **/
 FTNoIR_Protocol::~FTNoIR_Protocol()
 {
-	//
-	// Free the DLL
-	//
-	FSUIPCLib.unload();
+    FSUIPCLib.unload();
 }
 
-//
-// Scale the measured value to the Joystick values
-//
 int FTNoIR_Protocol::scale2AnalogLimits( float x, float min_x, float max_x ) {
-double y;
-double local_x;
+    double y;
+    double local_x;
 	
 	local_x = x;
 	if (local_x > max_x) {
@@ -69,40 +59,20 @@ double local_x;
 	return (int) y;
 }
 
-//
-// Load the current Settings from the currently 'active' INI-file.
-//
-void FTNoIR_Protocol::loadSettings() {
-	QSettings settings("opentrack");	// Registry settings (in HK_USER)
-
-	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString();
-	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
-
-	iniFile.beginGroup ( "FSUIPC" );
-	LocationOfDLL = iniFile.value ( "LocationOfDLL", FSUIPC_FILENAME ).toString();
-	qDebug() << "FSUIPCServer::loadSettings() says: Location of DLL = " << LocationOfDLL;
-	iniFile.endGroup ();
-}
-
-//
-// Update Headpose in Game.
-//
 void FTNoIR_Protocol::sendHeadposeToGame(const double *headpose ) {
-DWORD result;
-TFSState pitch;
-TFSState yaw;
-TFSState roll;
-WORD FSZoom;
+    DWORD result;
+    TFSState pitch;
+    TFSState yaw;
+    TFSState roll;
+    WORD FSZoom;
 
-float virtPosX;
-float virtPosY;
-float virtPosZ;
+    float virtPosX;
+    float virtPosY;
+    float virtPosZ;
 
-float virtRotX;
-float virtRotY;
-float virtRotZ;
-
-//	qDebug() << "FSUIPCServer::run() says: started!";
+    float virtRotX;
+    float virtRotY;
+    float virtRotZ;
 
     virtRotX = -headpose[Pitch];				// degrees
     virtRotY = headpose[Yaw];
@@ -112,17 +82,11 @@ float virtRotZ;
 	virtPosY = 0.0f;
     virtPosZ = headpose[TZ];
 
-	//
-	// Init. the FSUIPC offsets (derived from Free-track...)
-	//
 	pitch.Control = 66503;
 	yaw.Control = 66504;
 	roll.Control = 66505;
 
-	//
-	// Only do this when the data has changed. This way, the HAT-switch can be used when tracking is OFF.
-	//
-	if ((prevPosX != virtPosX) || (prevPosY != virtPosY) || (prevPosZ != virtPosZ) ||
+    if ((prevPosX != virtPosX) || (prevPosY != virtPosY) || (prevPosZ != virtPosZ) ||
 		(prevRotX != virtRotX) || (prevRotY != virtRotY) || (prevRotZ != virtRotZ)) {
 		//
 		// Open the connection
@@ -178,7 +142,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
 	//
 	// Load the DLL.
 	//
-    FSUIPCLib.setFileName( LocationOfDLL );
+    FSUIPCLib.setFileName( s.LocationOfDLL );
     if (FSUIPCLib.load() != true) {
         qDebug() << "checkServerInstallationOK says: Error loading FSUIPC DLL";
         return false;
@@ -190,14 +154,6 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
 	return true;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// Factory function that creates instances if the Protocol object.
-
-// Export both decorated and undecorated names.
-//   GetProtocol     - Undecorated name, which can be easily used with GetProcAddress
-//                Win32 API function.
-//   _GetProtocol@0  - Common name decoration for __stdcall functions in C language.
-//#pragma comment(linker, "/export:GetProtocol=_GetProtocol@0")
 
 extern "C" FTNOIR_PROTOCOL_BASE_EXPORT FTNoIR_Protocol* CALLING_CONVENTION GetConstructor(void)
 {
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
index 9f5e3b6f..a099df36 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
@@ -41,12 +41,20 @@
 #include <QDebug>
 #include <QFile>
 #include <QFileDialog>
+#include "facetracknoir/options.h"
+using namespace options;
 
 #define FSUIPC_FILENAME "C:\\Program Files\\Microsoft Games\\Flight Simulator 9\\Modules\\FSUIPC.dll"
 
-//
-// Define the structures necessary for the FSUIPC_Write calls
-//
+struct settings {
+    pbundle b;
+    value<QString> LocationOfDLL;
+    settings() :
+        b(bundle("proto-fsuipc")),
+        LocationOfDLL(b, "dll-location", FSUIPC_FILENAME)
+    {}
+};
+
 #pragma pack(push,1)		// All fields in structure must be byte aligned.
 typedef struct
 {
@@ -59,50 +67,32 @@ class FTNoIR_Protocol : public IProtocol
 {
 public:
 	FTNoIR_Protocol();
-    virtual ~FTNoIR_Protocol();
+    virtual ~FTNoIR_Protocol() virt_override;
     bool checkServerInstallationOK();
     void sendHeadposeToGame(const double* headpose);
     QString getGameName() {
         return "Microsoft Flight Simulator X";
     }
 private:
-	// Private properties
-	QString ProgramName;
 	QLibrary FSUIPCLib;
-	QString LocationOfDLL;
-	float prevPosX, prevPosY, prevPosZ, prevRotX, prevRotY, prevRotZ;
-
+    double prevPosX, prevPosY, prevPosZ, prevRotX, prevRotY, prevRotZ;
+    settings s;
 	static int scale2AnalogLimits( float x, float min_x, float max_x );
-	void loadSettings();
 };
 
-// Widget that has controls for FTNoIR protocol client-settings.
 class FSUIPCControls: public QWidget, public IProtocolDialog
 {
     Q_OBJECT
 public:
-
-	explicit FSUIPCControls();
-	void registerProtocol(IProtocol *protocol) {
-		theProtocol = (FTNoIR_Protocol *) protocol;			// Accept the pointer to the Protocol
-	}
-	void unRegisterProtocol() {
-		theProtocol = NULL;									// Reset the pointer
-	}
-
+    FSUIPCControls();
+    void registerProtocol(IProtocol *protocol) {}
+    void unRegisterProtocol() {}
 private:
 	Ui::UICFSUIPCControls ui;
-	void loadSettings();
-	void save();
-
-	/** helper **/
-	bool settingsDirty;
-	FTNoIR_Protocol *theProtocol;
-
+    settings s;
 private slots:
 	void doOK();
 	void doCancel();
-	void settingChanged() { settingsDirty = true; };
 	void getLocationOfDLL();
 };
 
@@ -112,14 +102,10 @@ private slots:
 class FTNoIR_ProtocolDll : public Metadata
 {
 public:
-	FTNoIR_ProtocolDll();
-	~FTNoIR_ProtocolDll();
-
-	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("FS2002/FS2004"); };
-	void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("FSUIPC"); };
-	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Microsoft FS2004 protocol"); };
-
-    void getIcon(QIcon *icon) { *icon = QIcon(":/images/fs9.png"); };
+    void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("FS2002/FS2004"); }
+    void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("FSUIPC"); }
+    void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Microsoft FS2004 protocol"); }
+    void getIcon(QIcon *icon) { *icon = QIcon(":/images/fs9.png"); }
 };
 
 
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
index b2f28ba1..9ef4ad67 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
@@ -25,131 +25,66 @@
 #include "ftnoir_protocol_fsuipc.h"
 #include "facetracknoir/global-settings.h"
 
-//*******************************************************************************************************
-// FaceTrackNoIR Client Settings-dialog.
-//*******************************************************************************************************
-
-//
-// Constructor for server-settings-dialog
-//
 FSUIPCControls::FSUIPCControls() :
-QWidget()
+    QWidget()
 {
-	ui.setupUi( this );
-
-	// Connect Qt signals to member-functions
-	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
-	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
-	connect(ui.btnFindDLL, SIGNAL(clicked()), this, SLOT(getLocationOfDLL()));
+    ui.setupUi( this );
 
-	theProtocol = NULL;
+    // Connect Qt signals to member-functions
+    connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
+    connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
+    connect(ui.btnFindDLL, SIGNAL(clicked()), this, SLOT(getLocationOfDLL()));
 
-	// Load the settings from the current .INI-file
-	loadSettings();
+    tie_setting(s.LocationOfDLL, ui.txtLocationOfDLL);
 }
 
 void FSUIPCControls::doOK() {
-	save();
-	this->close();
+    s.b->save();
+    this->close();
 }
 
 
 void FSUIPCControls::doCancel() {
-	//
-	// Ask if changed Settings should be saved
-	//
-	if (settingsDirty) {
-		int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard );
-
-		qDebug() << "doCancel says: answer =" << ret;
-
-		switch (ret) {
-			case QMessageBox::Save:
-				save();
-				this->close();
-				break;
-			case QMessageBox::Discard:
-				this->close();
-				break;
-			case QMessageBox::Cancel:
-				// Cancel was clicked
-				break;
-			default:
-				// should never be reached
-			break;
-		}
-	}
-	else {
-		this->close();
-	}
-}
-
-//
-// Load the current Settings from the currently 'active' INI-file.
-//
-void FSUIPCControls::loadSettings() {
-
-	qDebug() << "loadSettings says: Starting ";
-	QSettings settings("opentrack");	// Registry settings (in HK_USER)
-
-	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString();
-	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
-
-	qDebug() << "loadSettings says: iniFile = " << currentFile;
-
-	iniFile.beginGroup ( "FSUIPC" );
-	ui.txtLocationOfDLL->setText(iniFile.value ( "LocationOfDLL", FSUIPC_FILENAME ).toString() );
-	iniFile.endGroup ();
-
-	settingsDirty = false;
+    //
+    // Ask if changed Settings should be saved
+    //
+    if (s.b->modifiedp()) {
+        int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard );
+
+        qDebug() << "doCancel says: answer =" << ret;
+
+        switch (ret) {
+        case QMessageBox::Save:
+            s.b->save();
+            this->close();
+            break;
+        case QMessageBox::Discard:
+            s.b->revert();
+            this->close();
+            break;
+        case QMessageBox::Cancel:
+        default:
+            break;
+        }
+    }
+    else {
+        this->close();
+    }
 }
 
-//
-// Save the current Settings to the currently 'active' INI-file.
-//
-void FSUIPCControls::save() {
-
-	qDebug() << "save() says: started";
-
-	QSettings settings("opentrack");	// Registry settings (in HK_USER)
-
-	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString();
-	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
-
-	iniFile.beginGroup ( "FSUIPC" );
-	iniFile.setValue ( "LocationOfDLL", ui.txtLocationOfDLL->text() );
-	iniFile.endGroup ();
-
-	settingsDirty = false;
-}
-
-//
-// Show the Dialog to set the DLL's location
-//
 void FSUIPCControls::getLocationOfDLL()
 {
-	//
-	// Get the new filename of the INI-file.
-	//
-	QString fileName = QFileDialog::getOpenFileName(this, tr("Locate file"),
-													ui.txtLocationOfDLL->text(),
-													tr("FSUIPC DLL file (FSUIPC*.dll);;All Files (*)"));
-	if (!fileName.isEmpty()) {
-		ui.txtLocationOfDLL->setText( fileName );
-		settingsDirty = true;
-	}
+    //
+    // Get the new filename of the INI-file.
+    //
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Locate file"),
+                                                    ui.txtLocationOfDLL->text(),
+                                                    tr("FSUIPC DLL file (FSUIPC*.dll);;All Files (*)"));
+    if (!fileName.isEmpty()) {
+        s.LocationOfDLL = fileName;
+    }
 }
 
-
-////////////////////////////////////////////////////////////////////////////////
-// Factory function that creates instances if the Protocol-settings dialog object.
-
-// Export both decorated and undecorated names.
-//   GetProtocolDialog     - Undecorated name, which can be easily used with GetProcAddress
-//                          Win32 API function.
-//   _GetProtocolDialog@0  - Common name decoration for __stdcall functions in C language.
-//#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")
-
 extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog(void)
 {
     return new FSUIPCControls;
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp
index b0ca2eee..57b174c5 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp
@@ -23,26 +23,8 @@
 *																				*
 ********************************************************************************/
 #include "ftnoir_protocol_fsuipc.h"
-#include <QDebug>
 #include "facetracknoir/global-settings.h"
 
-FTNoIR_ProtocolDll::FTNoIR_ProtocolDll() {
-}
-
-FTNoIR_ProtocolDll::~FTNoIR_ProtocolDll()
-{
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Factory function that creates instances if the Protocol object.
-
-// Export both decorated and undecorated names.
-//   GetProtocolDll     - Undecorated name, which can be easily used with GetProcAddress
-//						Win32 API function.
-//   _GetProtocolDll@0  - Common name decoration for __stdcall functions in C language.
-//#pragma comment(linker, "/export:GetProtocolDll=_GetProtocolDll@0")
-
 extern "C" FTNOIR_PROTOCOL_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata(void)
 {
 	return new FTNoIR_ProtocolDll;