Skip to content
Snippets Groups Projects
Commit 784b8709 authored by Don Gagne's avatar Don Gagne
Browse files

Use QSharedPointer for cross-thread Link references

Also many LinkManager API changes to further isolate all link
management inside LinkManager.
parent 86268aeb
No related branches found
No related tags found
No related merge requests found
...@@ -676,10 +676,8 @@ void QGCToolBar::_connectButtonClicked(bool checked) ...@@ -676,10 +676,8 @@ void QGCToolBar::_connectButtonClicked(bool checked)
// Get the configuration name // Get the configuration name
QString confName = _linkCombo->currentText(); QString confName = _linkCombo->currentText();
// Create a link for it // Create a link for it
LinkInterface* link = _linkMgr->createLink(confName); LinkInterface* link = _linkMgr->createConnectedLink(confName);
if(link) { if(link) {
// Connect it
_linkMgr->connectLink(link);
// Save last used connection // Save last used connection
MainWindow::instance()->saveLastUsedConnection(confName); MainWindow::instance()->saveLastUsedConnection(confName);
} }
......
...@@ -163,10 +163,8 @@ void MainToolBar::onConnect(QString conf) ...@@ -163,10 +163,8 @@ void MainToolBar::onConnect(QString conf)
// We don't want the combo box updating under our feet // We don't want the combo box updating under our feet
LinkManager::instance()->suspendConfigurationUpdates(true); LinkManager::instance()->suspendConfigurationUpdates(true);
// Create a link // Create a link
LinkInterface* link = LinkManager::instance()->createLink(_currentConfig); LinkInterface* link = LinkManager::instance()->createConnectedLink(_currentConfig);
if(link) { if(link) {
// Connect it
LinkManager::instance()->connectLink(link);
// Save last used connection // Save last used connection
MainWindow::instance()->saveLastUsedConnection(_currentConfig); MainWindow::instance()->saveLastUsedConnection(_currentConfig);
} }
......
...@@ -118,7 +118,7 @@ void UASListWidget::updateStatus() ...@@ -118,7 +118,7 @@ void UASListWidget::updateStatus()
LinkInterface* link = i.key(); LinkInterface* link = i.key();
// Paranoid sanity check // Paranoid sanity check
if (!LinkManager::instance()->getLinks().contains(link)) if (!LinkManager::instance()->containsLink(link))
continue; continue;
if (!link) if (!link)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment