Just put everything new in. Conflict resolution will be later

1 files changed, 4 insertions, 5 deletions

diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
index 58dbfbad..24ccc8b9 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
@@ -32,6 +32,7 @@
 */

 #include "ftnoir_protocol_ftn.h"

 #include <QDebug>

+#include "facetracknoir/global-settings.h"

 

 //*******************************************************************************************************

 // FaceTrackNoIR Client Settings-dialog.

@@ -59,8 +60,6 @@ QWidget()
 	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();

 }

@@ -186,9 +185,9 @@ void FTNControls::save() {
 //   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")

+//#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")

 

-FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialogPtr __stdcall GetProtocolDialog( )

+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetDialog( )

 {

-	return new FTNControls;

+    return (IProtocolDialog*) new FTNControls;

 }