From e281d8fd32ee779fc7d6d6c4f4568a0389d7ee29 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 3 Sep 2017 17:26:32 +0200 Subject: [PATCH] GUI segregation: de-tangle PluginGUI interface from QWidget --- plugins/samplesink/bladerfoutput/bladerfoutputgui.h | 2 ++ plugins/samplesink/filesink/filesinkgui.h | 1 + plugins/samplesink/hackrfoutput/hackrfoutputgui.h | 1 + plugins/samplesink/limesdroutput/limesdroutputgui.h | 1 + plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h | 1 + plugins/samplesource/airspy/airspygui.h | 1 + plugins/samplesource/bladerfinput/bladerfinputgui.h | 5 +++-- plugins/samplesource/fcdpro/fcdprogui.h | 1 + plugins/samplesource/fcdproplus/fcdproplusgui.h | 1 + plugins/samplesource/filesource/filesourcegui.h | 2 ++ plugins/samplesource/hackrfinput/hackrfinputgui.h | 1 + plugins/samplesource/limesdrinput/limesdrinputgui.h | 1 + plugins/samplesource/plutosdrinput/plutosdrinputgui.h | 1 + plugins/samplesource/rtlsdr/rtlsdrgui.h | 2 ++ plugins/samplesource/sdrdaemon/sdrdaemongui.h | 2 ++ plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h | 2 ++ plugins/samplesource/sdrplay/sdrplaygui.h | 2 ++ sdrbase/plugin/plugingui.h | 1 - 18 files changed, 25 insertions(+), 3 deletions(-) diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.h b/plugins/samplesink/bladerfoutput/bladerfoutputgui.h index 06c38e454..bb6f837bf 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.h +++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.h @@ -18,6 +18,8 @@ #define INCLUDE_BLADERFOUTPUTGUI_H #include +#include + #include "plugin/plugingui.h" #include "bladerfoutput.h" diff --git a/plugins/samplesink/filesink/filesinkgui.h b/plugins/samplesink/filesink/filesinkgui.h index faa773e5e..b0165d4ae 100644 --- a/plugins/samplesink/filesink/filesinkgui.h +++ b/plugins/samplesink/filesink/filesinkgui.h @@ -18,6 +18,7 @@ #define INCLUDE_FILESINKGUI_H #include +#include #include "filesinkoutput.h" #include "filesinksettings.h" diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.h b/plugins/samplesink/hackrfoutput/hackrfoutputgui.h index 67cc4d193..9a0a0ebf9 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.h @@ -18,6 +18,7 @@ #define INCLUDE_HACKRFOUTPUTGUI_H #include +#include #include "plugin/plugingui.h" #include "hackrfoutput.h" diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.h b/plugins/samplesink/limesdroutput/limesdroutputgui.h index 0f61cd343..5d662253f 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.h +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.h @@ -18,6 +18,7 @@ #define PLUGINS_SAMPLESOURCE_LIMESDROUTPUT_LIMESDROUTPUTGUI_H_ #include +#include #include "plugin/plugingui.h" #include "limesdroutput.h" diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h index adc1137b9..c3922f78f 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h @@ -19,6 +19,7 @@ #include #include +#include #include "plugin/plugingui.h" #include "sdrdaemonsinksettings.h" diff --git a/plugins/samplesource/airspy/airspygui.h b/plugins/samplesource/airspy/airspygui.h index dda5e0dd0..c8fda15c0 100644 --- a/plugins/samplesource/airspy/airspygui.h +++ b/plugins/samplesource/airspy/airspygui.h @@ -18,6 +18,7 @@ #define INCLUDE_AIRSPYGUI_H #include +#include #include "airspyinput.h" #include "plugin/plugingui.h" diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.h b/plugins/samplesource/bladerfinput/bladerfinputgui.h index be9cc634e..7608e88b8 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputgui.h +++ b/plugins/samplesource/bladerfinput/bladerfinputgui.h @@ -18,9 +18,10 @@ #define INCLUDE_BLADERFINPUTGUI_H #include -#include "plugin/plugingui.h" +#include -#include "../bladerfinput/bladerfinput.h" +#include "plugin/plugingui.h" +#include "bladerfinput.h" class DeviceSourceAPI; class FileRecord; diff --git a/plugins/samplesource/fcdpro/fcdprogui.h b/plugins/samplesource/fcdpro/fcdprogui.h index 4bf07b36c..ee2f693b5 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.h +++ b/plugins/samplesource/fcdpro/fcdprogui.h @@ -18,6 +18,7 @@ #define INCLUDE_FCDPROGUI_H #include +#include #include "fcdproinput.h" #include "plugin/plugingui.h" diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.h b/plugins/samplesource/fcdproplus/fcdproplusgui.h index 0c4587834..19e1d997b 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.h +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.h @@ -18,6 +18,7 @@ #define INCLUDE_FCDGUI_H #include +#include #include "fcdproplusinput.h" #include "plugin/plugingui.h" diff --git a/plugins/samplesource/filesource/filesourcegui.h b/plugins/samplesource/filesource/filesourcegui.h index 375da1a9f..1f3d2fba5 100644 --- a/plugins/samplesource/filesource/filesourcegui.h +++ b/plugins/samplesource/filesource/filesourcegui.h @@ -18,6 +18,8 @@ #define INCLUDE_FILESOURCEGUI_H #include +#include + #include "plugin/plugingui.h" #include "filesourceinput.h" diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.h b/plugins/samplesource/hackrfinput/hackrfinputgui.h index eef02d418..2604ddbba 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.h +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.h @@ -18,6 +18,7 @@ #define INCLUDE_HACKRFINPUTGUI_H #include +#include #include "plugin/plugingui.h" #include "../hackrfinput/hackrfinput.h" diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.h b/plugins/samplesource/limesdrinput/limesdrinputgui.h index d1c1c588d..29a402030 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.h +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.h @@ -18,6 +18,7 @@ #define PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTGUI_H_ #include +#include #include "plugin/plugingui.h" #include "limesdrinput.h" diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h index 3556c59d8..26bd15c93 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h @@ -18,6 +18,7 @@ #define PLUGINS_SAMPLESOURCE_PLUTOSDRINPUT_PLUTOSDRINPUTGUI_H_ #include +#include #include "plugin/plugingui.h" #include "plutosdrinputsettings.h" diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.h b/plugins/samplesource/rtlsdr/rtlsdrgui.h index 1f9139971..33a690542 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.h +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h @@ -18,6 +18,8 @@ #define INCLUDE_RTLSDRGUI_H #include +#include + #include "plugin/plugingui.h" #include "rtlsdrinput.h" diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.h b/plugins/samplesource/sdrdaemon/sdrdaemongui.h index 227c2e44a..af50caf08 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemongui.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.h @@ -18,6 +18,8 @@ #define INCLUDE_SDRDAEMONGUI_H #include +#include + #include #include "plugin/plugingui.h" diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h index 690b6cf02..c539c8d20 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h @@ -18,6 +18,8 @@ #define INCLUDE_SDRDAEMONSOURCEGUI_H #include +#include + #include #include "plugin/plugingui.h" diff --git a/plugins/samplesource/sdrplay/sdrplaygui.h b/plugins/samplesource/sdrplay/sdrplaygui.h index 68b528731..3f3bf4fc9 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.h +++ b/plugins/samplesource/sdrplay/sdrplaygui.h @@ -18,6 +18,8 @@ #define PLUGINS_SAMPLESOURCE_SDRPLAY_SDRPLAYGUI_H_ #include +#include + #include #include "plugin/plugingui.h" diff --git a/sdrbase/plugin/plugingui.h b/sdrbase/plugin/plugingui.h index ff31d4b08..654ddf616 100644 --- a/sdrbase/plugin/plugingui.h +++ b/sdrbase/plugin/plugingui.h @@ -1,7 +1,6 @@ #ifndef INCLUDE_PLUGINGUI_H #define INCLUDE_PLUGINGUI_H -#include #include "util/export.h" class Message;