VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-28 21:14:15 -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/airspy/airspygui.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#include "dsp/dspcommands.h"
AirspyGui::AirspyGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::AirspyGui),
m_deviceUISet(deviceUISet),
m_doApplySettings(true),
plugins/samplesource/airspy/airspygui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef INCLUDE_AIRSPYGUI_H
#define INCLUDE_AIRSPYGUI_H
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -32,7 +32,7 @@ namespace Ui {
class AirspySampleRates;
}
class AirspyGui : public QWidget, public PluginInstanceGUI {
class AirspyGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/airspy/airspyplugin.cpp
+3 -3
View File
@@ -159,7 +159,7 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources(const OriginDev
}
#ifdef SERVER_MODE
PluginInstanceGUI* AirspyPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* AirspyPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -170,7 +170,7 @@ PluginInstanceGUI* AirspyPlugin::createSampleSourcePluginInstanceGUI(
return nullptr;
}
#else
PluginInstanceGUI* AirspyPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* AirspyPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -204,4 +204,4 @@ DeviceSampleSource *AirspyPlugin::createSampleSourcePluginInstance(const QString
DeviceWebAPIAdapter *AirspyPlugin::createDeviceWebAPIAdapter() const
{
return new AirspyWebAPIAdapter();
}
}
plugins/samplesource/airspy/airspyplugin.h
+1 -1
View File
@@ -38,7 +38,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);
plugins/samplesource/airspyhf/airspyhfgui.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
#include "airspyhfgui.h"
AirspyHFGui::AirspyHFGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::AirspyHFGui),
m_deviceUISet(deviceUISet),
m_doApplySettings(true),
plugins/samplesource/airspyhf/airspyhfgui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef INCLUDE_AIRSPYHFGUI_H
#define INCLUDE_AIRSPYHFGUI_H
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -33,7 +33,7 @@ namespace Ui {
class AirspyHFSampleRates;
}
class AirspyHFGui : public QWidget, public PluginInstanceGUI {
class AirspyHFGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/airspyhf/airspyhfplugin.cpp
+3 -3
View File
@@ -129,7 +129,7 @@ PluginInterface::SamplingDevices AirspyHFPlugin::enumSampleSources(const OriginD
}
#ifdef SERVER_MODE
PluginInstanceGUI* AirspyHFPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* AirspyHFPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -140,7 +140,7 @@ PluginInstanceGUI* AirspyHFPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* AirspyHFPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* AirspyHFPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -174,4 +174,4 @@ DeviceSampleSource *AirspyHFPlugin::createSampleSourcePluginInstance(const QStri
DeviceWebAPIAdapter *AirspyHFPlugin::createDeviceWebAPIAdapter() const
{
return new AirspyHFWebAPIAdapter();
}
}
plugins/samplesource/airspyhf/airspyhfplugin.h
+1 -1
View File
@@ -38,7 +38,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);
plugins/samplesource/bladerf1input/bladerf1inputgui.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
#include "bladerf1inputgui.h"
Bladerf1InputGui::Bladerf1InputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::Bladerf1InputGui),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
plugins/samplesource/bladerf1input/bladerf1inputgui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef INCLUDE_BLADERFINPUTGUI_H
#define INCLUDE_BLADERFINPUTGUI_H
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -32,7 +32,7 @@ namespace Ui {
class Bladerf1InputGui;
}
class Bladerf1InputGui : public QWidget, public PluginInstanceGUI {
class Bladerf1InputGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp
+2 -2
View File
@@ -92,7 +92,7 @@ PluginInterface::SamplingDevices Blderf1InputPlugin::enumSampleSources(const Ori
}
#ifdef SERVER_MODE
PluginInstanceGUI* Blderf1InputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* Blderf1InputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -103,7 +103,7 @@ PluginInstanceGUI* Blderf1InputPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* Blderf1InputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* Blderf1InputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/bladerf1input/bladerf1inputplugin.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);
plugins/samplesource/bladerf2input/bladerf2inputgui.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
#include "bladerf2inputgui.h"
BladeRF2InputGui::BladeRF2InputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::Bladerf2InputGui),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
plugins/samplesource/bladerf2input/bladerf2inputgui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef PLUGINS_SAMPLESOURCE_BLADERF2INPUT_BLADERF2INPUTGUI_H_
#define PLUGINS_SAMPLESOURCE_BLADERF2INPUT_BLADERF2INPUTGUI_H_
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -32,7 +32,7 @@ namespace Ui {
class Bladerf2InputGui;
}
class BladeRF2InputGui : public QWidget, public PluginInstanceGUI {
class BladeRF2InputGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp
+2 -2
View File
@@ -97,7 +97,7 @@ PluginInterface::SamplingDevices Blderf2InputPlugin::enumSampleSources(const Ori
}
#ifdef SERVER_MODE
PluginInstanceGUI* Blderf2InputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* Blderf2InputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -108,7 +108,7 @@ PluginInstanceGUI* Blderf2InputPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* Blderf2InputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* Blderf2InputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/bladerf2input/bladerf2inputplugin.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);
plugins/samplesource/fcdpro/fcdprogui.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
#include "fcdtraits.h"
FCDProGui::FCDProGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::FCDProGui),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
plugins/samplesource/fcdpro/fcdprogui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef INCLUDE_FCDPROGUI_H
#define INCLUDE_FCDPROGUI_H
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -33,7 +33,7 @@ namespace Ui {
class FCDProGui;
}
class FCDProGui : public QWidget, public PluginInstanceGUI {
class FCDProGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/fcdpro/fcdproplugin.cpp
+2 -2
View File
@@ -108,7 +108,7 @@ PluginInterface::SamplingDevices FCDProPlugin::enumSampleSources(const OriginDev
}
#ifdef SERVER_MODE
PluginInstanceGUI* FCDProPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* FCDProPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -119,7 +119,7 @@ PluginInstanceGUI* FCDProPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* FCDProPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* FCDProPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/fcdpro/fcdproplugin.h
+1 -1
View File
@@ -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);
plugins/samplesource/fcdproplus/fcdproplusgui.cpp
+1 -1
View File
@@ -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),
plugins/samplesource/fcdproplus/fcdproplusgui.h
+2 -2
View File
@@ -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:
plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
+2 -2
View File
@@ -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)
plugins/samplesource/fcdproplus/fcdproplusplugin.h
+1 -1
View File
@@ -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);
plugins/samplesource/fileinput/fileinputgui.cpp
+1 -1
View File
@@ -39,7 +39,7 @@
#include "device/deviceuiset.h"
FileInputGUI::FileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::FileInputGUI),
m_deviceUISet(deviceUISet),
m_settings(),
plugins/samplesource/fileinput/fileinputgui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef INCLUDE_FILEINPUTGUI_H
#define INCLUDE_FILEINPUTGUI_H
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -33,7 +33,7 @@ namespace Ui {
class FileInputGUI;
}
class FileInputGUI : public QWidget, public PluginInstanceGUI {
class FileInputGUI : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/fileinput/fileinputplugin.cpp
+2 -2
View File
@@ -100,7 +100,7 @@ PluginInterface::SamplingDevices FileInputPlugin::enumSampleSources(const Origin
}
#ifdef SERVER_MODE
PluginInstanceGUI* FileInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* FileInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -111,7 +111,7 @@ PluginInstanceGUI* FileInputPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* FileInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* FileInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/fileinput/fileinputplugin.h
+1 -1
View File
@@ -38,7 +38,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);
plugins/samplesource/hackrfinput/hackrfinputgui.cpp
+1 -1
View File
@@ -36,7 +36,7 @@
#include "ui_hackrfinputgui.h"
HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::HackRFInputGui),
m_deviceUISet(deviceUISet),
m_settings(),
plugins/samplesource/hackrfinput/hackrfinputgui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef INCLUDE_HACKRFINPUTGUI_H
#define INCLUDE_HACKRFINPUTGUI_H
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -34,7 +34,7 @@ namespace Ui {
class HackRFInputGui;
}
class HackRFInputGui : public QWidget, public PluginInstanceGUI {
class HackRFInputGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
+2 -2
View File
@@ -94,7 +94,7 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources(const Orig
}
#ifdef SERVER_MODE
PluginInstanceGUI* HackRFInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* HackRFInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -105,7 +105,7 @@ PluginInstanceGUI* HackRFInputPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* HackRFInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* HackRFInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/hackrfinput/hackrfinputplugin.h
+1 -1
View File
@@ -38,7 +38,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);
plugins/samplesource/kiwisdr/kiwisdrgui.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
#include "device/deviceuiset.h"
KiwiSDRGui::KiwiSDRGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::KiwiSDRGui),
m_deviceUISet(deviceUISet),
m_settings(),
plugins/samplesource/kiwisdr/kiwisdrgui.h
+2 -2
View File
@@ -19,7 +19,7 @@
#ifndef _KIWISDR_KIWISDRGUI_H_
#define _KIWISDR_KIWISDRGUI_H_
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -34,7 +34,7 @@ namespace Ui {
class KiwiSDRGui;
}
class KiwiSDRGui : public QWidget, public PluginInstanceGUI {
class KiwiSDRGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/kiwisdr/kiwisdrplugin.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ PluginInterface::SamplingDevices KiwiSDRPlugin::enumSampleSources(const OriginDe
}
#ifdef SERVER_MODE
PluginInstanceGUI* KiwiSDRPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* KiwiSDRPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -112,7 +112,7 @@ PluginInstanceGUI* KiwiSDRPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* KiwiSDRPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* KiwiSDRPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/kiwisdr/kiwisdrplugin.h
+1 -1
View File
@@ -39,7 +39,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);
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
#include "device/deviceuiset.h"
LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::LimeSDRInputGUI),
m_deviceUISet(deviceUISet),
m_settings(),
plugins/samplesource/limesdrinput/limesdrinputgui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTGUI_H_
#define PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTGUI_H_
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -32,7 +32,7 @@ namespace Ui {
class LimeSDRInputGUI;
}
class LimeSDRInputGUI : public QWidget, public PluginInstanceGUI {
class LimeSDRInputGUI : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
+2 -2
View File
@@ -102,7 +102,7 @@ PluginInterface::SamplingDevices LimeSDRInputPlugin::enumSampleSources(const Ori
}
#ifdef SERVER_MODE
PluginInstanceGUI* LimeSDRInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* LimeSDRInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -113,7 +113,7 @@ PluginInstanceGUI* LimeSDRInputPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* LimeSDRInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* LimeSDRInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/limesdrinput/limesdrinputplugin.h
+1 -1
View File
@@ -38,7 +38,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);
plugins/samplesource/localinput/localinputgui.cpp
+1 -1
View File
@@ -46,7 +46,7 @@
LocalInputGui::LocalInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::LocalInputGui),
m_deviceUISet(deviceUISet),
m_settings(),
plugins/samplesource/localinput/localinputgui.h
+2 -2
View File
@@ -22,7 +22,7 @@
#include <QWidget>
#include <QNetworkRequest>
#include "plugin/plugininstancegui.h"
#include "device/devicegui.h"
#include "util/messagequeue.h"
#include "localinput.h"
@@ -36,7 +36,7 @@ namespace Ui {
class LocalInputGui;
}
class LocalInputGui : public QWidget, public PluginInstanceGUI {
class LocalInputGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/localinput/localinputplugin.cpp
+2 -2
View File
@@ -100,7 +100,7 @@ PluginInterface::SamplingDevices LocalInputPlugin::enumSampleSources(const Origi
}
#ifdef SERVER_MODE
PluginInstanceGUI* LocalInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* LocalInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -111,7 +111,7 @@ PluginInstanceGUI* LocalInputPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* LocalInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* LocalInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/localinput/localinputplugin.h
+1 -1
View File
@@ -38,7 +38,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);
plugins/samplesource/perseus/perseusgui.cpp
+1 -1
View File
@@ -32,7 +32,7 @@
#include "perseusgui.h"
PerseusGui::PerseusGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::PerseusGui),
m_deviceUISet(deviceUISet),
m_doApplySettings(true),
plugins/samplesource/perseus/perseusgui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef PLUGINS_SAMPLESOURCE_PERSEUS_PERSEUSGUI_H_
#define PLUGINS_SAMPLESOURCE_PERSEUS_PERSEUSGUI_H_
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -32,7 +32,7 @@ namespace Ui {
class PerseusGui;
}
class PerseusGui : public QWidget, public PluginInstanceGUI {
class PerseusGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/perseus/perseusplugin.cpp
+2 -2
View File
@@ -119,7 +119,7 @@ PluginInterface::SamplingDevices PerseusPlugin::enumSampleSources(const OriginDe
}
#ifdef SERVER_MODE
PluginInstanceGUI* PerseusPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* PerseusPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -130,7 +130,7 @@ PluginInstanceGUI* PerseusPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* PerseusPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* PerseusPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/perseus/perseusplugin.h
+1 -1
View File
@@ -38,7 +38,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);
plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
#include "plutosdrinputgui.h"
PlutoSDRInputGui::PlutoSDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::PlutoSDRInputGUI),
m_deviceUISet(deviceUISet),
m_settings(),
plugins/samplesource/plutosdrinput/plutosdrinputgui.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "util/messagequeue.h"
#include "plugin/plugininstancegui.h"
#include "device/devicegui.h"
#include "plutosdrinput.h"
#include "plutosdrinputsettings.h"
@@ -35,7 +35,7 @@ namespace Ui {
class PlutoSDRInputGUI;
}
class PlutoSDRInputGui : public QWidget, public PluginInstanceGUI {
class PlutoSDRInputGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp
+2 -2
View File
@@ -96,7 +96,7 @@ PluginInterface::SamplingDevices PlutoSDRInputPlugin::enumSampleSources(const Or
}
#ifdef SERVER_MODE
PluginInstanceGUI* PlutoSDRInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* PlutoSDRInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -107,7 +107,7 @@ PluginInstanceGUI* PlutoSDRInputPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* PlutoSDRInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* PlutoSDRInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/plutosdrinput/plutosdrinputplugin.h
+1 -1
View File
@@ -38,7 +38,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);
plugins/samplesource/remoteinput/remoteinputgui.cpp
+1 -1
View File
@@ -46,7 +46,7 @@
RemoteInputGui::RemoteInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::RemoteInputGui),
m_deviceUISet(deviceUISet),
m_settings(),
plugins/samplesource/remoteinput/remoteinputgui.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include <QWidget>
#include <QNetworkRequest>
#include "plugin/plugininstancegui.h"
#include "device/devicegui.h"
#include "util/messagequeue.h"
#include "remoteinput.h"
@@ -37,7 +37,7 @@ namespace Ui {
class RemoteInputGui;
}
class RemoteInputGui : public QWidget, public PluginInstanceGUI {
class RemoteInputGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/remoteinput/remoteinputplugin.cpp
+2 -2
View File
@@ -100,7 +100,7 @@ PluginInterface::SamplingDevices RemoteInputPlugin::enumSampleSources(const Orig
}
#ifdef SERVER_MODE
PluginInstanceGUI* RemoteInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* RemoteInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -111,7 +111,7 @@ PluginInstanceGUI* RemoteInputPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* RemoteInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* RemoteInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/remoteinput/remoteinputplugin.h
+1 -1
View File
@@ -38,7 +38,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);
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
#include "dsp/dspcommands.h"
RTLSDRGui::RTLSDRGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::RTLSDRGui),
m_deviceUISet(deviceUISet),
m_doApplySettings(true),
plugins/samplesource/rtlsdr/rtlsdrgui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef INCLUDE_RTLSDRGUI_H
#define INCLUDE_RTLSDRGUI_H
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -34,7 +34,7 @@ namespace Ui {
class RTLSDRSampleRates;
}
class RTLSDRGui : public QWidget, public PluginInstanceGUI {
class RTLSDRGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ PluginInterface::SamplingDevices RTLSDRPlugin::enumSampleSources(const OriginDev
}
#ifdef SERVER_MODE
PluginInstanceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -112,7 +112,7 @@ PluginInstanceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/rtlsdr/rtlsdrplugin.h
+1 -1
View File
@@ -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);
plugins/samplesource/sdrplay/sdrplaygui.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
SDRPlayGui::SDRPlayGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::SDRPlayGui),
m_deviceUISet(deviceUISet),
m_doApplySettings(true),
plugins/samplesource/sdrplay/sdrplaygui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef PLUGINS_SAMPLESOURCE_SDRPLAY_SDRPLAYGUI_H_
#define PLUGINS_SAMPLESOURCE_SDRPLAY_SDRPLAYGUI_H_
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
#include <vector>
@@ -34,7 +34,7 @@ namespace Ui {
class SDRPlayGui;
}
class SDRPlayGui : public QWidget, public PluginInstanceGUI {
class SDRPlayGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/sdrplay/sdrplayplugin.cpp
+2 -2
View File
@@ -122,7 +122,7 @@ PluginInterface::SamplingDevices SDRPlayPlugin::enumSampleSources(const OriginDe
}
#ifdef SERVER_MODE
PluginInstanceGUI* SDRPlayPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* SDRPlayPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -133,7 +133,7 @@ PluginInstanceGUI* SDRPlayPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* SDRPlayPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* SDRPlayPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/sdrplay/sdrplayplugin.h
+1 -1
View File
@@ -38,7 +38,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);
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);
plugins/samplesource/testsource/testsourcegui.cpp
+1 -1
View File
@@ -40,7 +40,7 @@
#include "device/deviceuiset.h"
TestSourceGui::TestSourceGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::TestSourceGui),
m_deviceUISet(deviceUISet),
m_settings(),
plugins/samplesource/testsource/testsourcegui.h
+2 -2
View File
@@ -18,7 +18,7 @@
#ifndef _TESTSOURCE_TESTSOURCEGUI_H_
#define _TESTSOURCE_TESTSOURCEGUI_H_
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -33,7 +33,7 @@ namespace Ui {
class TestSourceGui;
}
class TestSourceGui : public QWidget, public PluginInstanceGUI {
class TestSourceGui : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/testsource/testsourceplugin.cpp
+2 -2
View File
@@ -100,7 +100,7 @@ PluginInterface::SamplingDevices TestSourcePlugin::enumSampleSources(const Origi
}
#ifdef SERVER_MODE
PluginInstanceGUI* TestSourcePlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* TestSourcePlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -111,7 +111,7 @@ PluginInstanceGUI* TestSourcePlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* TestSourcePlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* TestSourcePlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/testsource/testsourceplugin.h
+1 -1
View File
@@ -38,7 +38,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);
plugins/samplesource/usrpinput/usrpinputgui.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#include "device/deviceuiset.h"
USRPInputGUI::USRPInputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::USRPInputGUI),
m_deviceUISet(deviceUISet),
m_settings(),
plugins/samplesource/usrpinput/usrpinputgui.h
+2 -2
View File
@@ -19,7 +19,7 @@
#ifndef PLUGINS_SAMPLESOURCE_USRPINPUT_USRPINPUTGUI_H_
#define PLUGINS_SAMPLESOURCE_USRPINPUT_USRPINPUTGUI_H_
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -33,7 +33,7 @@ namespace Ui {
class USRPInputGUI;
}
class USRPInputGUI : public QWidget, public PluginInstanceGUI {
class USRPInputGUI : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/usrpinput/usrpinputplugin.cpp
+2 -2
View File
@@ -102,7 +102,7 @@ PluginInterface::SamplingDevices USRPInputPlugin::enumSampleSources(const Origin
}
#ifdef SERVER_MODE
PluginInstanceGUI* USRPInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* USRPInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -113,7 +113,7 @@ PluginInstanceGUI* USRPInputPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* USRPInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* USRPInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/usrpinput/usrpinputplugin.h
+3 -3
View File
@@ -37,9 +37,9 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
virtual void enumOriginDevices(QStringList& listedHwIds, OriginDevices& originDevices);
virtual SamplingDevices enumSampleSources(const OriginDevices& originDevices);
virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
virtual void enumOriginDevices(QStringList& listedHwIds, OriginDevices& originDevices);
virtual SamplingDevices enumSampleSources(const OriginDevices& originDevices);
virtual DeviceGUI* createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet);
plugins/samplesource/xtrxinput/xtrxinputgui.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#include "device/deviceuiset.h"
XTRXInputGUI::XTRXInputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::XTRXInputGUI),
m_deviceUISet(deviceUISet),
m_settings(),
plugins/samplesource/xtrxinput/xtrxinputgui.h
+2 -2
View File
@@ -19,7 +19,7 @@
#ifndef PLUGINS_SAMPLESOURCE_XTRXINPUT_XTRXINPUTGUI_H_
#define PLUGINS_SAMPLESOURCE_XTRXINPUT_XTRXINPUTGUI_H_
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@@ -33,7 +33,7 @@ namespace Ui {
class XTRXInputGUI;
}
class XTRXInputGUI : public QWidget, public PluginInstanceGUI {
class XTRXInputGUI : public DeviceGUI {
Q_OBJECT
public:
plugins/samplesource/xtrxinput/xtrxinputplugin.cpp
+2 -2
View File
@@ -105,7 +105,7 @@ PluginInterface::SamplingDevices XTRXInputPlugin::enumSampleSources(const Origin
}
#ifdef SERVER_MODE
PluginInstanceGUI* XTRXInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* XTRXInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
@@ -116,7 +116,7 @@ PluginInstanceGUI* XTRXInputPlugin::createSampleSourcePluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* XTRXInputPlugin::createSampleSourcePluginInstanceGUI(
DeviceGUI* XTRXInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceUISet *deviceUISet)
plugins/samplesource/xtrxinput/xtrxinputplugin.h
+1 -1
View File
@@ -39,7 +39,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);