Multi device support: cleanup after last commit

This commit is contained in:
f4exb
2016-05-14 21:33:12 +02:00
parent 3cba9014b6
commit 7452e2fe04
17 changed files with 5 additions and 54 deletions
+2 -2
View File
@@ -24,9 +24,9 @@ void PluginAPI::setInputGUI(QWidget* inputGUI)
m_pluginManager->setInputGUI(inputGUI);
}
void PluginAPI::registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action)
void PluginAPI::registerChannel(const QString& channelName, PluginInterface* plugin)
{
m_pluginManager->registerChannel(channelName, plugin, action);
m_pluginManager->registerChannel(channelName, plugin);
}
void PluginAPI::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI)
+1 -1
View File
@@ -31,7 +31,7 @@ public:
void setInputGUI(QWidget* inputGUI);
// Channel stuff
void registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action = 0);
void registerChannel(const QString& channelName, PluginInterface* plugin);
void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI);
void addChannelRollup(QWidget* pluginGUI);
void removeChannelInstance(PluginGUI* pluginGUI);
+1 -2
View File
@@ -51,10 +51,9 @@ void PluginManager::loadPlugins()
updateSampleSourceDevices();
}
void PluginManager::registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action)
void PluginManager::registerChannel(const QString& channelName, PluginInterface* plugin)
{
m_channelRegistrations.append(ChannelRegistration(channelName, plugin));
// m_mainWindow->addChannelCreateAction(action);
}
void PluginManager::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI)
+1 -1
View File
@@ -46,7 +46,7 @@ public:
const Plugins& getPlugins() const { return m_plugins; }
// Callbacks from the plugins
void registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action = 0);
void registerChannel(const QString& channelName, PluginInterface* plugin);
void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI);
void addChannelRollup(QWidget* pluginGUI);
void removeChannelInstance(PluginGUI* pluginGUI);