From 5204aabae50a6aebc8656441c7aa3f56357b6c11 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 4 Dec 2014 09:42:03 -0800 Subject: [PATCH] Remove multiple activeUASSet overrides This allows use of compile time Object::connect syntax --- src/qgcunittest/MockUASManager.cc | 1 - src/qgcunittest/MockUASManager.h | 1 - src/uas/UASManager.cc | 1 - src/uas/UASManagerInterface.h | 2 -- 4 files changed, 5 deletions(-) diff --git a/src/qgcunittest/MockUASManager.cc b/src/qgcunittest/MockUASManager.cc index 960bafede..aa8a09566 100644 --- a/src/qgcunittest/MockUASManager.cc +++ b/src/qgcunittest/MockUASManager.cc @@ -50,7 +50,6 @@ void MockUASManager::setMockActiveUAS(MockUAS* mockUAS) { // We don't support swiching between different UAS //_mockUAS->setSelected(); - emit activeUASSet(_mockUAS->getUASID()); emit activeUASStatusChanged(_mockUAS, true); emit activeUASStatusChanged(_mockUAS->getUASID(), true); } diff --git a/src/qgcunittest/MockUASManager.h b/src/qgcunittest/MockUASManager.h index 79d826477..286f60920 100644 --- a/src/qgcunittest/MockUASManager.h +++ b/src/qgcunittest/MockUASManager.h @@ -41,7 +41,6 @@ class MockUASManager : public UASManagerInterface signals: // The following signals from UASManager interface are supported: // void activeUASSet(UASInterface* UAS); - // void activeUASSet(int systemId); // void activeUASStatusChanged(UASInterface* UAS, bool active); // void activeUASStatusChanged(int systemId, bool active); diff --git a/src/uas/UASManager.cc b/src/uas/UASManager.cc index 875819c8e..b749af1e2 100644 --- a/src/uas/UASManager.cc +++ b/src/uas/UASManager.cc @@ -473,7 +473,6 @@ void UASManager::setActiveUAS(UASInterface* uas) if (activeUAS) { activeUAS->setSelected(); - emit activeUASSet(activeUAS->getUASID()); emit activeUASSetListIndex(systems.indexOf(activeUAS)); emit activeUASStatusChanged(activeUAS, true); emit activeUASStatusChanged(activeUAS->getUASID(), true); diff --git a/src/uas/UASManagerInterface.h b/src/uas/UASManagerInterface.h index bf611c6d7..6b49af394 100644 --- a/src/uas/UASManagerInterface.h +++ b/src/uas/UASManagerInterface.h @@ -105,8 +105,6 @@ signals: /** @brief The UAS currently under main operator control changed */ void activeUASSet(UASInterface* UAS); /** @brief The UAS currently under main operator control changed */ - void activeUASSet(int systemId); - /** @brief The UAS currently under main operator control changed */ void activeUASSetListIndex(int listIndex); /** @brief The UAS currently under main operator control changed */ void activeUASStatusChanged(UASInterface* UAS, bool active); -- 2.22.0