fgfs: use settings framework

5 files changed, 151 insertions, 448 deletions

diff --git a/ftnoir_protocol_fg/ftnoir_fgcontrols.ui b/ftnoir_protocol_fg/ftnoir_fgcontrols.ui
index fd0df6b0..f3b54486 100644
--- a/ftnoir_protocol_fg/ftnoir_fgcontrols.ui
+++ b/ftnoir_protocol_fg/ftnoir_fgcontrols.ui
@@ -9,8 +9,8 @@
    <rect>

     <x>0</x>

     <y>0</y>

-    <width>518</width>

-    <height>208</height>

+    <width>404</width>

+    <height>112</height>

    </rect>

   </property>

   <property name="windowTitle">

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

    <bool>false</bool>

   </property>

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

-   <item>

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

-     <item row="2" column="4">

-      <widget class="QSpinBox" name="spinIPFourthNibble">

-       <property name="maximumSize">

-        <size>

-         <width>60</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="maximum">

-        <number>255</number>

-       </property>

-       <property name="singleStep">

-        <number>1</number>

-       </property>

-      </widget>

-     </item>

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

-      <widget class="QSpinBox" name="spinIPFirstNibble">

-       <property name="maximumSize">

-        <size>

-         <width>60</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="maximum">

-        <number>255</number>

-       </property>

-       <property name="singleStep">

-        <number>1</number>

-       </property>

-      </widget>

-     </item>

-     <item row="2" column="2">

-      <widget class="QSpinBox" name="spinIPSecondNibble">

-       <property name="maximumSize">

-        <size>

-         <width>60</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="maximum">

-        <number>255</number>

-       </property>

-       <property name="singleStep">

-        <number>1</number>

-       </property>

-      </widget>

-     </item>

-     <item row="2" column="3">

-      <widget class="QSpinBox" name="spinIPThirdNibble">

-       <property name="maximumSize">

-        <size>

-         <width>60</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="maximum">

-        <number>255</number>

-       </property>

-       <property name="singleStep">

-        <number>1</number>

-       </property>

-      </widget>

-     </item>

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

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

-       <property name="text">

-        <string>IP-address remote PC</string>

-       </property>

-      </widget>

-     </item>

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

-      <widget class="QCheckBox" name="chkLocalPC">

-       <property name="layoutDirection">

-        <enum>Qt::RightToLeft</enum>

-       </property>

-       <property name="text">

-        <string>Local PC only</string>

-       </property>

-      </widget>

-     </item>

-     <item row="3" column="0">

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

-       <property name="text">

-        <string>Port-number</string>

-       </property>

-      </widget>

-     </item>

-     <item row="3" column="1">

-      <widget class="QSpinBox" name="spinPortNumber">

-       <property name="minimum">

-        <number>1000</number>

-       </property>

-       <property name="maximum">

-        <number>10000</number>

-       </property>

-      </widget>

-     </item>

-    </layout>

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

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

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

+     <property name="text">

+      <string>IP-address remote PC</string>

+     </property>

+    </widget>

    </item>

-   <item>

-    <spacer name="verticalSpacer">

-     <property name="orientation">

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

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

+    <widget class="QSpinBox" name="spinIPFirstNibble">

+     <property name="maximumSize">

+      <size>

+       <width>60</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="maximum">

+      <number>255</number>

      </property>

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

+     <property name="singleStep">

+      <number>1</number>

+     </property>

+    </widget>

+   </item>

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

+    <widget class="QSpinBox" name="spinIPSecondNibble">

+     <property name="maximumSize">

       <size>

-       <width>20</width>

-       <height>40</height>

+       <width>60</width>

+       <height>16777215</height>

       </size>

      </property>

-    </spacer>

+     <property name="maximum">

+      <number>255</number>

+     </property>

+     <property name="singleStep">

+      <number>1</number>

+     </property>

+    </widget>

    </item>

-   <item>

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

-     <item>

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

-       <property name="text">

-        <string>If FlightGear is on the same PC as FaceTrackNoIR, tick the 'Local PC only' box.</string>

-       </property>

-      </widget>

-     </item>

-     <item>

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

-       <property name="text">

-        <string>Otherwise: enter IP-address and port-number for the remote PC.</string>

-       </property>

-       <property name="wordWrap">

-        <bool>true</bool>

-       </property>

-      </widget>

-     </item>

-     <item>

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

-       <property name="text">

-        <string>Remember: you may have to change firewall-settings too!</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

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

+    <widget class="QSpinBox" name="spinIPThirdNibble">

+     <property name="maximumSize">

+      <size>

+       <width>60</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="maximum">

+      <number>255</number>

+     </property>

+     <property name="singleStep">

+      <number>1</number>

+     </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="4">

+    <widget class="QSpinBox" name="spinIPFourthNibble">

+     <property name="maximumSize">

+      <size>

+       <width>60</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="maximum">

+      <number>255</number>

+     </property>

+     <property name="singleStep">

+      <number>1</number>

+     </property>

+    </widget>

+   </item>

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

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

+     <property name="text">

+      <string>Port-number</string>

+     </property>

+    </widget>

+   </item>

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

+    <widget class="QSpinBox" name="spinPortNumber">

+     <property name="minimum">

+      <number>1000</number>

+     </property>

+     <property name="maximum">

+      <number>10000</number>

+     </property>

+    </widget>

+   </item>

+   <item row="2" column="2" colspan="3">

+    <widget class="QDialogButtonBox" name="buttonBox">

+     <property name="standardButtons">

+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>

+     </property>

+    </widget>

    </item>

   </layout>

  </widget>

@@ -268,9 +130,6 @@
   <tabstop>spinIPThirdNibble</tabstop>

   <tabstop>spinIPFourthNibble</tabstop>

   <tabstop>spinPortNumber</tabstop>

-  <tabstop>btnOK</tabstop>

-  <tabstop>btnCancel</tabstop>

-  <tabstop>chkLocalPC</tabstop>

  </tabstops>

  <resources/>

  <connections/>

diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
index 08e7370b..0ef6b50f 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
@@ -26,41 +26,14 @@
 *					It is based on the (Linux) example made by Melchior FRANZ.	*
 ********************************************************************************/
 #include "ftnoir_protocol_fg.h"
-#include <QFile>
 #include "facetracknoir/global-settings.h"
 #include <ftnoir_tracker_base/ftnoir_tracker_types.h>
 
 // For Todd and Arda Kutlu
 
