VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -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/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);