VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-12 22:05:23 -04:00
Code Issues Projects Releases Wiki Activity

Removed dangling PluginInstanceGUI references

Browse Source
This commit is contained in:
f4exb 2020-10-05 16:28:58 +02:00
parent 6ebf4569bf
commit 31bf99a619
31 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelrx/chanalyzer/chanalyzergui.h
View File

@ -18,7 +18,6 @@
#ifndef INCLUDE_CHANNELANALYZERNGGUI_H #ifndef INCLUDE_CHANNELANALYZERNGGUI_H
#define INCLUDE_CHANNELANALYZERNGGUI_H #define INCLUDE_CHANNELANALYZERNGGUI_H
#include "plugin/plugininstancegui.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "dsp/dsptypes.h" #include "dsp/dsptypes.h"

1
plugins/channelrx/demodam/amdemodgui.h
View File

@ -3,7 +3,6 @@
#include <QIcon> #include <QIcon>
#include "plugin/plugininstancegui.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "dsp/movingaverage.h" #include "dsp/movingaverage.h"

1
plugins/channelrx/demodatv/atvdemodgui.h
View File

@ -19,7 +19,6 @@
#ifndef INCLUDE_ATVDEMODGUI_H #ifndef INCLUDE_ATVDEMODGUI_H
#define INCLUDE_ATVDEMODGUI_H #define INCLUDE_ATVDEMODGUI_H
#include <plugin/plugininstancegui.h>
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "util/movingaverage.h" #include "util/movingaverage.h"

1
plugins/channelrx/demodbfm/bfmdemodgui.h
View File

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

1
plugins/channelrx/demoddatv/datvdemodgui.h
View File

@ -21,7 +21,6 @@
#define INCLUDE_DATVDEMODGUI_H #define INCLUDE_DATVDEMODGUI_H
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "plugin/plugininstancegui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "dsp/movingaverage.h" #include "dsp/movingaverage.h"

1
plugins/channelrx/demoddsd/dsddemodgui.h
View File

@ -19,7 +19,6 @@
#ifndef INCLUDE_DSDDEMODGUI_H #ifndef INCLUDE_DSDDEMODGUI_H
#define INCLUDE_DSDDEMODGUI_H #define INCLUDE_DSDDEMODGUI_H
#include <plugin/plugininstancegui.h>
#include <QMenu> #include <QMenu>
#include "channel/channelgui.h" #include "channel/channelgui.h"

1
plugins/channelrx/demodfreedv/freedvdemodgui.h
View File

@ -20,7 +20,6 @@
#include <QIcon> #include <QIcon>
#include "plugin/plugininstancegui.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "dsp/movingaverage.h" #include "dsp/movingaverage.h"

1
plugins/channelrx/demodnfm/nfmdemodgui.h
View File

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

1
plugins/channelrx/demodssb/ssbdemodgui.h
View File

@ -3,7 +3,6 @@
#include <QIcon> #include <QIcon>
#include "plugin/plugininstancegui.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "dsp/movingaverage.h" #include "dsp/movingaverage.h"

1
plugins/channelrx/demodwfm/wfmdemodgui.h
View File

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

1
plugins/channelrx/filesink/filesinkgui.h
View File

@ -22,7 +22,6 @@
#include <QObject> #include <QObject>
#include "plugin/plugininstancegui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "util/messagequeue.h" #include "util/messagequeue.h"

1
plugins/channelrx/freqtracker/freqtrackergui.h
View File

@ -20,7 +20,6 @@
#include <QIcon> #include <QIcon>
#include "plugin/plugininstancegui.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "dsp/movingaverage.h" #include "dsp/movingaverage.h"

1
plugins/channelrx/localsink/localsinkgui.h
View File

@ -22,7 +22,6 @@
#include <QObject> #include <QObject>
#include "plugin/plugininstancegui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "util/messagequeue.h" #include "util/messagequeue.h"

1
plugins/channelrx/remotesink/remotesinkgui.h
View File

@ -22,7 +22,6 @@
#include <QObject> #include <QObject>
#include "plugin/plugininstancegui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "util/messagequeue.h" #include "util/messagequeue.h"