-FTNoIR_Protocol::FTNoIR_Protocol()
+void FTNoIR_Protocol::reloadSettings()
 {
-    loadSettings();
-}
-
-FTNoIR_Protocol::~FTNoIR_Protocol()
-{
-}
-
-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 ( "FG" );
-
-	bool blnLocalPC = iniFile.value ( "LocalPCOnly", 1 ).toBool();
-	if (blnLocalPC) {
-        destIP = QHostAddress::LocalHost;
-	}
-	else {
-		QString destAddr = iniFile.value ( "IP-1", 192 ).toString() + "." + iniFile.value ( "IP-2", 168 ).toString() + "." + iniFile.value ( "IP-3", 2 ).toString() + "." + iniFile.value ( "IP-4", 1 ).toString();
-		destIP = QHostAddress( destAddr );
-	}
-    destPort = iniFile.value ( "PortNumber", 5542 ).toInt();
-
-	iniFile.endGroup ();
-
+    s.b->reload();
 }
 
 void FTNoIR_Protocol::sendHeadposeToGame(const double* headpose) {
@@ -71,13 +44,15 @@ void FTNoIR_Protocol::sendHeadposeToGame(const double* headpose) {
     FlightData.h = headpose[Yaw];
     FlightData.r = headpose[Roll];
     FlightData.status = 1;
+    QHostAddress destIP(QString("%1.%2.%3.%4").arg(
+                            QString::number(static_cast<int>(s.ip1)),
+                            QString::number(static_cast<int>(s.ip2)),
+                            QString::number(static_cast<int>(s.ip3)),
+                            QString::number(static_cast<int>(s.ip4))));
+    int destPort = s.port;
     (void) outSocket.writeDatagram(reinterpret_cast<const char*>(&FlightData), sizeof(FlightData), destIP, static_cast<quint16>(destPort));
 }
 
-//
-// Check if the Client DLL exists and load it (to test it), if so.
-// Returns 'true' if all seems OK.
-//
 bool FTNoIR_Protocol::checkServerInstallationOK()
 {   
     return outSocket.bind(QHostAddress::Any, 0, QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint);
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.h b/ftnoir_protocol_fg/ftnoir_protocol_fg.h
index 0a255d84..13aaeab4 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg.h
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.h
@@ -26,9 +26,6 @@
 *					It is based on the (Linux) example made by Melchior FRANZ.	*
 ********************************************************************************/
 #pragma once
-#ifndef INCLUDED_FGSERVER_H
-#define INCLUDED_FGSERVER_H
-
 #include "ftnoir_protocol_base/ftnoir_protocol_base.h"
 #include "ui_ftnoir_fgcontrols.h"
 #include "fgtypes.h"
@@ -36,23 +33,36 @@
 #include <QUdpSocket>
 #include <QMessageBox>
 #include "facetracknoir/global-settings.h"
+#include "facetracknoir/options.hpp"
+using namespace options;
+
+struct settings {
+    pbundle b;
+    value<int> ip1, ip2, ip3, ip4;
+    value<int> port;
+    settings() :
+        b(bundle("flightgear-proto")),
+        ip1(b, "ip1", 192),
+        ip2(b, "ip2", 168),
+        ip3(b, "ip3", 0),
+        ip4(b, "ip4", 2),
+        port(b, "port", 5542)
+    {}
+};
 
 class FTNoIR_Protocol : public IProtocol
 {
 public:
-	FTNoIR_Protocol();
-    virtual ~FTNoIR_Protocol();
     bool checkServerInstallationOK();
     void sendHeadposeToGame(const double *headpose);
     QString getGameName() {
         return "FlightGear";
     }
+    void reloadSettings();
 private:
+    settings s;
     TFlightGearData FlightData;
-    QUdpSocket outSocket;									// Send to FligthGear
-	QHostAddress destIP;									// Destination IP-address
-	int destPort;											// Destination port-number
-	void loadSettings();
+    QUdpSocket outSocket;
 };
 
 // Widget that has controls for FTNoIR protocol client-settings.
@@ -60,47 +70,27 @@ class FGControls: public QWidget, public IProtocolDialog
 {
     Q_OBJECT
 public:
-
-	explicit FGControls();
+    FGControls();
 	void registerProtocol(IProtocol *protocol) {
 		theProtocol = (FTNoIR_Protocol *) protocol;			// Accept the pointer to the Protocol
 	}
 	void unRegisterProtocol() {
 		theProtocol = NULL;									// Reset the pointer
 	}
-
 private:
 	Ui::UICFGControls ui;
-	void loadSettings();
-	void save();
-
-	/** helper **/
-	bool settingsDirty;
 	FTNoIR_Protocol *theProtocol;
-
+    settings s;
 private slots:
 	void doOK();
 	void doCancel();
-	void chkLocalPCOnlyChanged();
-	void settingChanged() { settingsDirty = true; }
 };
 
-//*******************************************************************************************************
-// FaceTrackNoIR Protocol DLL. Functions used to get general info on the Protocol
-//*******************************************************************************************************
 class FTNoIR_ProtocolDll : public Metadata
 {
 public:
-	FTNoIR_ProtocolDll();
-	~FTNoIR_ProtocolDll();
-
 	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear"); }
 	void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear"); }
 	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear UDP protocol"); }
-
     void getIcon(QIcon *icon) { *icon = QIcon(":/images/flightgear.png"); }
 };
-
-
-#endif//INCLUDED_FGSERVER_H
-//END
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
index cb11ace6..887020c5 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
@@ -37,155 +37,51 @@
 //
 // Constructor for server-settings-dialog
 //
-FGControls::FGControls() :
-QWidget()
+FGControls::FGControls() : theProtocol(nullptr)
 {
 	ui.setupUi( this );
 
-	QPoint offsetpos(100, 100);
-	//if (parent) {
-	//	this->move(parent->pos() + offsetpos);
-	//}
+    tie_setting(s.ip1, ui.spinIPFirstNibble);
+    tie_setting(s.ip2, ui.spinIPSecondNibble);
+    tie_setting(s.ip3, ui.spinIPThirdNibble);
+    tie_setting(s.ip4, ui.spinIPFourthNibble);
+    tie_setting(s.port, ui.spinPortNumber);
 
-	// Connect Qt signals to member-functions
-	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
-	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
-	connect(ui.chkLocalPC, SIGNAL(stateChanged(int)), this, SLOT(chkLocalPCOnlyChanged()));
-	connect(ui.spinIPFirstNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));
-	connect(ui.spinIPSecondNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));
-	connect(ui.spinIPThirdNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));
-	connect(ui.spinIPFourthNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));
-	connect(ui.spinPortNumber, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));
-
-	theProtocol = NULL;
-
-	// Load the settings from the current .INI-file
-	loadSettings();
+    connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK()));
+    connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
 }
 
