Cleanup: don't inherit from UI class since it's a member too

11 files changed, 11 insertions, 11 deletions

diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.h b/ftnoir_filter_accela/ftnoir_filter_accela.h
index 48efbc59..4c513bb3 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.h
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.h
@@ -69,7 +69,7 @@ private:
 //*******************************************************************************************************

 

 // Widget that has controls for FTNoIR protocol filter-settings.

-class FTNOIR_FILTER_BASE_EXPORT FilterControls: public QWidget, Ui::AccelaUICFilterControls, public IFilterDialog

+class FTNOIR_FILTER_BASE_EXPORT FilterControls: public QWidget, public IFilterDialog

 {

     Q_OBJECT

 public:

diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
index b35d5cc3..6c2a902b 100644
--- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
+++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
@@ -66,7 +66,7 @@ private:
 //*******************************************************************************************************

 

 // Widget that has controls for FTNoIR protocol filter-settings.

-class FilterControls: public QWidget, Ui::UICFilterControls, public IFilterDialog

+class FilterControls: public QWidget, public IFilterDialog

 {

     Q_OBJECT

 public:

diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.h b/ftnoir_protocol_fg/ftnoir_protocol_fg.h
index 3e2a1bf4..10fb1ea8 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg.h
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.h
@@ -71,7 +71,7 @@ private:
 };

 

 // Widget that has controls for FTNoIR protocol client-settings.

-class FGControls: public QWidget, Ui::UICFGControls, public IProtocolDialog

+class FGControls: public QWidget, public IProtocolDialog

 {

     Q_OBJECT

 public:

diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
index e2aed7db..f23f45c2 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
@@ -81,7 +81,7 @@ private:
 };

 

 // Widget that has controls for FTNoIR protocol client-settings.

-class FSUIPCControls: public QWidget, Ui::UICFSUIPCControls, public IProtocolDialog

+class FSUIPCControls: public QWidget, public IProtocolDialog

 {

     Q_OBJECT

 public:

diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
index c889e21b..c02dfc03 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
@@ -89,7 +89,7 @@ private:
 };

 

 // Widget that has controls for FTNoIR protocol client-settings.

-class FTControls: public QWidget, Ui::UICFTControls, public IProtocolDialog

+class FTControls: public QWidget, public IProtocolDialog

 {

     Q_OBJECT

 public:

diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h
index f40f30fa..e2e33c73 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h
@@ -59,7 +59,7 @@ private:
 };

 

 // Widget that has controls for FTNoIR protocol client-settings.

-class FTNControls: public QWidget, Ui::UICFTNControls, public IProtocolDialog

+class FTNControls: public QWidget, public IProtocolDialog

 {

     Q_OBJECT

 public:

diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
index e1305a6f..d4ad94d5 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
@@ -97,7 +97,7 @@ private:
 };

 

 // Widget that has controls for FTNoIR protocol client-settings.

-class MOUSEControls: public QWidget, Ui::UICMOUSEControls, public IProtocolDialog

+class MOUSEControls: public QWidget, public IProtocolDialog

 {

     Q_OBJECT

 public:

diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.h b/ftnoir_protocol_sc/ftnoir_protocol_sc.h
index f49860b7..e9dcfbb2 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc.h
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.h
@@ -126,7 +126,7 @@ private:
 };

 

 // Widget that has controls for FTNoIR protocol client-settings.

-class SCControls: public QWidget, Ui::UICSCControls, public IProtocolDialog

+class SCControls: public QWidget, public IProtocolDialog

 {

     Q_OBJECT

 public:

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h
index 28120692..ada331e5 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h
@@ -17,7 +17,7 @@
 #include <QTimer>

 

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

-class TrackerDialog : public QWidget, Ui::UICPTClientControls, public ITrackerDialog

+class TrackerDialog : public QWidget, public ITrackerDialog

 {

     Q_OBJECT

 public:

diff --git a/ftnoir_tracker_sm/ftnoir_tracker_sm.h b/ftnoir_tracker_sm/ftnoir_tracker_sm.h
index 665507e6..22f9ca4e 100644
--- a/ftnoir_tracker_sm/ftnoir_tracker_sm.h
+++ b/ftnoir_tracker_sm/ftnoir_tracker_sm.h
@@ -67,7 +67,7 @@ private:
 };

 

 // Widget that has controls for SMoIR protocol client-settings.

-class TrackerControls: public QWidget, Ui::UICSMClientControls, public ITrackerDialog

+class TrackerControls: public QWidget, public ITrackerDialog

 {

     Q_OBJECT

 public:

diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.h b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
index ccb42ac1..6e200db6 100644
--- a/ftnoir_tracker_udp/ftnoir_tracker_udp.h
+++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.h
@@ -47,7 +47,7 @@ private:
 };

 

 // Widget that has controls for FTNoIR protocol client-settings.

-class TrackerControls: public QWidget, Ui::UICFTNClientControls, public ITrackerDialog

+class TrackerControls: public QWidget, public ITrackerDialog

 {

     Q_OBJECT

 public: