VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-07 07:37:48 -04:00
Code Issues Projects Releases Wiki Activity

Removed main window references from plugin API

Browse Source
This commit is contained in:
f4exb 2017-10-24 14:01:31 +02:00
parent a106deeaf7
commit ab9474a65f
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sdrgui/plugin/pluginapi.cpp
View File

@ -1,12 +1,6 @@
#include <QDockWidget> #include <QDockWidget>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "plugin/pluginmanager.h" #include "plugin/pluginmanager.h"
#include "mainwindow.h"
MessageQueue* PluginAPI::getMainWindowMessageQueue()
{
return m_mainWindow->getInputMessageQueue();
}
void PluginAPI::registerRxChannel(const QString& channelName, PluginInterface* plugin) void PluginAPI::registerRxChannel(const QString& channelName, PluginInterface* plugin)
{ {
@ -39,10 +33,8 @@ PluginAPI::ChannelRegistrations *PluginAPI::getTxChannelRegistrations()
} }
PluginAPI::PluginAPI(PluginManager* pluginManager, MainWindow* mainWindow) : PluginAPI::PluginAPI(PluginManager* pluginManager) :
QObject(mainWindow), m_pluginManager(pluginManager)
m_pluginManager(pluginManager),
m_mainWindow(mainWindow)
{ {
} }

10
sdrgui/plugin/pluginapi.h
View File

@ -10,7 +10,6 @@ class QString;
class PluginManager; class PluginManager;
class PluginInterface; class PluginInterface;
class MainWindow;
class MessageQueue; class MessageQueue;
class PluginInstanceGUI; class PluginInstanceGUI;
@ -30,9 +29,6 @@ public:
typedef QList<ChannelRegistration> ChannelRegistrations; typedef QList<ChannelRegistration> ChannelRegistrations;
// MainWindow access
MessageQueue* getMainWindowMessageQueue();
// Rx Channel stuff // Rx Channel stuff
void registerRxChannel(const QString& channelName, PluginInterface* plugin); void registerRxChannel(const QString& channelName, PluginInterface* plugin);
ChannelRegistrations *getRxChannelRegistrations(); ChannelRegistrations *getRxChannelRegistrations();
@ -47,14 +43,10 @@ public:
// Sample Sink stuff // Sample Sink stuff
void registerSampleSink(const QString& sinkName, PluginInterface* plugin); void registerSampleSink(const QString& sinkName, PluginInterface* plugin);
// R/O access to main window
const MainWindow* getMainWindow() const { return m_mainWindow; }
protected: protected:
PluginManager* m_pluginManager; PluginManager* m_pluginManager;
MainWindow* m_mainWindow;
PluginAPI(PluginManager* pluginManager, MainWindow* mainWindow); PluginAPI(PluginManager* pluginManager);
~PluginAPI(); ~PluginAPI();
friend class PluginManager; friend class PluginManager;

2
sdrgui/plugin/pluginmanager.cpp
View File

@ -40,7 +40,7 @@ const QString PluginManager::m_fileSinkDeviceTypeID = "sdrangel.samplesink.files
PluginManager::PluginManager(MainWindow* mainWindow, QObject* parent) : PluginManager::PluginManager(MainWindow* mainWindow, QObject* parent) :
QObject(parent), QObject(parent),
m_pluginAPI(this, mainWindow) m_pluginAPI(this)
{ {
} }