Multi device support: remainder source plugins: removed useless dependencies on plugin API

plugins/samplesource/fcdproplus/fcdproplusgui.cpp

@@ -18,7 +18,6 @@
 #include <QMessageBox>
 
 #include "ui_fcdproplusgui.h"
-#include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
 #include "gui/colormapper.h"
 #include "gui/glspectrum.h"
@@ -28,10 +27,9 @@
 #include "fcdproplusgui.h"
 #include "fcdproplusconst.h"
 
-FCDProPlusGui::FCDProPlusGui(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
+FCDProPlusGui::FCDProPlusGui(DeviceAPI *deviceAPI, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::FCDProPlusGui),
-	m_pluginAPI(pluginAPI),
 	m_deviceAPI(deviceAPI),
 	m_settings(),
 	m_sampleSource(NULL),

plugins/samplesource/fcdproplus/fcdproplusgui.h

@@ -22,7 +22,6 @@
 #include "fcdproplusinput.h"
 #include "plugin/plugingui.h"
 
-class PluginAPI;
 class DeviceAPI;
 class FileSink;
 
@@ -34,7 +33,7 @@ class FCDProPlusGui : public QWidget, public PluginGUI {
 	Q_OBJECT
 
 public:
-	explicit FCDProPlusGui(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL);
+	explicit FCDProPlusGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
 	virtual ~FCDProPlusGui();
 	void destroy();
 
@@ -52,7 +51,6 @@ public:
 private:
 	Ui::FCDProPlusGui* ui;
 
-	PluginAPI* m_pluginAPI;
 	DeviceAPI* m_deviceAPI;
 	FCDProPlusSettings m_settings;
 	QTimer m_updateTimer;

plugins/samplesource/fcdproplus/fcdproplusplugin.cpp

@@ -46,9 +46,7 @@ const PluginDescriptor& FCDProPlusPlugin::getPluginDescriptor() const
 
 void FCDProPlusPlugin::initPlugin(PluginAPI* pluginAPI)
 {
-	m_pluginAPI = pluginAPI;
-
-	m_pluginAPI->registerSampleSource(fcd_traits<ProPlus>::interfaceIID, this);
+	pluginAPI->registerSampleSource(fcd_traits<ProPlus>::interfaceIID, this);
 }
 
 PluginInterface::SampleSourceDevices FCDProPlusPlugin::enumSampleSources()
@@ -79,7 +77,7 @@ PluginGUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId
 {
 	if(sourceId == fcd_traits<ProPlus>::interfaceIID)
 	{
-		FCDProPlusGui* gui = new FCDProPlusGui(m_pluginAPI, deviceAPI);
+		FCDProPlusGui* gui = new FCDProPlusGui(deviceAPI);
 		*widget = gui;
 		return gui;
 	}

plugins/samplesource/fcdproplus/fcdproplusplugin.h

@@ -6,6 +6,8 @@
 
 #define FCDPROPLUS_DEVICE_TYPE_ID "sdrangel.samplesource.fcdproplus"
 
+class PluginAPI;
+
 class FCDProPlusPlugin : public QObject, public PluginInterface {
 	Q_OBJECT
 	Q_INTERFACES(PluginInterface)
@@ -24,8 +26,6 @@ public:
 
 private:
 	static const PluginDescriptor m_pluginDescriptor;
-
-	PluginAPI* m_pluginAPI;
 };
 
 #endif // INCLUDE_FCDPROPLUSPLUGIN_H