VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-17 16:24:08 -04:00
Code Issues Projects Releases Wiki Activity

Morph PluginInstanceGUI in DeviceGUI and single line inheritance from QWidget

Browse Source
This commit is contained in:
f4exb
2020-10-05 19:23:13 +02:00
parent 31bf99a619
commit 841a8fe242
136 changed files with 256 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp
+1 -1
View File
@@ -40,7 +40,7 @@
#include "soapysdrinputgui.h"
SoapySDRInputGui::SoapySDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::SoapySDRInputGui),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
plugins/samplesource/soapysdrinput/soapysdrinputgui.h
+2 -2
View File
@@ -21,7 +21,7 @@
#include <QTimer>
#include <QWidget>
#include "plugin/plugininstancegui.h"
#include "device/devicegui.h"
#include "util/messagequeue.h"
#include "soapysdrinput.h"
@@ -39,7 +39,7 @@ namespace Ui {
class SoapySDRInputGui;
}
class SoapySDRInputGui : public QWidget, public PluginInstanceGUI {
class SoapySDRInputGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp
+2 -2
View File
@@ -103,7 +103,7 @@ PluginInterface::SamplingDevices SoapySDRInputPlugin::enumSampleSources(const Or
}
#ifdef SERVER_MODE
PluginInstanceGUI* SoapySDRInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* SoapySDRInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -114,7 +114,7 @@ PluginInstanceGUI* SoapySDRInputPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* SoapySDRInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* SoapySDRInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/soapysdrinput/soapysdrinputplugin.h
+1 -1
View File
@@ -40,7 +40,7 @@ public:
virtual void enumOriginDevices(QStringList& listedHwIds, OriginDevices& originDevices);
virtual SamplingDevices enumSampleSources(const OriginDevices& originDevices);
virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
virtual DeviceGUI* createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet);