Just put everything new in. Conflict resolution will be later

2 files changed, 12 insertions, 44 deletions

diff --git a/ftnoir_protocol_base/ftnoir_protocol_base.h b/ftnoir_protocol_base/ftnoir_protocol_base.h
index 3f598d35..5d88a508 100644
--- a/ftnoir_protocol_base/ftnoir_protocol_base.h
+++ b/ftnoir_protocol_base/ftnoir_protocol_base.h
@@ -33,12 +33,12 @@
 #define FTNOIR_PROTOCOL_BASE_H

 

 #include "ftnoir_protocol_base_global.h"

-#include "..\ftnoir_tracker_base\ftnoir_tracker_types.h"

+#include "ftnoir_tracker_base/ftnoir_tracker_types.h"

 #include <QtGui/QWidget>

 #include <QtGui/QFrame>

 //#include "winbase.h"

 

-#include "windows.h"

+//#include "windows.h"

 //#include "winable.h"

 

 ////////////////////////////////////////////////////////////////////////////////

@@ -58,43 +58,11 @@ struct IProtocol
 {

 	virtual ~IProtocol() {}

 	virtual void Initialize() = 0;

-	virtual bool checkServerInstallationOK ( HANDLE handle ) = 0;

+    virtual bool checkServerInstallationOK() = 0;

 	virtual void sendHeadposeToGame( THeadPoseData *headpose, THeadPoseData *rawheadpose ) = 0;

 	virtual void getNameFromGame( char *dest ) = 0;				// Take care dest can handle up to 100 chars...

 };

 

-typedef IProtocol* IProtocolPtr;

-

-// Factory function that creates instances of the Protocol object.

-EXTERN_C

-FTNOIR_PROTOCOL_BASE_EXPORT

-IProtocolPtr

-__stdcall

-GetProtocol(void);

-

-////////////////////////////////////////////////////////////////////////////////

-// COM-Like abstract interface.

-// This interface doesn't require __declspec(dllexport/dllimport) specifier.

-// Method calls are dispatched via virtual table.

-// Any C++ compiler can use it.

-// Instances are obtained via factory function.

-struct IProtocolDialog

-{

-	virtual ~IProtocolDialog() {}

-	virtual void Initialize(QWidget *parent) = 0;

-	virtual void registerProtocol(IProtocol *protocol) = 0;

-	virtual void unRegisterProtocol() = 0;

-};

-

-typedef IProtocolDialog* IProtocolDialogPtr;

-

-// Factory function that creates instances of the Protocol object.

-EXTERN_C

-FTNOIR_PROTOCOL_BASE_EXPORT

-IProtocolDialogPtr

-__stdcall

-GetProtocolDialog(void);

-

 ////////////////////////////////////////////////////////////////////////////////

 // COM-Like abstract interface.

 // This interface doesn't require __declspec(dllexport/dllimport) specifier.

@@ -111,14 +79,14 @@ struct IProtocolDll
 	virtual void getIcon(QIcon *icon) = 0;

 };

 

-typedef IProtocolDll* IProtocolDllPtr;

-

-// Factory function that creates instances of the Protocol object.

-EXTERN_C

-FTNOIR_PROTOCOL_BASE_EXPORT

-IProtocolDllPtr

-__stdcall

-GetProtocolDll(void);

+struct IProtocolDialog

+{

+    virtual ~IProtocolDialog() {}

+	virtual void Initialize(QWidget *parent) = 0;

+    virtual void showEvent ( QShowEvent * event ) = 0;

 

+    virtual void registerProtocol(IProtocol *protocol) = 0;

+    virtual void unRegisterProtocol() = 0;

+};

 

 #endif // FTNOIR_PROTOCOL_BASE_H

diff --git a/ftnoir_protocol_base/ftnoir_protocol_base_global.h b/ftnoir_protocol_base/ftnoir_protocol_base_global.h
index 3527bad7..ca51e26d 100644
--- a/ftnoir_protocol_base/ftnoir_protocol_base_global.h
+++ b/ftnoir_protocol_base/ftnoir_protocol_base_global.h
@@ -1,7 +1,7 @@
 #ifndef FTNOIR_PROTOCOL_BASE_GLOBAL_H

 #define FTNOIR_PROTOCOL_BASE_GLOBAL_H

 

-#include <Qt/qglobal.h>

+#include <QtGlobal>

 

 #ifdef FTNOIR_PROTOCOL_BASE_LIB

 # define FTNOIR_PROTOCOL_BASE_EXPORT Q_DECL_EXPORT