VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-04-06 19:48:35 -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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelrx/demodlora/lorademodgui.h
View File

@ -1,7 +1,6 @@
#ifndef INCLUDE_LoRaDEMODGUI_H
#define INCLUDE_LoRaDEMODGUI_H
#include <plugin/plugininstancegui.h>
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "util/messagequeue.h"

2
plugins/samplesink/bladerf1output/bladerf1outputgui.cpp
View File

@ -32,7 +32,7 @@
#include "bladerf1outputgui.h"
Bladerf1OutputGui::Bladerf1OutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::Bladerf1OutputGui),
m_deviceUISet(deviceUISet),
m_doApplySettings(true),

4
plugins/samplesink/bladerf1output/bladerf1outputgui.h
View File

@ -18,7 +18,7 @@
#ifndef INCLUDE_BLADERFOUTPUTGUI_H
#define INCLUDE_BLADERFOUTPUTGUI_H
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@ -33,7 +33,7 @@ namespace Ui {
class Bladerf1OutputGui;
}
class Bladerf1OutputGui : public QWidget, public PluginInstanceGUI {
class Bladerf1OutputGui : public DeviceGUI {
Q_OBJECT
public:

4
plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp
View File

@ -93,7 +93,7 @@ PluginInterface::SamplingDevices Bladerf1OutputPlugin::enumSampleSinks(const Ori
}
#ifdef SERVER_MODE
PluginInstanceGUI* Bladerf1OutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* Bladerf1OutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@ -104,7 +104,7 @@ PluginInstanceGUI* Bladerf1OutputPlugin::createSampleSinkPluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* Bladerf1OutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* Bladerf1OutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)

2
plugins/samplesink/bladerf1output/bladerf1outputplugin.h
View File

@ -39,7 +39,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);

2
plugins/samplesink/bladerf2output/bladerf2outputgui.cpp
View File

@ -33,7 +33,7 @@
#include "bladerf2outputgui.h"
BladeRF2OutputGui::BladeRF2OutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::BladeRF2OutputGui),
m_deviceUISet(deviceUISet),
m_doApplySettings(true),

4
plugins/samplesink/bladerf2output/bladerf2outputgui.h
View File

@ -21,7 +21,7 @@
#include <QTimer>
#include <QWidget>
#include "plugin/plugininstancegui.h"
#include "device/devicegui.h"
#include "util/messagequeue.h"
#include "bladerf2output.h"
@ -33,7 +33,7 @@ namespace Ui {
class BladeRF2OutputGui;
}
class BladeRF2OutputGui : public QWidget, public PluginInstanceGUI {
class BladeRF2OutputGui : public DeviceGUI {
Q_OBJECT
public:

4
plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp
View File

@ -98,7 +98,7 @@ PluginInterface::SamplingDevices BladeRF2OutputPlugin::enumSampleSinks(const Ori
}
#ifdef SERVER_MODE
PluginInstanceGUI* BladeRF2OutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* BladeRF2OutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@ -109,7 +109,7 @@ PluginInstanceGUI* BladeRF2OutputPlugin::createSampleSinkPluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* BladeRF2OutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* BladeRF2OutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)

2
plugins/samplesink/bladerf2output/bladerf2outputplugin.h
View File

@ -39,7 +39,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);

2
plugins/samplesink/fileoutput/fileoutputgui.cpp
View File

@ -37,7 +37,7 @@
#include "fileoutputgui.h"
FileOutputGui::FileOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::FileOutputGui),
m_deviceUISet(deviceUISet),
m_doApplySettings(true),

4
plugins/samplesink/fileoutput/fileoutputgui.h
View File

@ -18,7 +18,7 @@
#ifndef INCLUDE_FILEOUTPUTGUI_H
#define INCLUDE_FILEOUTPUTGUI_H
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@ -35,7 +35,7 @@ namespace Ui {
class FileOutputGui;
}
class FileOutputGui : public QWidget, public PluginInstanceGUI {
class FileOutputGui : public DeviceGUI {
Q_OBJECT
public:

4
plugins/samplesink/fileoutput/fileoutputplugin.cpp
View File

@ -99,7 +99,7 @@ PluginInterface::SamplingDevices FileOutputPlugin::enumSampleSinks(const OriginD
}
#ifdef SERVER_MODE
PluginInstanceGUI* FileOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* FileOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@ -110,7 +110,7 @@ PluginInstanceGUI* FileOutputPlugin::createSampleSinkPluginInstanceGUI(
return nullptr;
}
#else
PluginInstanceGUI* FileOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* FileOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)

2
plugins/samplesink/fileoutput/fileoutputplugin.h
View File

@ -39,7 +39,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);

2
plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
View File

@ -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),

4
plugins/samplesink/hackrfoutput/hackrfoutputgui.h
View File

@ -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:

4
plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp
View File

@ -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)

2
plugins/samplesink/hackrfoutput/hackrfoutputplugin.h
View File

@ -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);

2
plugins/samplesink/limesdroutput/limesdroutputgui.cpp
View File

@ -30,7 +30,7 @@
#include "limesdroutputgui.h"
LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::LimeSDROutputGUI),
m_deviceUISet(deviceUISet),
m_settings(),

4
plugins/samplesink/limesdroutput/limesdroutputgui.h
View File

@ -18,7 +18,7 @@
#ifndef PLUGINS_SAMPLESOURCE_LIMESDROUTPUT_LIMESDROUTPUTGUI_H_
#define PLUGINS_SAMPLESOURCE_LIMESDROUTPUT_LIMESDROUTPUTGUI_H_
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@ -33,7 +33,7 @@ namespace Ui {
class LimeSDROutputGUI;
}
class LimeSDROutputGUI : public QWidget, public PluginInstanceGUI {
class LimeSDROutputGUI : public DeviceGUI {
Q_OBJECT
public:

4
plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
View File

@ -102,7 +102,7 @@ PluginInterface::SamplingDevices LimeSDROutputPlugin::enumSampleSinks(const Orig
}
#ifdef SERVER_MODE
PluginInstanceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@ -113,7 +113,7 @@ PluginInstanceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)

2
plugins/samplesink/limesdroutput/limesdroutputplugin.h
View File

@ -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);

2
plugins/samplesink/localoutput/localoutputgui.cpp
View File

@ -45,7 +45,7 @@
LocalOutputGui::LocalOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::LocalOutputGui),
m_deviceUISet(deviceUISet),
m_settings(),

4
plugins/samplesink/localoutput/localoutputgui.h
View File

@ -22,7 +22,7 @@
#include <QWidget>
#include <QNetworkRequest>
#include "plugin/plugininstancegui.h"
#include "device/devicegui.h"
#include "util/messagequeue.h"
#include "localoutput.h"
@ -36,7 +36,7 @@ namespace Ui {
class LocalOutputGui;
}
class LocalOutputGui : public QWidget, public PluginInstanceGUI {
class LocalOutputGui : public DeviceGUI {
Q_OBJECT
public:

4
plugins/samplesink/localoutput/localoutputplugin.cpp
View File

@ -100,7 +100,7 @@ PluginInterface::SamplingDevices LocalOutputPlugin::enumSampleSinks(const Origin
}
#ifdef SERVER_MODE
PluginInstanceGUI* LocalOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* LocalOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@ -111,7 +111,7 @@ PluginInstanceGUI* LocalOutputPlugin::createSampleSinkPluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* LocalOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* LocalOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)

2
plugins/samplesink/localoutput/localoutputplugin.h
View File

@ -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);

2
plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp
View File

@ -32,7 +32,7 @@
#include "ui_plutosdroutputgui.h"
PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::PlutoSDROutputGUI),
m_deviceUISet(deviceUISet),
m_settings(),

4
plugins/samplesink/plutosdroutput/plutosdroutputgui.h
View File

@ -23,7 +23,7 @@
#include <QTimer>
#include "util/messagequeue.h"
#include "plugin/plugininstancegui.h"
#include "device/devicegui.h"
#include "plutosdroutput.h"
#include "plutosdroutputsettings.h"
@ -35,7 +35,7 @@ namespace Ui {
class PlutoSDROutputGUI;
}
class PlutoSDROutputGUI : public QWidget, public PluginInstanceGUI {
class PlutoSDROutputGUI : public DeviceGUI {
Q_OBJECT
public:

4
plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp
View File

@ -94,7 +94,7 @@ PluginInterface::SamplingDevices PlutoSDROutputPlugin::enumSampleSinks(const Ori
}
#ifdef SERVER_MODE
PluginInstanceGUI* PlutoSDROutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* PlutoSDROutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@ -105,7 +105,7 @@ PluginInstanceGUI* PlutoSDROutputPlugin::createSampleSinkPluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* PlutoSDROutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* PlutoSDROutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)

2
plugins/samplesink/plutosdroutput/plutosdroutputplugin.h
View File

@ -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);

2
plugins/samplesink/remoteoutput/remoteoutputgui.cpp
View File

@ -47,7 +47,7 @@
#include "udpsinkfec.h"
RemoteOutputSinkGui::RemoteOutputSinkGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::RemoteOutputGui),
m_deviceUISet(deviceUISet),
m_settings(),

4
plugins/samplesink/remoteoutput/remoteoutputgui.h
View File

@ -25,7 +25,7 @@
#include <QWidget>
#include <QNetworkRequest>
#include "plugin/plugininstancegui.h"
#include "device/devicegui.h"
#include "util/messagequeue.h"
#include "util/limitedcounter.h"
@ -69,7 +69,7 @@ private:
float m_s;
};
class RemoteOutputSinkGui : public QWidget, public PluginInstanceGUI {
class RemoteOutputSinkGui : public DeviceGUI {
Q_OBJECT
public:

4
plugins/samplesink/remoteoutput/remoteoutputplugin.cpp
View File

@ -100,7 +100,7 @@ PluginInterface::SamplingDevices RemoteOutputPlugin::enumSampleSinks(const Origi
}
#ifdef SERVER_MODE
PluginInstanceGUI* RemoteOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* RemoteOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@ -111,7 +111,7 @@ PluginInstanceGUI* RemoteOutputPlugin::createSampleSinkPluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* RemoteOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* RemoteOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)

2
plugins/samplesink/remoteoutput/remoteoutputplugin.h
View File

@ -39,7 +39,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);

2
plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp
View File

@ -39,7 +39,7 @@
#include "soapysdroutputgui.h"
SoapySDROutputGui::SoapySDROutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::SoapySDROutputGui),
m_deviceUISet(deviceUISet),
m_forceSettings(true),

4
plugins/samplesink/soapysdroutput/soapysdroutputgui.h
View File

@ -21,7 +21,7 @@
#include <QTimer>
#include <QWidget>
#include "plugin/plugininstancegui.h"
#include "device/devicegui.h"
#include "util/messagequeue.h"
#include "soapysdroutput.h"
@ -41,7 +41,7 @@ namespace Ui {
class SoapySDROutputGui;
}
class SoapySDROutputGui : public QWidget, public PluginInstanceGUI {
class SoapySDROutputGui : public DeviceGUI {
Q_OBJECT
public:

4
plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp
View File

@ -104,7 +104,7 @@ PluginInterface::SamplingDevices SoapySDROutputPlugin::enumSampleSinks(const Ori
}
#ifdef SERVER_MODE
PluginInstanceGUI* SoapySDROutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* SoapySDROutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@ -115,7 +115,7 @@ PluginInstanceGUI* SoapySDROutputPlugin::createSampleSinkPluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* SoapySDROutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* SoapySDROutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)

2
plugins/samplesink/soapysdroutput/soapysdroutputplugin.h
View File

@ -39,7 +39,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);

2
plugins/samplesink/testsink/testsinkgui.cpp
View File

@ -36,7 +36,7 @@
#include "testsinkgui.h"
TestSinkGui::TestSinkGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::TestSinkGui),
m_deviceUISet(deviceUISet),
m_doApplySettings(true),

4
plugins/samplesink/testsink/testsinkgui.h
View File

@ -18,7 +18,7 @@
#ifndef INCLUDE_TESTSINKGUI_H
#define INCLUDE_TESTSINKGUI_H
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@ -36,7 +36,7 @@ namespace Ui {
class TestSinkGui;
}
class TestSinkGui : public QWidget, public PluginInstanceGUI {
class TestSinkGui : public DeviceGUI {
Q_OBJECT
public:

4
plugins/samplesink/testsink/testsinkplugin.cpp
View File

@ -99,7 +99,7 @@ PluginInterface::SamplingDevices TestSinkPlugin::enumSampleSinks(const OriginDev
}
#ifdef SERVER_MODE
PluginInstanceGUI* TestSinkPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* TestSinkPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@ -110,7 +110,7 @@ PluginInstanceGUI* TestSinkPlugin::createSampleSinkPluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* TestSinkPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* TestSinkPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)

2
plugins/samplesink/testsink/testsinkplugin.h
View File

@ -39,7 +39,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);

2
plugins/samplesink/usrpoutput/usrpoutputgui.cpp
View File

@ -31,7 +31,7 @@
#include "usrpoutputgui.h"
USRPOutputGUI::USRPOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::USRPOutputGUI),
m_deviceUISet(deviceUISet),
m_settings(),

4
plugins/samplesink/usrpoutput/usrpoutputgui.h
View File

@ -19,7 +19,7 @@
#ifndef PLUGINS_SAMPLESOURCE_USRPOUTPUT_USRPOUTPUTGUI_H_
#define PLUGINS_SAMPLESOURCE_USRPOUTPUT_USRPOUTPUTGUI_H_
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@ -34,7 +34,7 @@ namespace Ui {
class USRPOutputGUI;
}
class USRPOutputGUI : public QWidget, public PluginInstanceGUI {
class USRPOutputGUI : public DeviceGUI {
Q_OBJECT
public:

4
plugins/samplesink/usrpoutput/usrpoutputplugin.cpp
View File

@ -102,7 +102,7 @@ PluginInterface::SamplingDevices USRPOutputPlugin::enumSampleSinks(const OriginD
}
#ifdef SERVER_MODE
PluginInstanceGUI* USRPOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* USRPOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@ -113,7 +113,7 @@ PluginInstanceGUI* USRPOutputPlugin::createSampleSinkPluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* USRPOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* USRPOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)

6
plugins/samplesink/usrpoutput/usrpoutputplugin.h
View File

@ -37,9 +37,9 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
virtual void enumOriginDevices(QStringList& listedHwIds, OriginDevices& originDevices);
virtual SamplingDevices enumSampleSinks(const OriginDevices& originDevices);
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
virtual void enumOriginDevices(QStringList& listedHwIds, OriginDevices& originDevices);
virtual SamplingDevices enumSampleSinks(const OriginDevices& originDevices);
virtual DeviceGUI* createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet);

2
plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp
View File

@ -32,7 +32,7 @@
#include "xtrxoutputgui.h"
XTRXOutputGUI::XTRXOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
DeviceGUI(parent),
ui(new Ui::XTRXOutputGUI),
m_deviceUISet(deviceUISet),
m_settings(),

4
plugins/samplesink/xtrxoutput/xtrxoutputgui.h
View File

@ -18,7 +18,7 @@
#ifndef PLUGINS_SAMPLESINK_XTRXOUTPUT_XTRXOUTPUTGUI_H_
#define PLUGINS_SAMPLESINK_XTRXOUTPUT_XTRXOUTPUTGUI_H_
#include <plugin/plugininstancegui.h>
#include <device/devicegui.h>
#include <QTimer>
#include <QWidget>
@ -32,7 +32,7 @@ namespace Ui {
class XTRXOutputGUI;
}
class XTRXOutputGUI : public QWidget, public PluginInstanceGUI {
class XTRXOutputGUI : public DeviceGUI {
Q_OBJECT
public:

4
plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp
View File

@ -103,7 +103,7 @@ PluginInterface::SamplingDevices XTRXOutputPlugin::enumSampleSinks(const OriginD
}
#ifdef SERVER_MODE
PluginInstanceGUI* XTRXOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* XTRXOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)
@ -114,7 +114,7 @@ PluginInstanceGUI* XTRXOutputPlugin::createSampleSinkPluginInstanceGUI(
return 0;
}
#else
PluginInstanceGUI* XTRXOutputPlugin::createSampleSinkPluginInstanceGUI(
DeviceGUI* XTRXOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceUISet *deviceUISet)

2
plugins/samplesink/xtrxoutput/xtrxoutputplugin.h
View File

@ -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);

