VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-25 11:34:09 -04:00
Code Issues Projects Releases Wiki Activity

GUI segregation: renamed PluginGUI interface to PluginInstanceUI

Browse Source
This commit is contained in:
f4exb
2017-09-03 19:55:00 +02:00
parent e281d8fd32
commit a6d6a717ae
116 changed files with 191 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/airspy/airspygui.h
+2 -2
View File
@@ -17,11 +17,11 @@
#ifndef INCLUDE_AIRSPYGUI_H
#define INCLUDE_AIRSPYGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "airspyinput.h"
#include "plugin/plugingui.h"
#define AIRSPY_MAX_DEVICE (32)
@@ -33,7 +33,7 @@ namespace Ui {
class AirspySampleRates;
}
class AirspyGui : public QWidget, public PluginGUI {
class AirspyGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/airspy/airspyplugin.cpp
+1 -1
View File
@@ -119,7 +119,7 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources()
return result;
}
PluginGUI* AirspyPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* AirspyPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if (sourceId == m_deviceTypeID)
{
plugins/samplesource/airspy/airspyplugin.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;
plugins/samplesource/bladerfinput/bladerfinputgui.h
+2 -2
View File
@@ -17,10 +17,10 @@
#ifndef INCLUDE_BLADERFINPUTGUI_H
#define INCLUDE_BLADERFINPUTGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "bladerfinput.h"
class DeviceSourceAPI;
@@ -30,7 +30,7 @@ namespace Ui {
class BladerfInputGui;
}
class BladerfInputGui : public QWidget, public PluginGUI {
class BladerfInputGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ PluginInterface::SamplingDevices BlderfInputPlugin::enumSampleSources()
return result;
}
PluginGUI* BlderfInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* BlderfInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{
plugins/samplesource/bladerfinput/bladerfinputplugin.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;
plugins/samplesource/fcdpro/fcdprogui.h
+2 -2
View File
@@ -17,11 +17,11 @@
#ifndef INCLUDE_FCDPROGUI_H
#define INCLUDE_FCDPROGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "fcdproinput.h"
#include "plugin/plugingui.h"
class DeviceSourceAPI;
class FileRecord;
@@ -31,7 +31,7 @@ namespace Ui {
class FCDProGui;
}
class FCDProGui : public QWidget, public PluginGUI {
class FCDProGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/fcdpro/fcdproplugin.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ PluginInterface::SamplingDevices FCDProPlugin::enumSampleSources()
return result;
}
PluginGUI* FCDProPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* FCDProPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == fcd_traits<Pro>::interfaceIID)
{
plugins/samplesource/fcdpro/fcdproplugin.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;
plugins/samplesource/fcdproplus/fcdproplusgui.h
+2 -2
View File
@@ -17,11 +17,11 @@
#ifndef INCLUDE_FCDGUI_H
#define INCLUDE_FCDGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "fcdproplusinput.h"
#include "plugin/plugingui.h"
class DeviceSourceAPI;
class FileRecord;
@@ -30,7 +30,7 @@ namespace Ui {
class FCDProPlusGui;
}
class FCDProPlusGui : public QWidget, public PluginGUI {
class FCDProPlusGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ PluginInterface::SamplingDevices FCDProPlusPlugin::enumSampleSources()
return result;
}
PluginGUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == fcd_traits<ProPlus>::interfaceIID)
{
plugins/samplesource/fcdproplus/fcdproplusplugin.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_deviceTypeID;
plugins/samplesource/filesource/filesourcegui.h
+2 -3
View File
@@ -17,11 +17,10 @@
#ifndef INCLUDE_FILESOURCEGUI_H
#define INCLUDE_FILESOURCEGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "filesourceinput.h"
class DeviceSourceAPI;
@@ -30,7 +29,7 @@ namespace Ui {
class FileSourceGui;
}
class FileSourceGui : public QWidget, public PluginGUI {
class FileSourceGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/filesource/filesourceplugin.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ PluginInterface::SamplingDevices FileSourcePlugin::enumSampleSources()
return result;
}
PluginGUI* FileSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* FileSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{
plugins/samplesource/filesource/filesourceplugin.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;
plugins/samplesource/hackrfinput/hackrfinputgui.h
+2 -2
View File
@@ -17,10 +17,10 @@
#ifndef INCLUDE_HACKRFINPUTGUI_H
#define INCLUDE_HACKRFINPUTGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "../hackrfinput/hackrfinput.h"
#define HACKRF_MAX_DEVICE (32)
@@ -32,7 +32,7 @@ namespace Ui {
class HackRFInputGui;
}
class HackRFInputGui : public QWidget, public PluginGUI {
class HackRFInputGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
+1 -1
View File
@@ -117,7 +117,7 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources()
return result;
}
PluginGUI* HackRFInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* HackRFInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{
plugins/samplesource/hackrfinput/hackrfinputplugin.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;
plugins/samplesource/limesdrinput/limesdrinputgui.h
+2 -2
View File
@@ -17,10 +17,10 @@
#ifndef PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTGUI_H_
#define PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTGUI_H_
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "limesdrinput.h"
class DeviceSourceAPI;
@@ -30,7 +30,7 @@ namespace Ui {
class LimeSDRInputGUI;
}
class LimeSDRInputGUI : public QWidget, public PluginGUI {
class LimeSDRInputGUI : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ PluginInterface::SamplingDevices LimeSDRInputPlugin::enumSampleSources()
return result;
}
PluginGUI* LimeSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* LimeSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{
plugins/samplesource/limesdrinput/limesdrinputplugin.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;
plugins/samplesource/plutosdrinput/plutosdrinputgui.h
+2 -2
View File
@@ -17,15 +17,15 @@
#ifndef PLUGINS_SAMPLESOURCE_PLUTOSDRINPUT_PLUTOSDRINPUTGUI_H_
#define PLUGINS_SAMPLESOURCE_PLUTOSDRINPUT_PLUTOSDRINPUTGUI_H_
#include <plugin/plugininstanceui.h>
#include <QObject>
#include <QWidget>
#include "plugin/plugingui.h"
#include "plutosdrinputsettings.h"
class DeviceSourceAPI;
class PlutoSDRInputGui : public QWidget, public PluginGUI {
class PlutoSDRInputGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp
+1 -1
View File
@@ -80,7 +80,7 @@ PluginInterface::SamplingDevices PlutoSDRInputPlugin::enumSampleSources()
return result;
}
PluginGUI* PlutoSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* PlutoSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{
plugins/samplesource/plutosdrinput/plutosdrinputplugin.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;
plugins/samplesource/rtlsdr/rtlsdrgui.h
+2 -2
View File
@@ -17,10 +17,10 @@
#ifndef INCLUDE_RTLSDRGUI_H
#define INCLUDE_RTLSDRGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "rtlsdrinput.h"
class DeviceSourceAPI;
@@ -31,7 +31,7 @@ namespace Ui {
class RTLSDRSampleRates;
}
class RTLSDRGui : public QWidget, public PluginGUI {
class RTLSDRGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ PluginInterface::SamplingDevices RTLSDRPlugin::enumSampleSources()
return result;
}
PluginGUI* RTLSDRPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* RTLSDRPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID) {
RTLSDRGui* gui = new RTLSDRGui(deviceAPI);
plugins/samplesource/rtlsdr/rtlsdrplugin.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;
plugins/samplesource/sdrdaemon/sdrdaemongui.h
+2 -3
View File
@@ -17,12 +17,11 @@
#ifndef INCLUDE_SDRDAEMONGUI_H
#define INCLUDE_SDRDAEMONGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include <sys/time.h>
#include "plugin/plugingui.h"
#include "sdrdaemoninput.h"
class DeviceSourceAPI;
@@ -32,7 +31,7 @@ namespace Ui {
class SDRdaemonGui;
}
class SDRdaemonGui : public QWidget, public PluginGUI {
class SDRdaemonGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ PluginInterface::SamplingDevices SDRdaemonPlugin::enumSampleSources()
return result;
}
PluginGUI* SDRdaemonPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* SDRdaemonPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{
plugins/samplesource/sdrdaemon/sdrdaemonplugin.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h
+2 -3
View File
@@ -17,12 +17,11 @@
#ifndef INCLUDE_SDRDAEMONSOURCEGUI_H
#define INCLUDE_SDRDAEMONSOURCEGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include <sys/time.h>
#include "plugin/plugingui.h"
#include "sdrdaemonsourceinput.h"
class DeviceSourceAPI;
@@ -32,7 +31,7 @@ namespace Ui {
class SDRdaemonSourceGui;
}
class SDRdaemonSourceGui : public QWidget, public PluginGUI {
class SDRdaemonSourceGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ PluginInterface::SamplingDevices SDRdaemonSourcePlugin::enumSampleSources()
return result;
}
PluginGUI* SDRdaemonSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* SDRdaemonSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;
plugins/samplesource/sdrplay/sdrplaygui.h
+2 -3
View File
@@ -17,12 +17,11 @@
#ifndef PLUGINS_SAMPLESOURCE_SDRPLAY_SDRPLAYGUI_H_
#define PLUGINS_SAMPLESOURCE_SDRPLAY_SDRPLAYGUI_H_
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include <vector>
#include "plugin/plugingui.h"
#include "sdrplayinput.h"
#include "sdrplaysettings.h"
@@ -34,7 +33,7 @@ namespace Ui {
class SDRPlayGui;
}
class SDRPlayGui : public QWidget, public PluginGUI {
class SDRPlayGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:
plugins/samplesource/sdrplay/sdrplayplugin.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ PluginInterface::SamplingDevices SDRPlayPlugin::enumSampleSources()
return result;
}
PluginGUI* SDRPlayPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* SDRPlayPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{
plugins/samplesource/sdrplay/sdrplayplugin.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;