mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Removed dangling PluginInstanceGUI references

pull/655/head
f4exb 2020-10-05 16:28:58 +02:00
rodzic 6ebf4569bf
commit 31bf99a619
31 zmienionych plików z 3 dodań i 33 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
plugins/channelrx/chanalyzer/chanalyzergui.h
Wyświetl plik

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

1
plugins/channelrx/demodam/amdemodgui.h
Wyświetl plik

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

1
plugins/channelrx/demodatv/atvdemodgui.h
Wyświetl plik

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

1
plugins/channelrx/demodbfm/bfmdemodgui.h
Wyświetl plik

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

1
plugins/channelrx/demoddatv/datvdemodgui.h
Wyświetl plik

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

1
plugins/channelrx/demoddsd/dsddemodgui.h
Wyświetl plik

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

1
plugins/channelrx/demodfreedv/freedvdemodgui.h
Wyświetl plik

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

1
plugins/channelrx/demodnfm/nfmdemodgui.h
Wyświetl plik

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

1
plugins/channelrx/demodssb/ssbdemodgui.h
Wyświetl plik

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

1
plugins/channelrx/demodwfm/wfmdemodgui.h
Wyświetl plik

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

1
plugins/channelrx/filesink/filesinkgui.h
Wyświetl plik

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

1
plugins/channelrx/freqtracker/freqtrackergui.h
Wyświetl plik

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

1
plugins/channelrx/localsink/localsinkgui.h
Wyświetl plik

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

1
plugins/channelrx/remotesink/remotesinkgui.h
Wyświetl plik

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

1
plugins/channelrx/udpsink/udpsinkgui.h
Wyświetl plik

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

1
plugins/channeltx/filesource/filesourcegui.h
Wyświetl plik

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

1
plugins/channeltx/localsource/localsourcegui.h
Wyświetl plik

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

1
plugins/channeltx/modatv/atvmodgui.h
Wyświetl plik

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

1
plugins/channeltx/modfreedv/freedvmodgui.h
Wyświetl plik

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

1
plugins/channeltx/modnfm/nfmmodgui.h
Wyświetl plik

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

1
plugins/channeltx/modpacket/packetmodgui.h
Wyświetl plik

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

1
plugins/channeltx/modssb/ssbmodgui.h
Wyświetl plik

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

1
plugins/channeltx/modwfm/wfmmodgui.h
Wyświetl plik

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

1
plugins/channeltx/remotesource/remotesourcegui.h
Wyświetl plik

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

1
plugins/channeltx/udpsource/udpsourcegui.h
Wyświetl plik

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

1
plugins/feature/rigctlserver/rigctlserverplugin.h
Wyświetl plik

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

1
plugins/feature/simpleptt/simplepttplugin.h
Wyświetl plik

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

2
sdrbase/channel/channelapi.h
Wyświetl plik

@ -126,7 +126,7 @@ public:
private:
StreamType m_streamType;
/** 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;

1
sdrbase/plugin/pluginapi.h
Wyświetl plik

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

5
sdrgui/feature/featureuiset.cpp
Wyświetl plik

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

1
sdrgui/mainwindow.h
Wyświetl plik

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