1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-28 13:04:17 -04:00

Morph PluginInstanceGUI in DeviceGUI and single line inheritance from QWidget

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
@@ -35,7 +35,7 @@
#include "ui_hackrfoutputgui.h"
HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::HackRFOutputGui),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
@@ -21,7 +21,7 @@
#include <QTimer>
#include <QWidget>
#include "plugin/plugininstancegui.h"
#include "device/devicegui.h"
#include "util/messagequeue.h"
#include "hackrfoutput.h"
@@ -35,7 +35,7 @@ namespace Ui {
class HackRFOutputGui;
}
class HackRFOutputGui : public QWidget, public PluginInstanceGUI {
class HackRFOutputGui : public DeviceGUI {
Q_OBJECT
public:
@@ -93,7 +93,7 @@ PluginInterface::SamplingDevices HackRFOutputPlugin::enumSampleSinks(const Origi
}
#ifdef SERVER_MODE
PluginInstanceGUI* HackRFOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* HackRFOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -104,7 +104,7 @@ PluginInstanceGUI* HackRFOutputPlugin::createSampleSinkPluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* HackRFOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* HackRFOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -38,7 +38,7 @@ public:
virtual void enumOriginDevices(QStringList& listedHwIds, OriginDevices& originDevices);
virtual SamplingDevices enumSampleSinks(const OriginDevices& originDevices);
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
virtual DeviceGUI* createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet);