From 8303597a865400a363ae574ccde819302495f498 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 2 Apr 2013 18:41:01 +0200
Subject: Just put everything new in. Conflict resolution will be later

---
 ftnoir_filter_base/ftnoir_filter_base.h        | 51 ++++++--------------------
 ftnoir_filter_base/ftnoir_filter_base_global.h |  2 +-
 2 files changed, 12 insertions(+), 41 deletions(-)

(limited to 'ftnoir_filter_base')

diff --git a/ftnoir_filter_base/ftnoir_filter_base.h b/ftnoir_filter_base/ftnoir_filter_base.h
index 44ce3d72..37309077 100644
--- a/ftnoir_filter_base/ftnoir_filter_base.h
+++ b/ftnoir_filter_base/ftnoir_filter_base.h
@@ -2,7 +2,7 @@
 #define FTNOIR_FILTER_BASE_H
 
 #include "ftnoir_filter_base_global.h"
-#include "..\ftnoir_tracker_base\ftnoir_tracker_base.h"
+#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
 #include <QString>
 #include <QList>
 #include <QFile>
@@ -27,40 +27,10 @@ struct IFilter
 {
 	virtual ~IFilter() {}
 	virtual void Initialize() = 0;
-	virtual void FilterHeadPoseData(THeadPoseData *current_camera_position, THeadPoseData *target_camera_position, THeadPoseData *new_camera_position, bool newTarget) = 0;
+    virtual void FilterHeadPoseData(THeadPoseData *current_camera_position, THeadPoseData *target_camera_position, THeadPoseData *new_camera_position, THeadPoseData *last_post_filter, bool newTarget) = 0;
 };
 
-typedef IFilter* IFilterPtr;
-//typedef IFilter *(__stdcall *importGetFilter)(void);
-
-// Factory function that creates instances of the Filter object.
-EXTERN_C
-FTNOIR_FILTER_BASE_EXPORT
-IFilterPtr
-__stdcall
-GetFilter(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 IFilterDialog
-{
-	virtual ~IFilterDialog() {}
-	virtual void Initialize(QWidget *parent, IFilterPtr ptr) = 0;
-};
-
-typedef IFilterDialog* IFilterDialogPtr;
-
-
 // Factory function that creates instances of the Filter object.
-EXTERN_C
-FTNOIR_FILTER_BASE_EXPORT
-IFilterDialogPtr
-__stdcall
-GetFilterDialog(void);
 
 ////////////////////////////////////////////////////////////////////////////////
 // COM-Like abstract interface.
@@ -78,14 +48,15 @@ struct IFilterDll
 	virtual void getIcon(QIcon *icon) = 0;
 };
 
-typedef IFilterDll* IFilterDllPtr;
-
-// Factory function that creates instances of the Filter object.
-EXTERN_C
-FTNOIR_FILTER_BASE_EXPORT
-IFilterDllPtr
-__stdcall
-GetFilterDll(void);
+struct IFilterDialog
+{
+    virtual ~IFilterDialog() {}
+    virtual void Initialize(QWidget *parent, IFilter* ptr) = 0;
 
+    virtual void getFullName(QString *strToBeFilled) {};
+    virtual void getShortName(QString *strToBeFilled) {};
+    virtual void getDescription(QString *strToBeFilled) {};
+    virtual void getIcon(QIcon *icon) {};
+};
 
 #endif // FTNOIR_FILTER_BASE_H
diff --git a/ftnoir_filter_base/ftnoir_filter_base_global.h b/ftnoir_filter_base/ftnoir_filter_base_global.h
index aac4048e..a923f6cf 100644
--- a/ftnoir_filter_base/ftnoir_filter_base_global.h
+++ b/ftnoir_filter_base/ftnoir_filter_base_global.h
@@ -1,7 +1,7 @@
 #ifndef FTNOIR_FILTER_BASE_GLOBAL_H
 #define FTNOIR_FILTER_BASE_GLOBAL_H
 
-#include <Qt/qglobal.h>
+#include <QtGlobal>
 
 #ifdef FTNOIR_FILTER_BASE_LIB
 # define FTNOIR_FILTER_BASE_EXPORT Q_DECL_EXPORT
-- 
cgit v1.2.3