VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-04 23:14:47 -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/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);