2
plugins/samplesource/airspy/airspygui.cpp
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),

4
plugins/samplesource/airspy/airspygui.h
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:

6
plugins/samplesource/airspy/airspyplugin.cpp
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();
}
}

2
plugins/samplesource/airspy/airspyplugin.h
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);

2
plugins/samplesource/airspyhf/airspyhfgui.cpp
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),

4
plugins/samplesource/airspyhf/airspyhfgui.h
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:

6
plugins/samplesource/airspyhf/airspyhfplugin.cpp
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();
}
}

2
plugins/samplesource/airspyhf/airspyhfplugin.h
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);

2
plugins/samplesource/bladerf1input/bladerf1inputgui.cpp
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),

4
plugins/samplesource/bladerf1input/bladerf1inputgui.h
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:

4
plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp
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)

2
plugins/samplesource/bladerf1input/bladerf1inputplugin.h
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);

2
plugins/samplesource/bladerf2input/bladerf2inputgui.cpp
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),

4
plugins/samplesource/bladerf2input/bladerf2inputgui.h
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:

4
plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp
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)

2
plugins/samplesource/bladerf2input/bladerf2inputplugin.h
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);

2
plugins/samplesource/fcdpro/fcdprogui.cpp
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),

4
plugins/samplesource/fcdpro/fcdprogui.h
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:

4
plugins/samplesource/fcdpro/fcdproplugin.cpp
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)

2
plugins/samplesource/fcdpro/fcdproplugin.h
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);

2
plugins/samplesource/fcdproplus/fcdproplusgui.cpp
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),

4
plugins/samplesource/fcdproplus/fcdproplusgui.h
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:

4
plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
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)

2
plugins/samplesource/fcdproplus/fcdproplusplugin.h
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);

2
plugins/samplesource/fileinput/fileinputgui.cpp
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(),

4
plugins/samplesource/fileinput/fileinputgui.h
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:

4
plugins/samplesource/fileinput/fileinputplugin.cpp
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)

2
plugins/samplesource/fileinput/fileinputplugin.h
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);

2
plugins/samplesource/hackrfinput/hackrfinputgui.cpp
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(),

4
plugins/samplesource/hackrfinput/hackrfinputgui.h
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:

4
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
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)

2
plugins/samplesource/hackrfinput/hackrfinputplugin.h
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);

2
plugins/samplesource/kiwisdr/kiwisdrgui.cpp
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(),

4
plugins/samplesource/kiwisdr/kiwisdrgui.h
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:

4
plugins/samplesource/kiwisdr/kiwisdrplugin.cpp
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)

2
plugins/samplesource/kiwisdr/kiwisdrplugin.h
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);

2
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
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(),

4
plugins/samplesource/limesdrinput/limesdrinputgui.h
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:

4
plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
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)

2
plugins/samplesource/limesdrinput/limesdrinputplugin.h
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);

2
plugins/samplesource/localinput/localinputgui.cpp
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(),

4
plugins/samplesource/localinput/localinputgui.h
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:

4
plugins/samplesource/localinput/localinputplugin.cpp
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)

2
plugins/samplesource/localinput/localinputplugin.h
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);

2
plugins/samplesource/perseus/perseusgui.cpp
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),

4
plugins/samplesource/perseus/perseusgui.h
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:

4
plugins/samplesource/perseus/perseusplugin.cpp
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)

2
plugins/samplesource/perseus/perseusplugin.h
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);

2
plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
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(),

4
plugins/samplesource/plutosdrinput/plutosdrinputgui.h
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:

4
plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp
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)

Some files were not shown because too many files have changed in this diff Show More