1
plugins/channelrx/udpsink/udpsinkgui.h
View File

@ -19,7 +19,6 @@
#ifndef INCLUDE_UDPSRCGUI_H #ifndef INCLUDE_UDPSRCGUI_H
#define INCLUDE_UDPSRCGUI_H #define INCLUDE_UDPSRCGUI_H
#include <plugin/plugininstancegui.h>
#include <QHostAddress> #include <QHostAddress>
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"

1
plugins/channeltx/filesource/filesourcegui.h
View File

@ -18,7 +18,6 @@
#ifndef PLUGINS_CHANNELTX_FILESOURCE_FILESOURCEGUI_H_ #ifndef PLUGINS_CHANNELTX_FILESOURCE_FILESOURCEGUI_H_
#define PLUGINS_CHANNELTX_FILESOURCE_FILESOURCEGUI_H_ #define PLUGINS_CHANNELTX_FILESOURCE_FILESOURCEGUI_H_
#include "plugin/plugininstancegui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "util/messagequeue.h" #include "util/messagequeue.h"

1
plugins/channeltx/localsource/localsourcegui.h
View File

@ -22,7 +22,6 @@
#include <QObject> #include <QObject>
#include "plugin/plugininstancegui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "util/messagequeue.h" #include "util/messagequeue.h"

1
plugins/channeltx/modatv/atvmodgui.h
View File

@ -18,7 +18,6 @@
#ifndef PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_ #ifndef PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_
#define PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_ #define PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_
#include <plugin/plugininstancegui.h>
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "util/movingaverage.h" #include "util/movingaverage.h"

1
plugins/channeltx/modfreedv/freedvmodgui.h
View File

@ -20,7 +20,6 @@
#include <QIcon> #include <QIcon>
#include <plugin/plugininstancegui.h>
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "util/movingaverage.h" #include "util/movingaverage.h"

1
plugins/channeltx/modnfm/nfmmodgui.h
View File

@ -18,7 +18,6 @@
#ifndef PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_ #ifndef PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_
#define PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_ #define PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_
#include <plugin/plugininstancegui.h>
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "util/movingaverage.h" #include "util/movingaverage.h"

1
plugins/channeltx/modpacket/packetmodgui.h
View File

@ -19,7 +19,6 @@
#ifndef PLUGINS_CHANNELTX_MODPACKET_PACKETMODGUI_H_ #ifndef PLUGINS_CHANNELTX_MODPACKET_PACKETMODGUI_H_
#define PLUGINS_CHANNELTX_MODPACKET_PACKETMODGUI_H_ #define PLUGINS_CHANNELTX_MODPACKET_PACKETMODGUI_H_
#include <plugin/plugininstancegui.h>
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "util/movingaverage.h" #include "util/movingaverage.h"

1
plugins/channeltx/modssb/ssbmodgui.h
View File

@ -20,7 +20,6 @@
#include <QIcon> #include <QIcon>
#include <plugin/plugininstancegui.h>
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "util/movingaverage.h" #include "util/movingaverage.h"

1
plugins/channeltx/modwfm/wfmmodgui.h
View File

@ -18,7 +18,6 @@
#ifndef PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_ #ifndef PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_
#define PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_ #define PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_
#include <plugin/plugininstancegui.h>
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "util/movingaverage.h" #include "util/movingaverage.h"

1
plugins/channeltx/remotesource/remotesourcegui.h
View File

@ -20,7 +20,6 @@
#include <QTime> #include <QTime>
#include "plugin/plugininstancegui.h"
#include "dsp/channelmarker.h" #include "dsp/channelmarker.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "util/messagequeue.h" #include "util/messagequeue.h"

1
plugins/channeltx/udpsource/udpsourcegui.h
View File

@ -18,7 +18,6 @@
#ifndef PLUGINS_CHANNELTX_UDPSINK_UDPSOURCEGUI_H_ #ifndef PLUGINS_CHANNELTX_UDPSINK_UDPSOURCEGUI_H_
#define PLUGINS_CHANNELTX_UDPSINK_UDPSOURCEGUI_H_ #define PLUGINS_CHANNELTX_UDPSINK_UDPSOURCEGUI_H_
#include <plugin/plugininstancegui.h>
#include <QObject> #include <QObject>
#include "channel/channelgui.h" #include "channel/channelgui.h"

