Removed main window references from plugin API

pull/85/head
f4exb 2017-10-24 14:01:31 +02:00
rodzic a106deeaf7
commit ab9474a65f
3 zmienionych plików z 4 dodań i 20 usunięć

Wyświetl plik

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

Wyświetl plik

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

Wyświetl plik

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