mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-06-06 16:05:13 -04:00
Morph PluginInstanceGUI in DeviceGUI and single line inheritance from QWidget
This commit is contained in:
@@ -34,7 +34,7 @@
|
||||
#include "fcdtraits.h"
|
||||
|
||||
FCDProPlusGui::FCDProPlusGui(DeviceUISet *deviceUISet, QWidget* parent) :
|
||||
QWidget(parent),
|
||||
DeviceGUI(parent),
|
||||
ui(new Ui::FCDProPlusGui),
|
||||
m_deviceUISet(deviceUISet),
|
||||
m_forceSettings(true),
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#ifndef INCLUDE_FCDGUI_H
|
||||
#define INCLUDE_FCDGUI_H
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#include <device/devicegui.h>
|
||||
#include <QTimer>
|
||||
#include <QWidget>
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace Ui {
|
||||
class FCDProPlusGui;
|
||||
}
|
||||
|
||||
class FCDProPlusGui : public QWidget, public PluginInstanceGUI {
|
||||
class FCDProPlusGui : public DeviceGUI {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
|
||||
@@ -111,7 +111,7 @@ PluginInterface::SamplingDevices FCDProPlusPlugin::enumSampleSources(const Origi
|
||||
}
|
||||
|
||||
#ifdef SERVER_MODE
|
||||
PluginInstanceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI(
|
||||
DeviceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI(
|
||||
const QString& sourceId,
|
||||
QWidget **widget,
|
||||
DeviceUISet *deviceUISet)
|
||||
@@ -122,7 +122,7 @@ PluginInstanceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI(
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
PluginInstanceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI(
|
||||
DeviceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI(
|
||||
const QString& sourceId,
|
||||
QWidget **widget,
|
||||
DeviceUISet *deviceUISet)
|
||||
|
||||
@@ -21,7 +21,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);
|
||||
|
||||
Reference in New Issue
Block a user