1
plugins/feature/rigctlserver/rigctlserverplugin.h
View File

@ -22,7 +22,6 @@
#include <QObject> #include <QObject>
#include "plugin/plugininterface.h" #include "plugin/plugininterface.h"
class PluginInstanceGUI;
class FeatureGUI; class FeatureGUI;
class WebAPIAdapterInterface; class WebAPIAdapterInterface;

1
plugins/feature/simpleptt/simplepttplugin.h
View File

@ -21,7 +21,6 @@
#include <QObject> #include <QObject>
#include "plugin/plugininterface.h" #include "plugin/plugininterface.h"
class PluginInstanceGUI;
class FeatureGUI; class FeatureGUI;
class WebAPIAdapterInterface; class WebAPIAdapterInterface;

2
sdrbase/channel/channelapi.h
View File

@ -126,7 +126,7 @@ public:
private: private:
StreamType m_streamType; StreamType m_streamType;
/** Unique identifier in a device set used for sorting. Used when there is no GUI. /** Unique identifier in a device set used for sorting. Used when there is no GUI.
* In GUI version it is supported by GUI object name accessed through PluginInstanceGUI. * In GUI version it is supported by GUI object name accessed through ChannelGUI.
*/ */
QString m_name; QString m_name;

1
sdrbase/plugin/pluginapi.h
View File

@ -11,7 +11,6 @@ class QString;
class PluginManager; class PluginManager;
class MessageQueue; class MessageQueue;
class PluginInstanceGUI;
class SDRBASE_API PluginAPI : public QObject { class SDRBASE_API PluginAPI : public QObject {
Q_OBJECT Q_OBJECT

5
sdrgui/feature/featureuiset.cpp
View File

@ -16,7 +16,6 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include "gui/featurewindow.h" #include "gui/featurewindow.h"
#include "plugin/plugininstancegui.h"
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "settings/featuresetpreset.h" #include "settings/featuresetpreset.h"
#include "feature/featureutils.h" #include "feature/featureutils.h"
@ -127,7 +126,7 @@ void FeatureUISet::loadFeatureSetSettings(const FeatureSetPreset *preset, Plugin
for (int i = 0; i < preset->getFeatureCount(); i++) for (int i = 0; i < preset->getFeatureCount(); i++)
{ {
const FeatureSetPreset::FeatureConfig& featureConfig = preset->getFeatureConfig(i); const FeatureSetPreset::FeatureConfig& featureConfig = preset->getFeatureConfig(i);
PluginInstanceGUI *featureGUI = nullptr; FeatureGUI *featureGUI = nullptr;
// create feature instance // create feature instance
@ -140,7 +139,7 @@ void FeatureUISet::loadFeatureSetSettings(const FeatureSetPreset *preset, Plugin
qPrintable(featureConfig.m_featureIdURI)); qPrintable(featureConfig.m_featureIdURI));
Feature *feature = Feature *feature =
(*featureRegistrations)[i].m_plugin->createFeature(apiAdapter); (*featureRegistrations)[i].m_plugin->createFeature(apiAdapter);
FeatureGUI *featureGUI = featureGUI =
(*featureRegistrations)[i].m_plugin->createFeatureGUI(this, feature); (*featureRegistrations)[i].m_plugin->createFeatureGUI(this, feature);
registerFeatureInstance(feature->getURI(), featureGUI, feature); registerFeatureInstance(feature->getURI(), featureGUI, feature);
break; break;

1
sdrgui/mainwindow.h
View File

@ -39,7 +39,6 @@ class DSPDeviceSinkEngine;
class Indicator; class Indicator;
class GLSpectrumGUI; class GLSpectrumGUI;
class PluginAPI; class PluginAPI;
class PluginInstanceGUI;
class ChannelGUI; class ChannelGUI;
class ChannelMarker; class ChannelMarker;
class PluginManager; class PluginManager;