-//
-// OK clicked on server-dialog
-//
 void FGControls::doOK() {
-	save();
+    s.b->save();
 	this->close();
+    if (theProtocol)
+        theProtocol->reloadSettings();
 }
 
-//
-// Cancel clicked on server-dialog
-//
 void FGControls::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();
-	}
+    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 );
+        switch (ret) {
+        case QMessageBox::Save:
+            s.b->save();
+            if (theProtocol)
+                theProtocol->reloadSettings();
+            this->close();
+            break;
+        case QMessageBox::Discard:
+            s.b->revert();
+            close();
+            break;
+        case QMessageBox::Cancel:
+        default:
+            break;
+        }
+    }
+    else {
+        this->close();
+    }
 }
 
-//
-// Load the current Settings from the currently 'active' INI-file.
-//
-void FGControls::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 ( "FG" );
-	ui.chkLocalPC->setChecked (iniFile.value ( "LocalPCOnly", 1 ).toBool());
-
-	ui.spinIPFirstNibble->setValue( iniFile.value ( "IP-1", 192 ).toInt() );
-	ui.spinIPSecondNibble->setValue( iniFile.value ( "IP-2", 168 ).toInt() );
-	ui.spinIPThirdNibble->setValue( iniFile.value ( "IP-3", 2 ).toInt() );
-	ui.spinIPFourthNibble->setValue( iniFile.value ( "IP-4", 1 ).toInt() );
-
-    ui.spinPortNumber->setValue( iniFile.value ( "PortNumber", 5542 ).toInt() );
-	iniFile.endGroup ();
-
-	chkLocalPCOnlyChanged();	
-	settingsDirty = false;
-}
-
-//
-// Save the current Settings to the currently 'active' INI-file.
-//
-void FGControls::save() {
-	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 ( "FG" );
-	iniFile.setValue ( "LocalPCOnly", ui.chkLocalPC->isChecked() );
-	iniFile.setValue ( "IP-1", ui.spinIPFirstNibble->value() );
-	iniFile.setValue ( "IP-2", ui.spinIPSecondNibble->value() );
-	iniFile.setValue ( "IP-3", ui.spinIPThirdNibble->value() );
-	iniFile.setValue ( "IP-4", ui.spinIPFourthNibble->value() );
-	iniFile.setValue ( "PortNumber", ui.spinPortNumber->value() );
-	iniFile.endGroup ();
-
-	settingsDirty = false;
-}
-
-//
-// Handle change of the checkbox.
-//
-void FGControls::chkLocalPCOnlyChanged() {
-
-	if ( ui.chkLocalPC->isChecked() ) {
-		ui.spinIPFirstNibble->setValue( 127 );
-		ui.spinIPFirstNibble->setEnabled ( false );
-		ui.spinIPSecondNibble->setValue( 0 );
-		ui.spinIPSecondNibble->setEnabled ( false );
-		ui.spinIPThirdNibble->setValue( 0 );
-		ui.spinIPThirdNibble->setEnabled ( false );
-		ui.spinIPFourthNibble->setValue( 1 );
-		ui.spinIPFourthNibble->setEnabled ( false );
-	}
-	else {
-		ui.spinIPFirstNibble->setEnabled ( true );
-		ui.spinIPSecondNibble->setEnabled ( true );
-		ui.spinIPThirdNibble->setEnabled ( true );
-		ui.spinIPFourthNibble->setEnabled ( true );
-	}
-
-	settingsDirty = true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// 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( )
 {
     return new FGControls;
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp
index 6c7e7c52..3125f136 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp
@@ -26,23 +26,6 @@
 #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()
 {
     return new FTNoIR_ProtocolDll;