Commit 5204aaba authored by Don Gagne's avatar Don Gagne

Remove multiple activeUASSet overrides

This allows use of compile time Object::connect syntax
parent 4bd4091b
...@@ -50,7 +50,6 @@ void MockUASManager::setMockActiveUAS(MockUAS* mockUAS) ...@@ -50,7 +50,6 @@ void MockUASManager::setMockActiveUAS(MockUAS* mockUAS)
{ {
// We don't support swiching between different UAS // We don't support swiching between different UAS
//_mockUAS->setSelected(); //_mockUAS->setSelected();
emit activeUASSet(_mockUAS->getUASID());
emit activeUASStatusChanged(_mockUAS, true); emit activeUASStatusChanged(_mockUAS, true);
emit activeUASStatusChanged(_mockUAS->getUASID(), true); emit activeUASStatusChanged(_mockUAS->getUASID(), true);
} }
......
...@@ -41,7 +41,6 @@ class MockUASManager : public UASManagerInterface ...@@ -41,7 +41,6 @@ class MockUASManager : public UASManagerInterface
signals: signals:
// The following signals from UASManager interface are supported: // The following signals from UASManager interface are supported:
// void activeUASSet(UASInterface* UAS); // void activeUASSet(UASInterface* UAS);
// void activeUASSet(int systemId);
// void activeUASStatusChanged(UASInterface* UAS, bool active); // void activeUASStatusChanged(UASInterface* UAS, bool active);
// void activeUASStatusChanged(int systemId, bool active); // void activeUASStatusChanged(int systemId, bool active);
......
...@@ -473,7 +473,6 @@ void UASManager::setActiveUAS(UASInterface* uas) ...@@ -473,7 +473,6 @@ void UASManager::setActiveUAS(UASInterface* uas)
if (activeUAS) if (activeUAS)
{ {
activeUAS->setSelected(); activeUAS->setSelected();
emit activeUASSet(activeUAS->getUASID());
emit activeUASSetListIndex(systems.indexOf(activeUAS)); emit activeUASSetListIndex(systems.indexOf(activeUAS));
emit activeUASStatusChanged(activeUAS, true); emit activeUASStatusChanged(activeUAS, true);
emit activeUASStatusChanged(activeUAS->getUASID(), true); emit activeUASStatusChanged(activeUAS->getUASID(), true);
......
...@@ -105,8 +105,6 @@ signals: ...@@ -105,8 +105,6 @@ signals:
/** @brief The UAS currently under main operator control changed */ /** @brief The UAS currently under main operator control changed */
void activeUASSet(UASInterface* UAS); void activeUASSet(UASInterface* UAS);
/** @brief The UAS currently under main operator control changed */ /** @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); void activeUASSetListIndex(int listIndex);
/** @brief The UAS currently under main operator control changed */ /** @brief The UAS currently under main operator control changed */
void activeUASStatusChanged(UASInterface* UAS, bool active); void activeUASStatusChanged(UASInterface* UAS, bool active);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment